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

CMake: Fix WS

Browse Source 
Change-Id: I24a265db05f4678a07f582f2e9a66ed1a17b0ac2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2019-06-18 14:30:58 +02:00
parent d56fa44964
commit f02fcaf02c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cmakeprojectmanager/cmaketool.cpp
View File

@@ -304,8 +304,8 @@ CMakeTool::PathMapper CMakeTool::pathMapper() const
void CMakeTool::readInformation(CMakeTool::QueryType type) const void CMakeTool::readInformation(CMakeTool::QueryType type) const
{ {
if ((type == QueryType::GENERATORS && !m_introspection->m_generators.isEmpty()) if ((type == QueryType::GENERATORS && !m_introspection->m_generators.isEmpty())
|| (type == QueryType::SERVER_MODE && m_introspection->m_queriedServerMode) || (type == QueryType::SERVER_MODE && m_introspection->m_queriedServerMode)
|| (type == QueryType::VERSION && !m_introspection->m_version.fullVersion.isEmpty())) || (type == QueryType::VERSION && !m_introspection->m_version.fullVersion.isEmpty()))
return; return;
if (!m_introspection->m_triedCapabilities) { if (!m_introspection->m_triedCapabilities) {
@@ -323,7 +323,7 @@ void CMakeTool::readInformation(CMakeTool::QueryType type) const
} else if (type == QueryType::VERSION) { } else if (type == QueryType::VERSION) {
fetchVersionFromVersionOutput(); fetchVersionFromVersionOutput();
} else { } else {
QTC_ASSERT(false, return); QTC_ASSERT(false, return );
} }
} }
@@ -475,7 +475,7 @@ void CMakeTool::parseGeneratorsFromHelp(const QStringList &lines) const
void CMakeTool::fetchVersionFromVersionOutput() const void CMakeTool::fetchVersionFromVersionOutput() const
{ {
Utils::SynchronousProcessResponse response = run({"--version" }); Utils::SynchronousProcessResponse response = run({"--version"});
if (response.result != Utils::SynchronousProcessResponse::Finished) if (response.result != Utils::SynchronousProcessResponse::Finished)
return; return;
@@ -500,7 +500,7 @@ void CMakeTool::parseVersionFormVersionOutput(const QStringList &lines) const
void CMakeTool::fetchFromCapabilities() const void CMakeTool::fetchFromCapabilities() const
{ {
Utils::SynchronousProcessResponse response = run({"-E", "capabilities" }, true); Utils::SynchronousProcessResponse response = run({"-E", "capabilities"}, true);
if (response.result != Utils::SynchronousProcessResponse::Finished) if (response.result != Utils::SynchronousProcessResponse::Finished)
return; return;
@@ -510,7 +510,7 @@ void CMakeTool::fetchFromCapabilities() const
static int getVersion(const QVariantMap &obj, const QString value) static int getVersion(const QVariantMap &obj, const QString value)
{ {
bool ok; bool ok;
int result = obj.value(value).toInt(&ok); int result = obj.value(value).toInt(&ok);
if (!ok) if (!ok)
return -1; return -1;
return result; return result;
@@ -536,7 +536,7 @@ void CMakeTool::parseFromCapabilities(const QString &input) const
{ {
const QVariantMap fileApis = data.value("fileApi").toMap(); const QVariantMap fileApis = data.value("fileApi").toMap();
const QVariantList requests = fileApis.value("requests").toList(); const QVariantList requests = fileApis.value("requests").toList();
for (const QVariant &r: requests) { for (const QVariant &r : requests) {
const QVariantMap object = r.toMap(); const QVariantMap object = r.toMap();
const QString kind = object.value("kind").toString(); const QString kind = object.value("kind").toString();
const QVariantMap versionObject = object.value("version").toMap(); const QVariantMap versionObject = object.value("version").toMap();