diff options
| -rw-r--r-- | src/widgets/dialogs/qmessagebox.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index fce8fb9074..e2e15870db 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -1736,10 +1736,9 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) translatedTextAboutQtText = QMessageBox::tr( "<p>Qt is a C++ toolkit for cross-platform application " "development.</p>" - "<p>Qt provides single-source portability across MS Windows, " - "Mac OS X, Linux, and all major commercial Unix variants. " - "Qt is also available for embedded devices as Qt for Embedded Linux " - "and Qt for Windows CE.</p>" + "<p>Qt provides single-source portability across all major desktop " + "operating systems. It is also available for embedded Linux and other " + "embedded and mobile operating systems.</p>" "<p>Qt is available under three different licensing options designed " "to accommodate the needs of our various users.</p>" "<p>Qt licensed under our commercial license agreement is appropriate " @@ -1748,9 +1747,8 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) "comply with the terms of the GNU LGPL version 2.1 or GNU GPL version " "3.0.</p>" "<p>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.</p>" + "development of Qt applications provided you can comply with the terms " + "and conditions of the GNU LGPL version 2.1.</p>" "<p>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 " @@ -1758,7 +1756,11 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title) "to comply with the terms of the GNU GPL version 3.0.</p>" "<p>Please see <a href=\"http://qt.digia.com/Product/Licensing/\">qt.digia.com/Product/Licensing</a> " "for an overview of Qt licensing.</p>" - "<p>Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).</p>" + "<p>Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies) and other " + "contributors.</p>" + "<p>Qt and the Qt logo are trademarks of Digia Plc and/or its subsidiary(-ies).</p>" + "<p>Qt is developed as an open source project on " + "<a href=\"http://qt-project.org/\">qt-project.org</a>.</p>" "<p>Qt is a Digia product. See <a href=\"http://qt.digia.com/\">qt.digia.com</a> " "for more information.</p>" ); |