feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtVersion: Allow for variables in Qt version names

Browse Source 
* 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>
This commit is contained in:
Tobias Hunger
2014-08-27 11:14:29 +02:00
parent aa52cd83a6
commit d56f217f83
16 changed files with 102 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/androidqtversion.cpp
View File

@@ -57,7 +57,7 @@ AndroidQtVersion::AndroidQtVersion()
AndroidQtVersion::AndroidQtVersion(const Utils::FileName &path, bool isAutodetected, const QString &autodetectionSource)
: QtSupport::BaseQtVersion(path, isAutodetected, autodetectionSource)
{
setDisplayName(defaultDisplayName(qtVersionString(), path, false));
setUnexpandedDisplayName(defaultUnexpandedDisplayName(path, false));
}
AndroidQtVersion *AndroidQtVersion::clone() const