diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-11-14 11:15:40 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-11-14 11:17:13 +0200 |
| commit | 9c09ca9e42c7a7f39bf279adcb14ae1691a409bc (patch) | |
| tree | 4a3e10324aa97692fb57e13d4a9870edc7d3e35b /src/plugins/cmakeprojectmanager/cmakekitinformation.cpp | |
| parent | 1a2f649b70c67380d29cdececbce3fad1b97dfca (diff) | |
| parent | b5f587efb540cff5f51052a6e30be3139d8b930d (diff) | |
| download | qt-creator-9c09ca9e42c7a7f39bf279adcb14ae1691a409bc.tar.gz | |
Merge remote-tracking branch 'origin/4.2'
Change-Id: Ia98031eb87f1859c3736faa0cdd8b655e8a50689
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakekitinformation.cpp')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakekitinformation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp index 6144ad575c..d38155c345 100644 --- a/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp +++ b/src/plugins/cmakeprojectmanager/cmakekitinformation.cpp @@ -507,7 +507,7 @@ CMakeConfig CMakeConfigurationKitInformation::defaultConfiguration(const Kit *k) // Qt4: config << CMakeConfigItem(CMAKE_QMAKE_KEY, "%{Qt:qmakeExecutable}"); // Qt5: - config << CMakeConfigItem(CMAKE_PREFIX_PATH_KEY, "%{Qt:QT_INSTALL_LIBS}"); + config << CMakeConfigItem(CMAKE_PREFIX_PATH_KEY, "%{Qt:QT_INSTALL_PREFIX}"); config << CMakeConfigItem(CMAKE_C_TOOLCHAIN_KEY, "%{Compiler:Executable:C}"); config << CMakeConfigItem(CMAKE_CXX_TOOLCHAIN_KEY, "%{Compiler:Executable:Cxx}"); @@ -535,7 +535,7 @@ QList<Task> CMakeConfigurationKitInformation::validate(const Kit *k) const const bool isQt4 = version && version->qtVersion() < QtSupport::QtVersionNumber(5, 0, 0); Utils::FileName qmakePath; - QStringList qtLibDirs; + QStringList qtInstallDirs; Utils::FileName tcCPath; Utils::FileName tcCxxPath; foreach (const CMakeConfigItem &i, config) { @@ -549,7 +549,7 @@ QList<Task> CMakeConfigurationKitInformation::validate(const Kit *k) const else if (i.key == CMAKE_CXX_TOOLCHAIN_KEY) tcCxxPath = expandedValue; else if (i.key == CMAKE_PREFIX_PATH_KEY) - qtLibDirs = CMakeConfigItem::cmakeSplitValue(expandedValue.toString()); + qtInstallDirs = CMakeConfigItem::cmakeSplitValue(expandedValue.toString()); } QList<Task> result; @@ -572,7 +572,7 @@ QList<Task> CMakeConfigurationKitInformation::validate(const Kit *k) const Utils::FileName(), -1, Core::Id(Constants::TASK_CATEGORY_BUILDSYSTEM)); } } - if (version && !qtLibDirs.contains(version->qmakeProperty("QT_INSTALL_LIBS")) && !isQt4) { + if (version && !qtInstallDirs.contains(version->qmakeProperty("QT_INSTALL_PREFIX")) && !isQt4) { if (version->isValid()) { result << Task(Task::Warning, tr("CMake configuration has no CMAKE_PREFIX_PATH set " "that points to the kit Qt version."), |