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

CMake: Make project configuration win over kit configuration

Browse Source 
removeDuplicates keeps the first instance, so pass in the project
configuration first.

Change-Id: I2549b8043905687fecc3b690f1d54456c42a4cf3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-12-01 14:16:46 +01:00
parent 168c5c67a2
commit b328a6357f
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -376,8 +376,7 @@ void CMakeBuildConfiguration::setCMakeConfiguration(const CMakeConfig &config)
CMakeConfig CMakeBuildConfiguration::cmakeConfiguration() const CMakeConfig CMakeBuildConfiguration::cmakeConfiguration() const
{ {
return removeDuplicates(CMakeConfigurationKitInformation::configuration(target()->kit()) return removeDuplicates(m_configuration + CMakeConfigurationKitInformation::configuration(target()->kit()));
+ m_configuration);
} }
void CMakeBuildConfiguration::setError(const QString &message) void CMakeBuildConfiguration::setError(const QString &message)