feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Add trademark info to about dialog

Browse Source 
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>
This commit is contained in:
Eike Ziller
2022-04-22 09:24:16 +02:00
parent e4105330ab
commit 3a1eda28b9
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/plugins/coreplugin/versiondialog.cpp
View File

@@ -73,25 +73,29 @@ VersionDialog::VersionDialog(QWidget *parent)
const QString additionalInfo = const QString additionalInfo =
QStringList(Utils::transform(additionalInfoLines, &QString::toHtmlEscaped)).join(br); QStringList(Utils::transform(additionalInfoLines, &QString::toHtmlEscaped)).join(br);
const QString description = tr( const QString description
"<h3>%1</h3>" = tr("<h3>%1</h3>"
"%2<br/>" "%2<br/>"
"%3" "%3"
"%4" "%4"
"%5" "%5"
"<br/>" "<br/>"
"Copyright 2008-%6 %7. All rights reserved.<br/>" "Copyright 2008-%6 %7. All rights reserved.<br/>"
"<br/>" "<br/>"
"The program is provided AS IS with NO WARRANTY OF ANY KIND, " "The program is provided AS IS with NO WARRANTY OF ANY KIND, "
"INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A " "INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A "
"PARTICULAR PURPOSE.<br/>") "PARTICULAR PURPOSE.<br/>")
.arg(ICore::versionString(), .arg(ICore::versionString(),
ICore::buildCompatibilityString(), ICore::buildCompatibilityString(),
buildDateInfo, buildDateInfo,
ideRev, ideRev,
additionalInfo.isEmpty() ? QString() : br + additionalInfo + br, additionalInfo.isEmpty() ? QString() : br + additionalInfo + br,
QLatin1String(Constants::IDE_YEAR), QLatin1String(Constants::IDE_YEAR),
QLatin1String(Constants::IDE_AUTHOR)); 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); QLabel *copyRightLabel = new QLabel(description);
copyRightLabel->setWordWrap(true); copyRightLabel->setWordWrap(true);