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

CMakePM: Do not force Kit's Qt version as projects Qt version

Browse Source 
Amends c6d1c962ee

Fixes: QTCREATORBUG-30712
Change-Id: I1d78d108a7566f4f59ff0f479eb4b5eddb8a986f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Cristian Adam
2024-04-30 15:08:24 +02:00
parent 5920d9cb9e
commit 480f5366d2
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -1354,12 +1354,10 @@ void CMakeBuildSystem::updateProjectData()
return QtMajorVersion::None; return QtMajorVersion::None;
}; };
QtMajorVersion qtVersion = kitInfo.projectPartQtVersion; QtMajorVersion qtVersion = qtVersionFromCMake(
if (qtVersion == QtMajorVersion::None) {{QtMajorVersion::Qt6, {"Qt6", "Qt6Core"}},
qtVersion = qtVersionFromCMake({{QtMajorVersion::Qt6, {"Qt6", "Qt6Core"}}, {QtMajorVersion::Qt5, {"Qt5", "Qt5Core"}},
{QtMajorVersion::Qt5, {"Qt5", "Qt5Core"}}, {QtMajorVersion::Qt4, {"Qt4", "Qt4Core"}}});
{QtMajorVersion::Qt4, {"Qt4", "Qt4Core"}}
});
QString errorMessage; QString errorMessage;
RawProjectParts rpps = m_reader.createRawProjectParts(errorMessage); RawProjectParts rpps = m_reader.createRawProjectParts(errorMessage);
@@ -1368,7 +1366,7 @@ void CMakeBuildSystem::updateProjectData()
qCDebug(cmakeBuildSystemLog) << "Raw project parts created." << errorMessage; qCDebug(cmakeBuildSystemLog) << "Raw project parts created." << errorMessage;
for (RawProjectPart &rpp : rpps) { for (RawProjectPart &rpp : rpps) {
rpp.setQtVersion(qtVersion); // TODO: Check if project actually uses Qt. rpp.setQtVersion(qtVersion);
const FilePath includeFileBaseDir = buildConfiguration()->buildDirectory(); const FilePath includeFileBaseDir = buildConfiguration()->buildDirectory();
QStringList cxxFlags = rpp.flagsForCxx.commandLineFlags; QStringList cxxFlags = rpp.flagsForCxx.commandLineFlags;
QStringList cFlags = rpp.flagsForC.commandLineFlags; QStringList cFlags = rpp.flagsForC.commandLineFlags;