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

Rename QtSupport::BaseQtVersion to QtVersion

Browse Source 
... and the Utils::QtVersion enum to Utils::QtMajorVersion to avoid
conflicts.

Change-Id: Ib688c67388272b7204a91444155f60b8c18a56bd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2022-01-21 16:06:36 +01:00
parent 6cec0e2033
commit 25f5771aa4
113 changed files with 636 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.cpp
View File

@@ -51,11 +51,11 @@ void writeBinariesSection(QIODevice *nativeFile, const KitData &kitData)
addEntry(nativeFile, "c", kitData.cCompilerPath);
addEntry(nativeFile, "cpp", kitData.cxxCompilerPath);
addEntry(nativeFile, "qmake", kitData.qmakePath);
if (kitData.qtVersion == Utils::QtVersion::Qt4)
if (kitData.qtVersion == Utils::QtMajorVersion::Qt4)
addEntry(nativeFile, QString{"qmake-qt4"}, kitData.qmakePath);
else if (kitData.qtVersion == Utils::QtVersion::Qt5)
else if (kitData.qtVersion == Utils::QtMajorVersion::Qt5)
addEntry(nativeFile, QString{"qmake-qt5"}, kitData.qmakePath);
else if (kitData.qtVersion == Utils::QtVersion::Qt6)
else if (kitData.qtVersion == Utils::QtMajorVersion::Qt6)
addEntry(nativeFile, QString{"qmake-qt6"}, kitData.qmakePath);
addEntry(nativeFile, "cmake", kitData.cmakePath);
}