Fix the About Qt dialog text to be truthful, post-LGPL

Update the text of the About Qt dialog, as directed by Legal.  Note that
this change breaks string freeze as the text is translatable, however
Legal has decided that shipping legally correct text has priority over
shipping complete translations.  This change includes updated .ts files
to correct the source strings, but no updated translations.

This change also removes out-of-date licensing text from the About
dialogs of Designer, Assistant, Linguist, QtConfig and qdbusviewer.
Those particular changes should not break translations as they only
remove translatable strings and do not modify any others.

Task-number: 247608
Reviewed-by: Trust Me
.....review will be conducted after submission.

6 files changed, 12 insertions, 110 deletions

diff --git a/tools/assistant/compat/mainwindow.cpp b/tools/assistant/compat/mainwindow.cpp
index 65759ad..9f91f9b 100644
--- a/tools/assistant/compat/mainwindow.cpp
+++ b/tools/assistant/compat/mainwindow.cpp
@@ -311,29 +311,11 @@ void MainWindow::closeEvent(QCloseEvent *e)
 void MainWindow::about()
 {
     QMessageBox box(this);
-#if QT_EDITION == QT_EDITION_OPENSOURCE
-    QString edition = tr("Open Source Edition");
-    QString info = tr("This version of Qt Assistant is part of the Qt Open Source Edition, for use "
-                      "in the development of Open Source applications. "
-                      "Qt is a comprehensive C++ framework for cross-platform application "
-                      "development.");
-    QString moreInfo = tr("You need a commercial Qt license for development of proprietary (closed "
-                   "source) applications. Please see <a href=\"http://qtsoftware.com/company/model"
-                   "\">qtsoftware.com/company/model</a> for an overview of Qt licensing.");
-#elif defined(QT_PRODUCT_LICENSE)
-    QString edition;
-    QString info;
-    QString moreInfo(tr("This program is licensed to you under the terms of the "
-                   "Qt %1 License Agreement. For details, see the license file "
-                   "that came with this software distribution.").arg(QLatin1String(QT_PRODUCT_LICENSE)));
-#else 
+
+    // TODO: Remove these variables for 4.6.0.  Must keep this way for 4.5.x due to string freeze.
     QString edition;
     QString info;
-    QString moreInfo(tr("This program is licensed to you under the terms of the "
-                   "Qt Commercial License Agreement. For details, see the file LICENSE "
-                   "that came with this software distribution."));
-
-#endif
+    QString moreInfo;
 
     box.setText(QString::fromLatin1("<center><img src=\":/trolltech/assistant/images/assistant-128.png\">"
                                     "<h3>%1</h3>"
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index df39650..bcafacc 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -787,26 +787,11 @@ void MainWindow::showAboutDialog()
             aboutDia.setPixmap(pix);
         aboutDia.setWindowTitle(aboutDia.documentTitle());
     } else {
-#if QT_EDITION == QT_EDITION_OPENSOURCE
-        QString edition = tr("Open Source Edition");
-        QString info = tr("This version of Qt Assistant is part of the Qt Open "
-            "Source Edition, for use "
-            "in the development of Open Source applications. "
-            "Qt is a comprehensive C++ framework for cross-platform application "
-            "development.");
-        QString moreInfo = tr("You need a commercial Qt license for development "
-            "of proprietary (closed source) applications. Please see "
-            "<a href=\"http://qtsoftware.com/company/about/businessmodel"
-            "\">http://qtsoftware.com/company/about/businessmodel</a> for an "
-            "overview of Qt licensing.");
-#else
+        // TODO: Remove these variables for 4.6.0.  Must keep this way for 4.5.x due to string freeze.
         QString edition;
         QString info;
-        QString moreInfo(tr("This program is licensed to you under the terms of the "
-            "Qt Commercial License Agreement. For details, see the file LICENSE "
-            "that came with this software distribution."));
+        QString moreInfo;
 
-#endif
         QByteArray resources;
         aboutDia.setText(QString::fromLatin1("<center>"
             "<h3>%1</h3>"
diff --git a/tools/designer/src/designer/versiondialog.cpp b/tools/designer/src/designer/versiondialog.cpp
index a129a4d..c21912b 100644
--- a/tools/designer/src/designer/versiondialog.cpp
+++ b/tools/designer/src/designer/versiondialog.cpp
@@ -169,31 +169,11 @@ VersionDialog::VersionDialog(QWidget *parent)
     VersionLabel *label = new VersionLabel;
     QLabel *lbl = new QLabel;
     QString version = tr("<h3>%1</h3><br/><br/>Version %2");
-#if QT_EDITION == QT_EDITION_OPENSOURCE
-    QString open = tr(" Open Source Edition");
-    version.append(open);
-#endif
     version = version.arg(tr("Qt Designer")).arg(QLatin1String(QT_VERSION_STR));
     version.append(tr("<br/>Qt Designer is a graphical user interface designer for Qt applications.<br/>"));
 
-    QString edition =
-#if QT_EDITION == QT_EDITION_OPENSOURCE
-                    tr("This version of Qt Designer is part of the Qt Open Source Edition, for use "
-                    "in the development of Open Source applications. "
-                    "Qt is a comprehensive C++ framework for cross-platform application "
-                    "development.<br/><br/>"
-                    "You need a commercial Qt license for development of proprietary (closed "
-                    "source) applications. Please see <a href=\"http://qtsoftware.com/company/about/businessmodel\">http://qtsoftware.com/company/about/businessmodel"
-                    ".html</a> for an overview of Qt licensing.<br/>");
-#elif defined(QT_PRODUCT_LICENSE)
-                    tr("This program is licensed to you under the terms of the "
-                    "Qt %1 License Agreement. For details, see the license file "
-                    "that came with this software distribution.<br/>").arg(QT_PRODUCT_LICENSE);
-#else
-                    tr("This program is licensed to you under the terms of the "
-                    "Qt Commercial License Agreement. For details, see the file LICENSE "
-                    "that came with this software distribution.<br/>");
-#endif
+    // TODO: Remove this variable for 4.6.0.  Must keep this way for 4.5.x due to string freeze
+    QString edition;
 
     lbl->setText(tr("%1"
                     "<br/>%2"
diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp
index 84200d4..5157fbe 100644
--- a/tools/linguist/linguist/mainwindow.cpp
+++ b/tools/linguist/linguist/mainwindow.cpp
@@ -1340,30 +1340,10 @@ void MainWindow::about()
     QMessageBox box(this);
     box.setTextFormat(Qt::RichText);
     QString version = tr("Version %1");
-#if QT_EDITION == QT_EDITION_OPENSOURCE
-    QString open = tr(" Open Source Edition");
-    version.append(open);
-#endif
     version = version.arg(QLatin1String(QT_VERSION_STR));
 
-    QString edition =
-#if QT_EDITION == QT_EDITION_OPENSOURCE
-        tr("This version of Qt Linguist is part of the Qt Open Source Edition, for use "
-        "in the development of Open Source applications. "
-        "Qt is a comprehensive C++ framework for cross-platform application "
-        "development.<br/><br/>"
-        "You need a commercial Qt license for development of proprietary (closed "
-        "source) applications. Please see <tt>http://qtsoftware.com/company/model"
-        ".html</tt> for an overview of Qt licensing.");
-#elif defined(QT_PRODUCT_LICENSE)
-        tr("This program is licensed to you under the terms of the "
-        "Qt %1 License Agreement. For details, see the license file "
-        "that came with this software distribution.").arg(QLatin1String(QT_PRODUCT_LICENSE));
-#else
-        tr("This program is licensed to you under the terms of the "
-        "Qt Commercial License Agreement. For details, see the file LICENSE "
-        "that came with this software distribution.");
-#endif
+    // TODO: Remove this variable for 4.6.0.  Must keep this way for 4.5.x due to string freeze.
+    QString edition;
 
     box.setText(tr("<center><img src=\":/images/splash.png\"/></img><p>%1</p></center>"
                     "<p>Qt Linguist is a tool for adding translations to Qt "
diff --git a/tools/qdbus/qdbusviewer/qdbusviewer.cpp b/tools/qdbus/qdbusviewer/qdbusviewer.cpp
index e8ac3a6..9c25a89 100644
--- a/tools/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/tools/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -440,22 +440,11 @@ void QDBusViewer::refreshChildren()
 void QDBusViewer::about()
 {
     QMessageBox box(this);
-#if QT_EDITION == QT_EDITION_OPENSOURCE
-    QString edition = tr("Open Source Edition");
-    QString info = tr("This version of Qt's D-Bus Viewer is part of the Qt Open Source Edition. "
-            "Qt is a comprehensive C++ framework for cross-platform application "
-            "development.");
-    QString moreInfo = tr("You need a commercial Qt license for development of proprietary (closed "
-            "source) applications. Please see <a href=\"http://qtsoftware.com/company/model"
-            ".html\">qtsoftware.com/company/model.html</a> for an overview of Qt licensing.");
-#else
+
+    // TODO: Remove these variables for 4.6.0.  Must keep this way for 4.5.x due to string freeze.
     QString edition;
     QString info;
-    QString moreInfo(tr("This program is licensed to you under the terms of the "
-                "Qt Commercial License Agreement. For details, see the file LICENSE "
-                "that came with this software distribution."));
-
-#endif
+    QString moreInfo;
 
     box.setText(QString::fromLatin1("<center><img src=\":/trolltech/qdbusviewer/images/qdbusviewer-128.png\">"
                 "<h3>%1</h3>"
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 498a6b6..47b1417 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -999,20 +999,6 @@ void MainWindow::helpAbout()
     QMessageBox box(this);
     box.setText(tr("<h3>%1</h3>"
                    "<br/>Version %2"
-#if QT_EDITION == QT_EDITION_OPENSOURCE
-                   " Open Source Edition</center><p>"
-                   "This version of Qt Configuration is part of the Qt Open Source Edition, for use "
-                   "in the development of Open Source applications. "
-                   "Qt is a comprehensive C++ framework for cross-platform application "
-                   "development.<br/><br/>"
-                   "You need a commercial Qt license for development of proprietary (closed "
-                   "source) applications. Please see <tt>http://qtsoftware.com/company/model"
-                   ".html</tt> for an overview of Qt licensing."
-#else
-                   "</center><p>This program is licensed to you under the terms of the "
-                   "Qt Commercial License Agreement. For details, see the file LICENSE "
-                   "that came with this software distribution."
-#endif
                    "<br/><br/>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
                    "<br/><br/>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
                    " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"