From 4e30e7c45ce84bcc7d62d61981335c67df1eb89a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 20 Jul 2019 20:15:40 +0200 Subject: [PATCH] Don't abuse organization domain for website in AboutDialog --- aboutdialog/aboutdialog.cpp | 19 +++++++++++-------- aboutdialog/aboutdialog.h | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/aboutdialog/aboutdialog.cpp b/aboutdialog/aboutdialog.cpp index b34ad64..f9b0b21 100644 --- a/aboutdialog/aboutdialog.cpp +++ b/aboutdialog/aboutdialog.cpp @@ -33,8 +33,7 @@ namespace QtUtilities { * \param dependencyVersions Specifies the dependency versions which were present at link-time. If empty, * ApplicationUtilities::applicationInfo.dependencyVersions will be used. * \param description Specifies a short description about the application. - * \param website Specifies the URL to the website of the application. If empty, - * QApplication::organizationDomain() will be used. + * \param website Specifies the URL to the website of the application. * \param image Specifies the application icon. If the image is null, the * standard information icon will be used. */ @@ -72,10 +71,14 @@ AboutDialog::AboutDialog(QWidget *parent, const QString &applicationName, const m_ui->versionLabel->setToolTip(QStringLiteral("

") % tr("Linked against:") % QStringLiteral("

")); } - m_ui->websiteLabel->setText(tr("For updates and bug reports visit the project " - "website.") - .arg(website.isEmpty() ? QApplication::organizationDomain() : website)); + if (!website.isEmpty()) { + m_ui->websiteLabel->setText(tr("For updates and bug reports visit the project " + "website.") + .arg(website)); + } else { + m_ui->websiteLabel->hide(); + } m_ui->descLabel->setText(description.isEmpty() && CppUtilities::applicationInfo.description ? QString::fromUtf8(CppUtilities::applicationInfo.description) : description); @@ -101,8 +104,8 @@ AboutDialog::AboutDialog(QWidget *parent, const QString &applicationName, const * \brief Constructs an about dialog with the specified \a parent, \a * description and \a image. */ -AboutDialog::AboutDialog(QWidget *parent, const QString &description, const QImage &image) - : AboutDialog(parent, QString(), QString(), QString(), QString(), description, image) +AboutDialog::AboutDialog(QWidget *parent, const QString &website, const QString &description, const QImage &image) + : AboutDialog(parent, QString(), QString(), QString(), website, description, image) { } diff --git a/aboutdialog/aboutdialog.h b/aboutdialog/aboutdialog.h index 9f7e014..c5f7582 100644 --- a/aboutdialog/aboutdialog.h +++ b/aboutdialog/aboutdialog.h @@ -24,7 +24,7 @@ public: explicit AboutDialog(QWidget *parent, const QString &applicationName, const QString &creator, const QString &version, const std::vector &dependencyVersions, const QString &website = QString(), const QString &description = QString(), const QImage &image = QImage()); - explicit AboutDialog(QWidget *parent, const QString &description = QString(), const QImage &image = QImage()); + explicit AboutDialog(QWidget *parent, const QString &website = QString(), const QString &description = QString(), const QImage &image = QImage()); ~AboutDialog() override; private: