[Qt 6.2] Update Qt6 to 6.2

ports/qt/vcpkg.json

@@ -1,33 +1,149 @@
 {
   "name": "qt",
-  "version-semver": "6.1.3",
+  "version-semver": "6.2.0",
   "description": "Qt",
   "homepage": "https://www.qt.io/",
   "dependencies": [
-    "qt5compat",
+    {
+      "name": "qt5compat",
+      "default-features": false,
+      "features": [
+        "big-codecs",
+        "codecs",
+        "qml",
+        "textcodec"
+      ]
+    },
     {
       "name": "qtbase",
       "default-features": false
     },
-    "qtcharts",
+    {
+      "name": "qtcharts",
+      "default-features": false,
+      "features": [
+        "designer",
+        "qml"
+      ]
+    },
     "qtcoap",
+    "qtconnectivity",
     "qtdatavis3d",
     "qtdeclarative",
     "qtdoc",
-    "qtimageformats",
-    "qtlottie",
+    {
+      "name": "qtimageformats",
+      "default-features": false,
+      "features": [
+        "jasper",
+        "tiff",
+        "webp"
+      ]
+    },
+    {
+      "name": "qtlocation",
+      "default-features": false,
+      "features": [
+        "nmea",
+        "qml"
+      ]
+    },
+    {
+      "name": "qtlottie",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
     "qtmqtt",
+    {
+      "name": "qtmultimedia",
+      "default-features": false,
+      "features": [
+        "gstreamer",
+        "qml",
+        "widgets"
+      ]
+    },
     "qtnetworkauth",
-    "qtopcua",
-    "qtquick3d",
-    "qtquickcontrols2",
+    {
+      "name": "qtopcua",
+      "features": [
+        "qml"
+      ]
+    },
+    {
+      "name": "qtquick3d",
+      "default-features": false
+    },
     "qtquicktimeline",
-    "qtscxml",
+    {
+      "name": "qtremoteobjects",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
+    {
+      "name": "qtscxml",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
+    {
+      "name": "qtsensors",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
+    "qtserialbus",
+    "qtserialport",
     "qtshadertools",
     "qtsvg",
-    "qttools",
+    {
+      "name": "qttools",
+      "default-features": false,
+      "features": [
+        "assistant",
+        "designer",
+        "qml"
+      ]
+    },
     "qttranslations",
-    "qtvirtualkeyboard"
+    "qtvirtualkeyboard",
+    {
+      "name": "qtwebchannel",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
+    {
+      "name": "qtwebengine",
+      "default-features": false,
+      "features": [
+        "geolocation",
+        "spellchecker",
+        "webchannel"
+      ]
+    },
+    {
+      "name": "qtwebsockets",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
+    {
+      "name": "qtwebview",
+      "default-features": false,
+      "features": [
+        "qml",
+        "webengine"
+      ]
+    }
   ],
   "default-features": [
     "default-features"
@@ -38,10 +154,16 @@
       "dependencies": [
         {
           "name": "qtactiveqt",
+          "features": [
+            "qml"
+          ],
           "platform": "windows"
         },
         {
           "name": "qtwayland",
+          "features": [
+            "qml"
+          ],
           "platform": "linux"
         }
       ]

ports/qt5compat/portfile.cmake

@@ -12,6 +12,7 @@ FEATURES
     "iconv"         CMAKE_DISABLE_FIND_PACKAGE_ICU
 INVERTED_FEATURES
     "iconv"         CMAKE_DISABLE_FIND_PACKAGE_WrapIconv
+    "qml"           CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
     )
 
 #For iconv feature to work the following must be true:
@@ -26,3 +27,7 @@ qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                     )
+
+#For my documentation:
+# find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core)
+# find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Network Xml Gui Quick)

ports/qt5compat/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qt5compat",
-  "version-semver": "6.1.3",
+  "version-semver": "6.2.0",
   "description": "The module contains unsupported Qt 5 APIs",
   "homepage": "https://www.qt.io/",
   "dependencies": [
@@ -13,6 +13,7 @@
     "big-codecs",
     "codecs",
     "default-features",
+    "qml",
     "textcodec"
   ],
   "features": {
@@ -56,6 +57,22 @@
         }
       ]
     },
+    "qml": {
+      "description": "Build QML imports",
+      "dependencies": [
+        {
+          "name": "qtbase",
+          "default-features": false,
+          "features": [
+            "gui"
+          ]
+        },
+        {
+          "name": "qtdeclarative",
+          "default-features": false
+        }
+      ]
+    },
     "textcodec": {
       "description": "Supports conversions between text encodings."
     }

ports/qtactiveqt/portfile.cmake

@@ -17,9 +17,15 @@ if(NOT NO_BIN_AND_TOOLS)
        )
 endif()
 
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+FEATURES
+INVERTED_FEATURES
+    "qml"           CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
+)
+
 qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                      TOOL_NAMES ${TOOL_NAMES}
-                     CONFIGURE_OPTIONS
+                     CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                     )

ports/qtactiveqt/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "qtactiveqt",
-  "version-semver": "6.1.3",
+  "version-semver": "6.2.0",
   "description": "ActiveQt",
   "homepage": "https://www.qt.io/",
   "supports": "windows",
@@ -11,12 +11,24 @@
       "default-features": false
     },
     {
+      "$comment": "also requires printsupport!",
       "name": "qtbase",
-      "default-features": false
-    },
-    {
-      "name": "qttools",
-      "default-features": false
+      "default-features": false,
+      "features": [
+        "gui",
+        "widgets"
+      ]
+    }
+  ],
+  "features": {
+    "qml": {
+      "description": "Build QML imports",
+      "dependencies": [
+        {
+          "name": "qtdeclarative",
+          "default-features": false
+        }
+      ]
     }
-  ]
+  }
 }