forked from qt-creator/qt-creator
CMakePM: Always display the right CMake version Qt SDK installs
Qt SDK is using the following parameters for sdktool: "--name", "CMake %CMAKE_VERSION% (Qt)" This effectively hardcodes the CMake version for the Qt SDK forever. Fixes: QTCREATORBUG-30019 Fixes: QTCREATORBUG-29973 Fixes: QTCREATORBUG-28437 Change-Id: I05408442ea26d390f60a123be4fbf71f7018b150 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -120,6 +120,10 @@ public:
|
|||||||
m_tooltip += "<br>" + Tr::tr("Detection source: \"%1\"").arg(m_detectionSource);
|
m_tooltip += "<br>" + Tr::tr("Detection source: \"%1\"").arg(m_detectionSource);
|
||||||
|
|
||||||
m_versionDisplay = cmake.versionDisplay();
|
m_versionDisplay = cmake.versionDisplay();
|
||||||
|
|
||||||
|
// Make sure to always have the right version in the name for Qt SDK CMake installations
|
||||||
|
if (m_name.startsWith("CMake") && m_name.endsWith("(Qt)"))
|
||||||
|
m_name = QString("CMake %1 (Qt)").arg(m_versionDisplay);
|
||||||
}
|
}
|
||||||
|
|
||||||
CMakeToolTreeItem() = default;
|
CMakeToolTreeItem() = default;
|
||||||
|
Reference in New Issue
Block a user