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

CMake: Show INTERNAL settings as advanced

Browse Source 
Sometimes cmake changes the type of random settings to INTERNAL.
This change keeps them visible even then.

Change-Id: Icd6bf26b8e2cb031b76bbba8bf0aac70c349fb7b
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2016-05-13 16:16:20 +02:00
parent 5d69bdfde7
commit 0695384b12
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,15 +202,14 @@ QList<ConfigModel::DataItem> CMakeBuildConfiguration::completeCMakeConfiguration
if (m_completeConfigurationCache.isEmpty()) if (m_completeConfigurationCache.isEmpty())
m_completeConfigurationCache = m_buildDirManager->parsedConfiguration(); m_completeConfigurationCache = m_buildDirManager->parsedConfiguration();
CMakeConfig cache = Utils::filtered(m_completeConfigurationCache, return Utils::transform(m_completeConfigurationCache,
[](const CMakeConfigItem &i) { return i.type != CMakeConfigItem::INTERNAL; }); [this](const CMakeConfigItem &i) {
return Utils::transform(cache, [](const CMakeConfigItem &i) {
ConfigModel::DataItem j; ConfigModel::DataItem j;
j.key = QString::fromUtf8(i.key); j.key = QString::fromUtf8(i.key);
j.value = QString::fromUtf8(i.value); j.value = QString::fromUtf8(i.value);
j.description = QString::fromUtf8(i.documentation); j.description = QString::fromUtf8(i.documentation);
j.isAdvanced = i.isAdvanced; j.isAdvanced = i.isAdvanced || i.type == CMakeConfigItem::INTERNAL;
switch (i.type) { switch (i.type) {
case CMakeConfigItem::FILEPATH: case CMakeConfigItem::FILEPATH:
j.type = ConfigModel::DataItem::FILE; j.type = ConfigModel::DataItem::FILE;