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

Utils: Add Qt6 to QtVersion enum

Browse Source 
Change-Id: Idb00fde1459d00caaf263a21eecb96e6f6bd6fd9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Cristian Adam
2020-12-22 19:32:44 +01:00
parent 2e261fbf60
commit 5271a5c782
5 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/cpplanguage_details.h
View File

@@ -90,7 +90,7 @@ enum class WarningFlags {
Q_DECLARE_FLAGS(LanguageExtensions, LanguageExtension) Q_DECLARE_FLAGS(LanguageExtensions, LanguageExtension)
enum class QtVersion { Unknown = -1, None, Qt4, Qt5 }; enum class QtVersion { Unknown = -1, None, Qt4, Qt5, Qt6 };
} // namespace Utils } // namespace Utils

1
src/plugins/cpptools/cppcodemodelinspectordumper.cpp
View File

@@ -158,6 +158,7 @@ QString Utils::toString(::Utils::QtVersion qtVersion)
CASE_QTVERSION(None); CASE_QTVERSION(None);
CASE_QTVERSION(Qt4); CASE_QTVERSION(Qt4);
CASE_QTVERSION(Qt5); CASE_QTVERSION(Qt5);
CASE_QTVERSION(Qt6);
// no default to get a compiler warning if anything is added // no default to get a compiler warning if anything is added
} }
#undef CASE_QTVERSION #undef CASE_QTVERSION

3
src/plugins/mesonprojectmanager/kithelper/kithelper.h
View File

@@ -94,6 +94,9 @@ inline KitData kitData(const ProjectExplorer::Kit *kit)
case 5: case 5:
data.qtVersion = Utils::QtVersion::Qt5; data.qtVersion = Utils::QtVersion::Qt5;
break; break;
case 6:
data.qtVersion = Utils::QtVersion::Qt6;
break;
default: default:
data.qtVersion = Utils::QtVersion::Unknown; data.qtVersion = Utils::QtVersion::Unknown;
} }

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

@@ -55,6 +55,8 @@ void writeBinariesSection(QIODevice *nativeFile, const KitData &kitData)
addEntry(nativeFile, QString{"qmake-qt4"}, kitData.qmakePath); addEntry(nativeFile, QString{"qmake-qt4"}, kitData.qmakePath);
else if (kitData.qtVersion == Utils::QtVersion::Qt5) else if (kitData.qtVersion == Utils::QtVersion::Qt5)
addEntry(nativeFile, QString{"qmake-qt5"}, kitData.qmakePath); addEntry(nativeFile, QString{"qmake-qt5"}, kitData.qmakePath);
else if (kitData.qtVersion == Utils::QtVersion::Qt6)
addEntry(nativeFile, QString{"qmake-qt6"}, kitData.qmakePath);
addEntry(nativeFile, "cmake", kitData.cmakePath); addEntry(nativeFile, "cmake", kitData.cmakePath);
} }

4
src/plugins/qtsupport/qtcppkitinfo.cpp
View File

@@ -36,8 +36,10 @@ CppKitInfo::CppKitInfo(ProjectExplorer::Kit *kit)
if (kit && (qtVersion = QtKitAspect::qtVersion(kit))) { if (kit && (qtVersion = QtKitAspect::qtVersion(kit))) {
if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5, 0, 0)) if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5, 0, 0))
projectPartQtVersion = Utils::QtVersion::Qt4; projectPartQtVersion = Utils::QtVersion::Qt4;
else else if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(6, 0, 0))
projectPartQtVersion = Utils::QtVersion::Qt5; projectPartQtVersion = Utils::QtVersion::Qt5;
else
projectPartQtVersion = Utils::QtVersion::Qt6;
} }
} }