diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-04-22 09:24:16 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-04-22 13:02:16 +0000 |
| commit | 3a1eda28b928ea33e5106535935606c1edab5823 (patch) | |
| tree | e93e70616236f52196e8930be4d8d007f3991636 | |
| parent | e4105330abd963cdafb2ecc4c7351149579c87c9 (diff) | |
| download | qt-creator-3a1eda28b928ea33e5106535935606c1edab5823.tar.gz | |
Add trademark info to about dialog
Fixes: QTCREATORBUG-27410
Change-Id: I496c7088cdcab68ba007ab1e43bcf7bfed8955f6
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/plugins/coreplugin/versiondialog.cpp | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index 14553cdcfc..5e91fd164e 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -73,25 +73,29 @@ VersionDialog::VersionDialog(QWidget *parent) const QString additionalInfo = QStringList(Utils::transform(additionalInfoLines, &QString::toHtmlEscaped)).join(br); - const QString description = tr( - "<h3>%1</h3>" - "%2<br/>" - "%3" - "%4" - "%5" - "<br/>" - "Copyright 2008-%6 %7. All rights reserved.<br/>" - "<br/>" - "The program is provided AS IS with NO WARRANTY OF ANY KIND, " - "INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A " - "PARTICULAR PURPOSE.<br/>") - .arg(ICore::versionString(), - ICore::buildCompatibilityString(), - buildDateInfo, - ideRev, - additionalInfo.isEmpty() ? QString() : br + additionalInfo + br, - QLatin1String(Constants::IDE_YEAR), - QLatin1String(Constants::IDE_AUTHOR)); + const QString description + = tr("<h3>%1</h3>" + "%2<br/>" + "%3" + "%4" + "%5" + "<br/>" + "Copyright 2008-%6 %7. All rights reserved.<br/>" + "<br/>" + "The program is provided AS IS with NO WARRANTY OF ANY KIND, " + "INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A " + "PARTICULAR PURPOSE.<br/>") + .arg(ICore::versionString(), + ICore::buildCompatibilityString(), + buildDateInfo, + ideRev, + additionalInfo.isEmpty() ? QString() : br + additionalInfo + br, + QLatin1String(Constants::IDE_YEAR), + QLatin1String(Constants::IDE_AUTHOR)) + + "<br/>" + + tr("The Qt logo as well as Qt®, Qt Quick®, Built with Qt®, Boot to Qt®, " + "Qt Quick Compiler®, Qt Enterprise®, Qt Mobile® and Qt Embedded® are " + "registered trademarks of The Qt Company Ltd."); QLabel *copyRightLabel = new QLabel(description); copyRightLabel->setWordWrap(true); |