microsoft · BillyONeal · Dec 7, 2021 · Dec 2, 2021 · Dec 2, 2021 · Dec 2, 2021
diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt",
-  "version-semver": "6.2.1",
+  "version-semver": "6.2.2",
   "description": "Qt",
   "homepage": "https://www.qt.io/",
   "dependencies": [
@@ -14,6 +14,7 @@
         "textcodec"
       ]
     },
+    "qtapplicationmanager",
     {
       "name": "qtbase",
       "default-features": false
@@ -30,6 +31,7 @@
     "qtconnectivity",
     "qtdatavis3d",
     "qtdeclarative",
+    "qtdeviceutilities",
     "qtdoc",
     {
       "name": "qtimageformats",
@@ -40,14 +42,7 @@
         "webp"
       ]
     },
-    {
-      "name": "qtlocation",
-      "default-features": false,
-      "features": [
-        "nmea",
-        "qml"
-      ]
-    },
+    "qtinterfaceframework",
     {
       "name": "qtlottie",
       "default-features": false,
@@ -72,6 +67,13 @@
         "qml"
       ]
     },
+    {
+      "name": "qtpositioning",
+      "default-features": false,
+      "features": [
+        "qml"
+      ]
+    },
     {
       "name": "qtquick3d",
       "default-features": false

diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt5compat",
-  "version-semver": "6.2.1",
+  "version-semver": "6.2.2",
   "description": "The module contains unsupported Qt 5 APIs",
   "homepage": "https://www.qt.io/",
   "dependencies": [

diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtactiveqt",
-  "version-semver": "6.2.1",
+  "version-semver": "6.2.2",
   "description": "ActiveQt",
   "homepage": "https://www.qt.io/",
   "supports": "windows",

diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake
@@ -0,0 +1,13 @@
+set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
+include("${SCRIPT_PATH}/qt_install_submodule.cmake")
+
+set(${PORT}_PATCHES)
+
+set(TOOL_NAMES)
+
+qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
+                     TOOL_NAMES ${TOOL_NAMES}
+                     CONFIGURE_OPTIONS
+                     CONFIGURE_OPTIONS_RELEASE
+                     CONFIGURE_OPTIONS_DEBUG
+                    )
diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json
@@ -0,0 +1,21 @@
+{
+  "name": "qtapplicationmanager",
+  "version-semver": "6.2.2",
+  "description": "Qt component for application lifecycle management",
+  "homepage": "https://www.qt.io/",
+  "dependencies": [
+    {
+      "name": "qtbase",
+      "default-features": false
+    },
+    {
+      "name": "qtdeclarative",
+      "default-features": false
+    },
+    {
+      "name": "qtwayland",
+      "default-features": false,
+      "platform": "!windows"
+    }
+  ]
+}
diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake
@@ -1,11 +1,17 @@
-set(QT_VERSION 6.2.1)
+set(QT_VERSION 6.2.2)
 
 if(PORT MATCHES "qtquickcontrols2")
     set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
     message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!")
     return()
 endif()
-set(QT_GIT_TAG v${QT_VERSION})
+
+### Setting up the git tag.
+set(QT_GIT_TAG "v${QT_VERSION}")
+if(PORT MATCHES "qtdeviceutilities|qtlocation|qtinterfaceframework|qtapplicationmanager")
+    # So much for consistency ....
+    set(QT_GIT_TAG "${QT_VERSION}")
+endif()
 
 #set(QT_UPDATE_VERSION TRUE)
 if(QT_UPDATE_VERSION)
@@ -34,13 +40,14 @@ set(QT_PORTS qt
              ## New in 6.1
              qtactiveqt
              qtdatavis3d
-             #qtdeviceutils
+             qtdeviceutilities
              qtlottie
              qtscxml
              qtvirtualkeyboard
              qtcharts
              ## New in 6.2
              qtconnectivity
+             qtpositioning
              qtlocation
              qtmultimedia
              qtremoteobjects
@@ -51,48 +58,55 @@ set(QT_PORTS qt
              qtwebengine
              qtwebsockets
              qtwebview
+             ## New in 6.2.2
+             qtinterfaceframework
+             qtapplicationmanager
     )
 
 foreach(_port IN LISTS QT_PORTS)
     set(${_port}_TAG ${QT_GIT_TAG})
 endforeach()
-set(qtbase_REF              fbdf50b6c6f69ab88d7a53dfb3ab35e2b49a9664)
-set(qtshadertools_REF       73deb667b27451340cafc20ead3aeb4ea84a5246)
-set(qtdeclarative_REF       3419dd06c5928e292e0c25692427632e124eefea)
-set(qt5compat_REF           3f69f4b1e7d07756b9de7629ec22e1c68265c88a)
-set(qttools_REF             8e1f1f6e906095a8f2d5ebbf85443e2407d4e07c) # Additional refs in portfile due to submodule
-set(qtcoap_REF              1c0bb10d86b43c4b3860cd4526087e644d3f4b07)
-set(qtdoc_REF               040ef9a76b5f79d3cf5e42849d5f49a51522dc0f)
-set(qtimageformats_REF      bd8b167280addfb9b2ee0d493d6cf7b31c03e574)
-set(qtmqtt_REF              610543f328127c68ab39960ded51649ad41d3bd4)
-set(qtnetworkauth_REF       1987896634a2c4ac23842b366b4704f0b1396de7)
-set(qtopcua_REF             ae441a8fff3603e7d21957a09a0b3014669bbb0b)
-set(qtquicktimeline_REF     6ba89379c0859622d71f75486b8d872cc4a709ca)
-set(qtquick3d_REF           7e30ae5f8b6f3c28a2ee2df3788846fc67ec3c1c)
-set(qtsvg_REF               30ad9d119079f486817e60025eceffdc0745ffcf)
-set(qttranslations_REF      6d297398a2f9b0f7cf67de63369ca7b75ed60034)
-set(qtwayland_REF           bea7e0ee35211873c90987c905e3fd68d41df4da)
-# set(qtquickcontrols2_REF   0) # Moved into qtdeclarative since Qt 6.2
+set(qtbase_REF                  61fbf7596beda0178e213a7ba945bc0314153366)
+set(qtshadertools_REF           3ce1b25b413aef98a68c0b05305a6849bb558889)
+set(qtdeclarative_REF           f4cbbe999d912b2c66fffc8b7bf11b59fd92a178)
+set(qt5compat_REF               e38a2b4653780317feed0d0f7c0adb2964ed674c)
+set(qttools_REF                 f779b0439e3984f592320c0e5b3ba52f3627c07b) # Additional refs in portfile due to submodule
+set(qtcoap_REF                  fe7ea10937ece3b19fc7d909790e1bfec23c363f)
+set(qtdoc_REF                   aeb34a71d6f93b3ddb438e52c3f4d963e8c51ab9)
+set(qtimageformats_REF          02a3365745ceb3cdcc27b2dd6f80300f5c03f6f4)
+set(qtmqtt_REF                  deff6a3853c9a09e18fa05ae9aa6c5868ba2d1b7)
+set(qtnetworkauth_REF           470a295fcb61e37640e00c75be1870a3b1cb227e)
+set(qtopcua_REF                 b8e9b695c71d73e21ac489136fca1c2991ebea78)
+set(qtquicktimeline_REF         7c74c9025c8c5f390f5a19ec9bd1d0d4fc36cee2)
+set(qtquick3d_REF               8a06b1c9e69c2b83fff313bab4cdc463b6c55b8c)
+set(qtsvg_REF                   414fe3bc0f77704c9184ee1039ffea82de8b6c0b)
+set(qttranslations_REF          a8b48341570242a700fd61abf16ef106b4b4d8b2)
+set(qtwayland_REF               b6d7b9d5dea396b1454b4e204f37a66e3da39150)
 ### New in 6.1
-set(qtactiveqt_REF          1b710fa0b5e054189b62e2e7fe32fcf1bec0b081)
-set(qtcharts_REF            78a74a1fcdc4329c054691021a65ff00dcd09ebb)
-set(qtdatavis3d_REF         bec62cdb6f800087fd92085984fde389e9091e13)
-#set(qtdeviceutils_REF      0) #missing tag
-set(qtlottie_REF            9c72963a986d921e5c1cbdca6638fa17c9f8fa45)
-set(qtscxml_REF             069fb385a21e2f844adeb74fbb06849ef5422c7d)
-set(qtvirtualkeyboard_REF   b6fe68874ed8ff86202320435a743521a245c515)
+set(qtactiveqt_REF              9d373846d2f0073f530b1e714afeb76cf039df94)
+set(qtcharts_REF                b74fa4205af2f6be69ec1a233aaee28f1eb6b838)
+set(qtdatavis3d_REF             e5ee7c79d3e6845267691c0074ae3aa286cbe904)
+set(qtdeviceutilities_REF       df77ef89d3b1cbeda9996702e0a26a9a58c9f467) #missing tag
+set(qtlottie_REF                6c16cfae5f39bf1047f73ae99bbe7d99c79f5179)
+set(qtscxml_REF                 6dd18cdf4d24d159f7114b8b31a81d95a24f3ca2)
+set(qtvirtualkeyboard_REF       7473762116f3c0bdfc5d8e4d55137013ea082eaf)
 ### New in 6.2
-set(qtconnectivity_REF      e910b93cc161930748260626b414b7f4241e6d58)
-set(qtlocation_REF          70c3948264d5e6e3bc9be4f0e5d8fdae8b821a08)
-set(qtmultimedia_REF        64bc1b00b2979866d577eb57fd118ae497cf6391)
-set(qtremoteobjects_REF     8876b4e07174b7fe3124de74002730684b1d0d82)
-set(qtsensors_REF           8a949e9314682e6940f1b38f30f5d5f3fd1d6260)
-set(qtserialbus_REF         709110461a843a9a0236f3cde27414157a088235)
-set(qtserialport_REF        d8b40852053623d44e8a07f4c208ace27dcde925)
-set(qtwebchannel_REF        c93ddec0eb35707fafd209bee8472fd6ee4a3cb6)
-set(qtwebengine_REF         b879b3ed6b4bb7d6951cf430d5e9b49898fe6c9a) # Additional refs in portfile due to submodule
-set(qtwebsockets_REF        68a4c96964935ada5ae1ca323713b4e3862f010f)
-set(qtwebview_REF           7ef6e31dd2ead012f941ddcaf30e5d4c2abf693b)
+set(qtconnectivity_REF          a723287f639e81a3253f6c0923475da5294a3342)
+set(qtserialport_REF            6a92ae54a27d6fc40e5f44332a7d7d49999a8643)
+set(qtmultimedia_REF            6a55ffc411f6ea73d45a7109d54c5cca1a482930)
+set(qtremoteobjects_REF         cc1fd1722180b8a46994c7c751ea4b3b7ab30c58)
+set(qtsensors_REF               ba5da0a367fa2f11b577ba226bea488eda7dd499)
+set(qtserialbus_REF             125631af95d958d55b7b0789dfe64e0d1f7d0122)
+set(qtlocation_REF              6db775f6d9d72cf8ee9d66333b8424e74be1e352)
+set(qtwebchannel_REF            e55fa2e085466238e24d53abf4fc9ede7a7590e4)
+set(qtwebengine_REF             ad19d22d3aa5d692b4988f2ffb88868232e6fc0c) # Additional refs in portfile due to submodule
+set(qtwebsockets_REF            18c452968b3c3ad6c1e1b6512ebd96e9f895c571)
+set(qtwebview_REF               eb5a94f20e77a9639b07ae3d59c9d67529ffed66)
+set(qtpositioning_REF           1294c29be50fa5cdf2d78afffac0451f7b4bc16a)
+### New in Qt 6.2.2
+set(qtapplicationmanager_REF    1009f73d1f5c07947cdc2318150279ad43fc4b04)
+set(qtqtinterfaceframework_REF  118fa138186144cf2d802405255f08662ed76d43)
+
 
 if(QT_UPDATE_VERSION)
     message(STATUS "Running Qt in automatic version port update mode!")

diff --git a/ports/qtbase/cocoa.patch b/ports/qtbase/cocoa.patch
diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
@@ -17,7 +17,6 @@ set(${PORT}_PATCHES
         fix_cmake_build.patch
         harfbuzz.patch
         fix_egl.patch
-        cocoa.patch
         )
 
 if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST)

diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "qtbase",
-  "version-semver": "6.2.1",
-  "port-version": 1,
+  "version-semver": "6.2.2",
   "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
   "homepage": "https://www.qt.io/",
   "dependencies": [

diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtcharts",
-  "version-semver": "6.2.1",
+  "version-semver": "6.2.2",
   "description": "QtCharts module",
   "homepage": "https://www.qt.io/",
   "dependencies": [

diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtcoap",
-  "version-semver": "6.2.1",
+  "version-semver": "6.2.2",
   "description": "Qt CoAP client module",
   "homepage": "https://www.qt.io/",
   "dependencies": [

diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtconnectivity",
-  "version-semver": "6.2.1",
+  "version-semver": "6.2.2",
   "description": "Qt Connectivity",
   "homepage": "https://www.qt.io/",
   "dependencies": [

diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdatavis3d",
-  "version-semver": "6.2.1",
+  "version-semver": "6.2.2",
   "description": "Qt 3D data visualization framework",
   "homepage": "https://www.qt.io/",
   "dependencies": [

diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdeclarative",
-  "version-semver": "6.2.1",
+  "version-semver": "6.2.2",
   "description": "Qt Declarative (Quick 2)",
   "homepage": "https://www.qt.io/",
   "dependencies": [

diff --git a/ports/qtdeviceutilities/portfile.cmake b/ports/qtdeviceutilities/portfile.cmake
@@ -0,0 +1,13 @@
+set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
+include("${SCRIPT_PATH}/qt_install_submodule.cmake")
+
+set(${PORT}_PATCHES)
+
+set(TOOL_NAMES settingsui)
+
+qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
+                     TOOL_NAMES ${TOOL_NAMES}
+                     CONFIGURE_OPTIONS
+                     CONFIGURE_OPTIONS_RELEASE
+                     CONFIGURE_OPTIONS_DEBUG
+                    )
diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json
@@ -0,0 +1,17 @@
+{
+  "name": "qtdeviceutilities",
+  "version-semver": "6.2.2",
+  "description": "Utils for Boot2Qt",
+  "homepage": "https://www.qt.io/",
+  "supports": "linux",
+  "dependencies": [
+    {
+      "name": "qtdeclarative",
+      "default-features": false
+    },
+    {
+      "name": "qttools",
+      "default-features": false
+    }
+  ]
+}
diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtdoc",
-  "version-semver": "6.2.1",
+  "version-semver": "6.2.2",
   "description": "Qt Documentation",
   "homepage": "https://www.qt.io/",
   "dependencies": [

diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtimageformats",
-  "version-semver": "6.2.1",
+  "version-semver": "6.2.2",
   "description": "Additional Image Format plugins for Qt",
   "homepage": "https://www.qt.io/",
   "dependencies": [

diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake
@@ -0,0 +1,43 @@
+set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
+include("${SCRIPT_PATH}/qt_install_submodule.cmake")
+
+set(${PORT}_PATCHES "")
+set(TOOL_NAMES "")
+
+#[submodule "src/3rdparty/qface"]
+#	path = src/3rdparty/qface
+#	url = ../qtinterfaceframework-qface.git
+#[submodule "src/3rdparty/taglib/taglib"] # Is in vcpkg
+#	path = src/3rdparty/taglib/taglib
+#	url = ../qtinterfaceframework-taglib.git
+#	branch = upstream/master
+
+vcpkg_from_git(
+    OUT_SOURCE_PATH SOURCE_PATH_QFACE
+    URL git://code.qt.io/qt/qtinterfaceframework-qface.git
+    REF 4f4027b4bb677eafad0bfb2593226b71ee2c98e6
+    FETCH_REF upstream/master
+    HEAD_REF upstream/master
+)
+
+qt_download_submodule(PATCHES ${${PORT}_PATCHES})
+if(QT_UPDATE_VERSION)
+    return()
+endif()
+file(COPY "${SOURCE_PATH_QFACE}/" DESTINATION "${SOURCE_PATH}/src/3rdparty/qface")
+
+if(_qis_DISABLE_NINJA)
+    set(_opt DISABLE_NINJA)
+endif()
+
+qt_cmake_configure(${_opt} 
+                   OPTIONS ${FEATURE_OPTIONS}
+                   OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG}
+                   OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE})
+
+vcpkg_install_cmake(ADD_BIN_TO_PATH)
+
+qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES})
+
+qt_install_copyright("${SOURCE_PATH}")
+