diff options
author | Eike Ziller <eike.ziller@qt.io> | 2017-04-20 14:51:49 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2017-04-21 13:28:54 +0000 |
commit | 1891af4b07801e6cbab95aca77b2ef4979b46cc0 (patch) | |
tree | 5eaf1a82153a847e069d139f8903ae4dd14d7b49 /src/plugins/coreplugin/icore.cpp | |
parent | 0dfd08b00e4f4ee9300fffcb56aca546df26eb03 (diff) |
Specify Qt Creator's "display version" in qtcreator.pri/qtc.qbs
Currently it is set by passing defines to qmake, which complicates
package build setups.
Set the display version where the numerical version is defined. This
also makes it available to developer builds. Also switch around the
display version and numerical version in the about dialog, since e.g.
"4.3.0-rc1" is more descriptive than "4.2.83".
Change-Id: I26dda427975acdc6cc169f8d625f57918167cf19
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/coreplugin/icore.cpp')
-rw-r--r-- | src/plugins/coreplugin/icore.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/coreplugin/icore.cpp b/src/plugins/coreplugin/icore.cpp index a9c9c59cad..e5a1bc8a5f 100644 --- a/src/plugins/coreplugin/icore.cpp +++ b/src/plugins/coreplugin/icore.cpp @@ -459,10 +459,9 @@ static QString compilerString() QString ICore::versionString() { QString ideVersionDescription; -#ifdef IDE_VERSION_DESCRIPTION - ideVersionDescription = tr(" (%1)").arg(QLatin1String(Constants::IDE_VERSION_DESCRIPTION_STR)); -#endif - return tr("Qt Creator %1%2").arg(QLatin1String(Constants::IDE_VERSION_LONG), + if (QLatin1String(Constants::IDE_VERSION_LONG) != QLatin1String(Constants::IDE_VERSION_DISPLAY)) + ideVersionDescription = tr(" (%1)").arg(QLatin1String(Constants::IDE_VERSION_LONG)); + return tr("Qt Creator %1%2").arg(QLatin1String(Constants::IDE_VERSION_DISPLAY), ideVersionDescription); } |