From 6a75daa99feb0a0c599ef51d26718ea60fd4d0da Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 2 Jun 2016 13:34:49 +0200 Subject: QMessageBox::aboutQt(): Remove LGPL 2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Licenses have changed in 5.7. Change-Id: Ib3801ef878f292e68b22ee89e036bb30cc79d186 Task-number: QTBUG-53791 Reviewed-by: Robert Loehning Reviewed-by: Topi Reiniö --- src/widgets/dialogs/qmessagebox.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/widgets/dialogs') diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 69f7ef1e16..88af70fa36 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -1889,13 +1889,10 @@ 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 3 or GNU LGPL version 2.1.

" + "comply with the terms of the GNU LGPL version 3.

" "

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 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 " -- cgit v1.2.3