summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVitaly Fanaskov <vitaly.fanaskov@qt.io>2018-11-08 10:16:00 +0100
committerLiang Qi <liang.qi@qt.io>2018-11-11 22:09:15 +0000
commitee91993997161635b8288aa95d9ecf8af5ecd589 (patch)
treeb0ba2e4e593381d6644a3404bb84d0ece46f4937
parent6857cd60dd884a763af26e43863187e9157fe32c (diff)
Change the wording for license type in the About Qt box
"the GNU LGPL version 3" -> "GNU (L)GPL" because some parts of Qt are GPL v3 (Qt Charts, Qt VirtualKeyboard, etc.). Fixes: QTBUG-57697 Change-Id: Iceb88244e28b6900c5282b070468fb65b2bf52d2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--src/widgets/dialogs/qmessagebox.cpp6
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&nbsp;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 "