diff options
Diffstat (limited to 'tools/assistant')
| -rw-r--r-- | tools/assistant/compat/mainwindow.cpp | 24 | ||||
| -rw-r--r-- | tools/assistant/tools/assistant/mainwindow.cpp | 19 |
2 files changed, 5 insertions, 38 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>" |