Utils: Add Qt6 to QtVersion enum

Change-Id: Idb00fde1459d00caaf263a21eecb96e6f6bd6fd9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

src/libs/utils/cpplanguage_details.h

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

src/plugins/cpptools/cppcodemodelinspectordumper.cpp

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

src/plugins/mesonprojectmanager/kithelper/kithelper.h

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

src/plugins/mesonprojectmanager/machinefiles/nativefilegenerator.cpp

@@ -55,6 +55,8 @@ void writeBinariesSection(QIODevice *nativeFile, const KitData &kitData)
         addEntry(nativeFile, QString{"qmake-qt4"}, kitData.qmakePath);
     else if (kitData.qtVersion == Utils::QtVersion::Qt5)
         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);
 }
 

src/plugins/qtsupport/qtcppkitinfo.cpp

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