From e77de8bea44a664e8968f579457e71b35d46fa31 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 6 Oct 2014 16:39:12 +0200 Subject: Fix license text and URLs in QMessageBox::aboutQt(). Point to new qt.io site, adapt licensing text. Task-number: QTBUG-41798 Change-Id: I492df6a842c2b31e44653fb4388408c209f24f1e Reviewed-by: Sami Makkonen Reviewed-by: Jani Heikkinen (cherry picked from qtbase/4a2cf9ca4174ee9879bfc5858f10dacc028a521f) Reviewed-by: Lars Knoll --- src/gui/dialogs/qmessagebox.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp index 1def5b4..fd8084b 100644 --- a/src/gui/dialogs/qmessagebox.cpp +++ b/src/gui/dialogs/qmessagebox.cpp @@ -1775,23 +1775,23 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) "

Qt licensed under our commercial license agreement is appropriate " "for development of proprietary/commercial software where you do not " "want to share any source code with third parties or otherwise cannot " - "comply with the terms of the GNU LGPL version 2.1 or GNU GPL version " - "3.0.

" + "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 " + "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 (proprietary or open source) provided " - "you can comply with the terms and conditions of the GNU LGPL version " - "2.1.

" - "

Qt licensed under the GNU General Public License version 3.0 is " - "appropriate for the development of Qt applications where you wish to " - "use such applications in combination with software subject to the " - "terms of the GNU GPL version 3.0 or where you are otherwise willing " - "to comply with the terms of the GNU GPL version 3.0.

" - "

Please see qt.digia.com/product/licensing " + "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) 2014 Digia Plc and/or its subsidiary(-ies).

" - "

Qt is a Digia product. See qt.digia.com " + "

Copyright (C) %1 Digia Plc and/or its subsidiary(-ies) and other " + "contributors.

" + "

Qt and the Qt logo are trademarks of Digia Plc and/or its subsidiary(-ies).

" + "

Qt is a Digia product developed as an open source project. See %3 " "for more information.

" - ); + ).arg(QLatin1String("2014"), + QLatin1String("qt.io/licensing"), + QLatin1String("qt.io")); QMessageBox *msgBox = new QMessageBox(parent); msgBox->setAttribute(Qt::WA_DeleteOnClose); msgBox->setWindowTitle(title.isEmpty() ? tr("About Qt") : title); -- cgit v0.12