1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix QMessageBox::aboutQt().

Browse Source 
Add missing blanks and prevent line wraps
"...Qt\napplications.." for clarity.

Change-Id: I35932fb296ec47a1832f5c244b9719838621d5be
Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Friedemann Kleint 2015-03-04 11:46:28 +01:00
parent 775d04f97e
commit ed42bf8c05
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/widgets/dialogs/qmessagebox.cpp
View File

@ -1894,18 +1894,17 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title)
"want to share any source code with third parties or otherwise cannot "
"comply with the terms of the GNU LGPL version 3 or GNU LGPL version 2.1.</p>"
"<p>Qt licensed under the GNU LGPL version 3 is appropriate for the "
"development of Qt applications provided you can comply with the terms "
"development of Qt&nbsp;applications provided you can comply with the terms "
"and conditions of the GNU LGPL version 3.</p>"
"<p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the "
"development of Qt applications provided you can comply with the terms "
"development of Qt&nbsp;applications provided you can comply with the terms "
"and conditions of the GNU LGPL version 2.1.</p>"
"<p>Please see <a href=\"http://%2/\">%2</a> "
"for an overview of Qt licensing.</p>"
"<p>Copyright (C) %1 The Qt Company Ltd and other "
"contributors.</p>"
"<p>Qt and the Qt logo are trademarks of The Qt Company Ltd and/or its"
"subsidiary(-ies).</p>"
"<p>Qt is The Qt Company Ltd product developed as an open source"
"<p>Qt and the Qt logo are trademarks of The Qt Company Ltd.</p>"
"<p>Qt is The Qt Company Ltd product developed as an open source "
"project. See <a href=\"http://%3/\">%3</a> for more information.</p>"
).arg(QStringLiteral("2015"),
QStringLiteral("qt.io/licensing"),