diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-13 01:00:13 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-13 01:00:13 +0100 |
| commit | 0441d959ff87431ab432ce0c30bbb857a631742e (patch) | |
| tree | 25c6c4293f74e39b9d4cf45b15957f233cffa9c5 /src/widgets/dialogs/qmessagebox.cpp | |
| parent | ae0dd3201bc13b81c62752bb04e42362c78bfe16 (diff) | |
| parent | 8c685b765bf4ceba3c4cf8fdd9c9d680f338b7a9 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I5dbdc13c6133e5b03e362c5461b4a599d781bd1e
Diffstat (limited to 'src/widgets/dialogs/qmessagebox.cpp')
| -rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 99157747dd..d8cd19ef1a 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -1844,10 +1844,10 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) "<p>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.</p>" - "<p>Qt licensed under the GNU LGPL version 3 is appropriate for the " + "comply with the terms of GNU (L)GPL.</p>" + "<p>Qt licensed under GNU (L)GPL is appropriate for the " "development of Qt applications provided you can comply with the terms " - "and conditions of the GNU LGPL version 3.</p>" + "and conditions of the respective licenses.</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 " |