From ed42bf8c0562ce625ebf7bb3e6b0624da5a1d7ec Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 4 Mar 2015 11:46:28 +0100 Subject: Fix QMessageBox::aboutQt(). Add missing blanks and prevent line wraps "...Qt\napplications.." for clarity. Change-Id: I35932fb296ec47a1832f5c244b9719838621d5be Reviewed-by: Iikka Eklund Reviewed-by: Lars Knoll --- src/widgets/dialogs/qmessagebox.cpp | 9 ++++----- 1 file 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.

" "

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 applications provided you can comply with the terms " "and conditions of the GNU LGPL version 3.

" "

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 applications provided you can comply with the terms " "and conditions of the GNU LGPL version 2.1.

" "

Please see %2 " "for an overview of Qt licensing.

" "

Copyright (C) %1 The Qt Company Ltd and other " "contributors.

" - "

Qt and the Qt logo are trademarks of The Qt Company Ltd and/or its" - "subsidiary(-ies).

" - "

Qt is The Qt Company Ltd product developed as an open source" + "

Qt and the Qt logo are trademarks of The Qt Company Ltd.

" + "

Qt is The Qt Company Ltd product developed as an open source " "project. See %3 for more information.

" ).arg(QStringLiteral("2015"), QStringLiteral("qt.io/licensing"), -- cgit v1.2.3