From f7d729f0b519aa17ec201ae76543185b92537d4b Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Wed, 3 Mar 2021 16:06:20 +0100 Subject: [PATCH] CMakePM: Treat empty build as empty when importing CMake builds Qt Creator 4.15 with the CMake multi-config support it parses the correct CMAKE_BUILD_TYPE file-api json export. With the empty build Qt Creator was giving it a name: Build, which was not part of the file-api json export. Fixes: QTCREATORBUG-25387 Change-Id: Id0b5f1077f6473fa5aef09397a8257b253557597 Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/fileapireader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/cmakeprojectmanager/fileapireader.cpp b/src/plugins/cmakeprojectmanager/fileapireader.cpp index 0657782c980..ae3725e4a8c 100644 --- a/src/plugins/cmakeprojectmanager/fileapireader.cpp +++ b/src/plugins/cmakeprojectmanager/fileapireader.cpp @@ -253,7 +253,7 @@ void FileApiReader::endState(const QFileInfo &replyFi) const FilePath sourceDirectory = m_parameters.sourceDirectory; const FilePath buildDirectory = m_parameters.workDirectory; const FilePath topCmakeFile = m_cmakeFiles.size() == 1 ? *m_cmakeFiles.begin() : FilePath{}; - const QString cmakeBuildType = m_parameters.cmakeBuildType; + const QString cmakeBuildType = m_parameters.cmakeBuildType == "Build" ? "" : m_parameters.cmakeBuildType; m_lastReplyTimestamp = replyFi.lastModified();