diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-20 07:23:43 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-20 07:23:43 (GMT) |
| commit | 67926b8e4d9e7463597ef113944d78ca326fd9ae (patch) | |
| tree | e24fa54e245a8c3b27cd1f740aaf5d296e05621b /tools/designer/src | |
| parent | 2c762f3b8b284a7c6dc0c499b7052013bad5b707 (diff) | |
| parent | 10194aafd10824fe1919aa44083224e8bea442ca (diff) | |
| download | Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.zip Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.tar.gz Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/itemviews/qheaderview_p.h
Diffstat (limited to 'tools/designer/src')
| -rw-r--r-- | tools/designer/src/designer/versiondialog.cpp | 24 |
1 files changed, 2 insertions, 22 deletions
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" |