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

CMake: Use ServerModeReader to retrieve data

Browse Source 
Change-Id: I415dbf7ca79c909eea23ef3dc3a1d87438e9f261
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-10-17 14:38:38 +02:00
parent c75210034c
commit 36cfa32a86
6 changed files with 211 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/cmakeprojectmanager/servermodereader.cpp
View File

@@ -432,20 +432,7 @@ void ServerModeReader::extractCacheData(const QVariantMap &data)
CMakeConfigItem item;
item.key = eData.value("key").toByteArray();
item.value = eData.value("value").toByteArray();
item.type = CMakeConfigItem::STRING;
const QByteArray typeId = eData.value("type").toByteArray();
if (typeId == "FILEPATH")
item.type = CMakeConfigItem::STRING;
else if (typeId == "PATH")
item.type = CMakeConfigItem::PATH;
else if (typeId == "BOOL")
item.type = CMakeConfigItem::BOOL;
else if (typeId == "INTERNAL")
item.type = CMakeConfigItem::INTERNAL;
else if (typeId == "STRING")
item.type = CMakeConfigItem::STRING;
else if (typeId == "STATIC")
item.type = CMakeConfigItem::STATIC;
item.type = CMakeConfigItem::typeStringToType(eData.value("type").toByteArray());
const QVariantMap properties = eData.value("properties").toMap();
item.isAdvanced = properties.value("ADVANCED", false).toBool();
item.documentation = properties.value("HELPSTRING").toByteArray();