diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-06-16 12:25:24 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-06-16 12:25:24 +0000 |
| commit | 3d8c8daae109fbd6d60e43c3d4457b581e5e62a3 (patch) | |
| tree | 84bb5a5f766ce04ff4d243a38ce5e408db5e7782 /src/widgets | |
| parent | 874eb8b44b3ca9cfab63372af10886d16dfc327d (diff) | |
| parent | c4e472ea1037afde7b99d9132a49eb616cad240e (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7.0' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
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) "<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 or GNU LGPL version 2.1.</p>" + "comply with the terms of the GNU LGPL version 3.</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 " "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 " - "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 " |