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

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Change-Id: I4817ff528f92dcb2ffb00c92ca1039f1ae31c7f1
This commit is contained in:
Eike Ziller
2024-05-02 14:47:43 +02:00
parent b090401b78 ff6e8656d7
commit d2afb4e8af
4 changed files with 137 additions and 10 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;
};
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;