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

CMake: Make the project override the kit, not the other way around

Browse Source 
Change-Id: I26fbe90f9c5f9f46bf7a3be2e4a23c6e02a6eead
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-01-18 16:56:56 +01:00
committed by Tim Jenssen
parent 01e80b264b
commit fb55efd9e2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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