diff options
| author | Cristian Adam <cristian.adam@qt.io> | 2024-04-30 15:08:24 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2024-05-02 10:02:09 +0000 |
| commit | 480f5366d281f02e87aadccf3e311a002d31c33d (patch) | |
| tree | b1f178b7b04d2432e1371733d965a1acaccd51bc /src/plugins/cmakeprojectmanager | |
| parent | 5920d9cb9eb86e4a35ba10e286dd0a1fe3b2476a (diff) | |
CMakePM: Do not force Kit's Qt version as projects Qt version
Amends c6d1c962ee778263c8f17f9aa5b521dbef1fdbc9
Fixes: QTCREATORBUG-30712
Change-Id: I1d78d108a7566f4f59ff0f479eb4b5eddb8a986f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/cmakeprojectmanager')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp index e6701ea750..d78e16a961 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp +++ b/src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp @@ -1354,12 +1354,10 @@ void CMakeBuildSystem::updateProjectData() return QtMajorVersion::None; }; - QtMajorVersion qtVersion = kitInfo.projectPartQtVersion; - if (qtVersion == QtMajorVersion::None) - qtVersion = qtVersionFromCMake({{QtMajorVersion::Qt6, {"Qt6", "Qt6Core"}}, - {QtMajorVersion::Qt5, {"Qt5", "Qt5Core"}}, - {QtMajorVersion::Qt4, {"Qt4", "Qt4Core"}} - }); + QtMajorVersion qtVersion = qtVersionFromCMake( + {{QtMajorVersion::Qt6, {"Qt6", "Qt6Core"}}, + {QtMajorVersion::Qt5, {"Qt5", "Qt5Core"}}, + {QtMajorVersion::Qt4, {"Qt4", "Qt4Core"}}}); QString errorMessage; RawProjectParts rpps = m_reader.createRawProjectParts(errorMessage); @@ -1368,7 +1366,7 @@ void CMakeBuildSystem::updateProjectData() qCDebug(cmakeBuildSystemLog) << "Raw project parts created." << errorMessage; for (RawProjectPart &rpp : rpps) { - rpp.setQtVersion(qtVersion); // TODO: Check if project actually uses Qt. + rpp.setQtVersion(qtVersion); const FilePath includeFileBaseDir = buildConfiguration()->buildDirectory(); QStringList cxxFlags = rpp.flagsForCxx.commandLineFlags; QStringList cFlags = rpp.flagsForC.commandLineFlags; |