From 5edbf915a426b87f7fbc1a48332ec9c14e392c07 Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 28 Jun 2022 16:50:21 +0200 Subject: [PATCH] CMakePM: Fix registering CMake as version 0.0.0 When importing a CMake build, the CMake version that's used in the build could be registered as "CMake 0.0.0". This is obviously wrong. Fixes: QTCREATORBUG-26999 Change-Id: I1401106806c4356516e8235a3767d9615e4d428d Reviewed-by: Eike Ziller --- src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp | 3 +++ src/plugins/cmakeprojectmanager/cmaketool.cpp | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index ae970887fb7..ed2e24c9909 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -91,6 +91,9 @@ static QStringList scanDirectory(const FilePath &path, const QString &prefix) static QString baseCMakeToolDisplayName(CMakeTool &tool) { + if (!tool.isValid()) + return QString("CMake"); + CMakeTool::Version version = tool.version(); return QString("CMake %1.%2.%3").arg(version.major).arg(version.minor).arg(version.patch); } diff --git a/src/plugins/cmakeprojectmanager/cmaketool.cpp b/src/plugins/cmakeprojectmanager/cmaketool.cpp index c5804f039b8..dbcede75081 100644 --- a/src/plugins/cmakeprojectmanager/cmaketool.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketool.cpp @@ -310,12 +310,12 @@ bool CMakeTool::hasFileApi() const CMakeTool::Version CMakeTool::version() const { - return m_introspection ? m_introspection->m_version : CMakeTool::Version(); + return isValid() ? m_introspection->m_version : CMakeTool::Version(); } QString CMakeTool::versionDisplay() const { - if (!m_introspection) + if (!isValid()) return CMakeToolManager::tr("Version not parseable"); const Version &version = m_introspection->m_version;