summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-03-04 11:46:28 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-03-06 07:57:00 +0000
commited42bf8c0562ce625ebf7bb3e6b0624da5a1d7ec (patch)
tree59acbd7cfba211389b5f6e7b4e637847b007c3ef
parent775d04f97ec1723c01c12f8faab05236686b9b05 (diff)
Fix QMessageBox::aboutQt().
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>
-rw-r--r--src/widgets/dialogs/qmessagebox.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp
index 66152387e4..571b01802d 100644
--- a/src/widgets/dialogs/qmessagebox.cpp
+++ b/src/widgets/dialogs/qmessagebox.cpp
@@ -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"),