diff options
| author | Tobias Hunger <tobias.hunger@digia.com> | 2014-08-27 11:14:29 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-09-04 12:51:58 +0200 |
| commit | d56f217f83ff6d808a865a9b524cdfca0f7cc78b (patch) | |
| tree | 5f8dcb5e61c77997a66adb30d186cf8670542f23 /src/plugins/ios/iosqtversion.cpp | |
| parent | aa52cd83a63e0ecd659bf0ce4eefbdce4d0b6d48 (diff) | |
QtVersion: Allow for variables in Qt version names
* Supported variables are %{Qt:version}, %{Qt:type} and %{Qt:mkspec}
* Qt version display names need no longer be unique. This simplifies
the code a bit and makes the Qt versions behave like the Kits do now.
* The default Qt version name now contains %{Qt:version}. The method
to find the default version name no longer takes a Qt version string.
Change-Id: Ibca1e3daffe5a81f3c158e8bbc1779d033b03872
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/plugins/ios/iosqtversion.cpp')
| -rw-r--r-- | src/plugins/ios/iosqtversion.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/ios/iosqtversion.cpp b/src/plugins/ios/iosqtversion.cpp index 2ff4096f041..3f4e21b083c 100644 --- a/src/plugins/ios/iosqtversion.cpp +++ b/src/plugins/ios/iosqtversion.cpp @@ -58,7 +58,7 @@ IosQtVersion::IosQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource) : QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource) { - setDisplayName(defaultDisplayName(qtVersionString(), path, false)); + setUnexpandedDisplayName(defaultUnexpandedDisplayName(path, false)); } IosQtVersion *IosQtVersion::clone() const |