AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated aboutQt dialog text

Browse Source 
Updated supported platforms to match reality better,
mention qt-project.org and other copyright holders.

Task-number: QTBUG-25205
Change-Id: I4856d515500945ace55f7fd445b5b138aa00df83
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
This commit is contained in:
Lars Knoll 2012-11-23 14:48:04 +01:00 committed by The Qt Project
parent 009d5e1510
commit 6755cbd76a
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/widgets/dialogs/qmessagebox.cpp
View File

@ -1736,10 +1736,9 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title)
translatedTextAboutQtText = QMessageBox::tr( translatedTextAboutQtText = QMessageBox::tr(
"<p>Qt is a C++ toolkit for cross-platform application " "<p>Qt is a C++ toolkit for cross-platform application "
"development.</p>" "development.</p>"
"<p>Qt provides single-source portability across MS&nbsp;Windows, " "<p>Qt provides single-source portability across all major desktop "
"Mac&nbsp;OS&nbsp;X, Linux, and all major commercial Unix variants. " "operating systems. It is also available for embedded Linux and other "
"Qt is also available for embedded devices as Qt for Embedded Linux " "embedded and mobile operating systems.</p>"
"and Qt for Windows CE.</p>"
"<p>Qt is available under three different licensing options designed " "<p>Qt is available under three different licensing options designed "
"to accommodate the needs of our various users.</p>" "to accommodate the needs of our various users.</p>"
"<p>Qt licensed under our commercial license agreement is appropriate " "<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 " "comply with the terms of the GNU LGPL version 2.1 or GNU GPL version "
"3.0.</p>" "3.0.</p>"
"<p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the " "<p>Qt licensed under the GNU LGPL version 2.1 is appropriate for the "
"development of Qt applications (proprietary or open source) provided " "development of Qt applications provided you can comply with the terms "
"you can comply with the terms and conditions of the GNU LGPL version " "and conditions of the GNU LGPL version 2.1.</p>"
"2.1.</p>"
"<p>Qt licensed under the GNU General Public License version 3.0 is " "<p>Qt licensed under the GNU General Public License version 3.0 is "
"appropriate for the development of Qt applications where you wish to " "appropriate for the development of Qt applications where you wish to "
"use such applications in combination with software subject to the " "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>" "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> " "<p>Please see <a href=\"http://qt.digia.com/Product/Licensing/\">qt.digia.com/Product/Licensing</a> "
"for an overview of Qt licensing.</p>" "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> " "<p>Qt is a Digia product. See <a href=\"http://qt.digia.com/\">qt.digia.com</a> "
"for more information.</p>" "for more information.</p>"
); );