[qt] update port to 6.4

ports/qtbase/clang-cl_QGADGET_fix.diff

@@ -2,8 +2,9 @@ diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
 index e40cd85..ba68a01 100644
 --- a/src/corelib/kernel/qmetatype.h
 +++ b/src/corelib/kernel/qmetatype.h
-@@ -18,5 +18,6 @@
+@@ -18,6 +18,7 @@
  #endif
+ #include <QtCore/qhashfunctions.h>
 
 +#include <type_traits>
  #include <array>

ports/qtbase/cmake/qt_install_copyright.cmake

@@ -16,5 +16,12 @@ function(qt_install_copyright SOURCE_PATH)
     elseif(EXISTS "${SOURCE_PATH}/LICENSE.FDL")
         set(LICENSE_PATH "${SOURCE_PATH}/LICENSE.FDL")
     endif()
-    file(INSTALL "${LICENSE_PATH}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+    if(LICENSE_PATH)
+        file(INSTALL "${LICENSE_PATH}" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+    elseif(EXISTS "${SOURCE_PATH}/LICENSES")
+        file(GLOB LICENSES "${SOURCE_PATH}/LICENSES/*")
+        vcpkg_install_copyright(FILE_LIST ${LICENSES})
+    else()
+        message(WARNING "No license/copyright file found!")
+    endif()
 endfunction()

ports/qtbase/cmake/qt_port_data.cmake

@@ -1,37 +1,39 @@
-set(qtbase_HASH "5c4304dc1f5fa80201b61c9c8dbf4c3449506a243ea1f87e336dc3641a37b9d40c2aa4a93190cc69ddde0f349c74e327c35de5f46de888ddfd49616903e8a7b5")
-set(qttools_HASH "6e392ef2415b14119d0c4058efa78f1a66e91c01c8f48a2f1926df43f7f1cb8fcd94f84c91fc0188baa96e3055eede6f080ca4e9f150e263c3fdc5c864649883")
-set(qtdeclarative_HASH "547b29dcf26f734b32283677b9e02a43a75f3ab4849e578592031fa37babc09e5b1795e719119ba6b9400ef59b16fd387fb97aa3603454775be4a27e19ff065c")
-set(qtsvg_HASH "c040e96d2dc7ef615859dec589e0b0c4e5972c3761dcf9208086b0662bfa1c3d147a10534d62d86fd8c9786a1567f8e9ca196f942a372422fc81cd02f1312c4c")
-set(qt5compat_HASH "66196a8d29a2789179904638fcd9ec162d5715e7dc28618b3ef78d07682a05578b6c2e7023144c628b94321a9c1332d39826c13adb1e5db5121406c530c9c35c")
-set(qtshadertools_HASH "c9f62139e4407b7bfbec78c231d00fd627be5396056a68c054e6b6ecada8af846198aadcbe2af56bb2c525f2851ecd492195a432e4e084f1db346d2e3722747e")
-set(qtquicktimeline_HASH "ad55ed87942ac39c28587e15a5928ed458d5019501a689b7e51d105032d65122ef866a9d39af91c382def54d6e5246a38d16a0906f05fb8d1374e9eecefd2646")
-set(qtquick3d_HASH "342a1c558a4eece6e9442e45cc400af58c96fb59614902e0299291ea2c5b1c406d76cd8ec8cf1d8ac0d8b5fc4f2f4637063d1747dcdc54f191a81310df93534e")
-set(qttranslations_HASH "1c29842c6fbf669911849649c02415fb911ff187d928604a9bb4473a57aeb463182ed972e0ed0cacba20f8cca8da6733866657edcc22a9a8e9f1cf77ebaba98f")
-set(qtwayland_HASH "571654a6abcd865717d4624c65d78e1b911829bba84f609521f349bf896b9475a8ce7759ba6b69e4bc4eef10c31e404c71610816dbee20d1202401efefa2323d")
-set(qtdoc_HASH "707f8284b31a9d6bac7a5783e554d641b2092f3571c239207d02e958438d403750216722a9663415e7a2348a8d9afd13f19cfb534d25cdda817c652d1386c011")
-set(qtcoap_HASH "4393cdeb0e7a48224b3ea9f63fc4c0594e782fbe2c25a40b3d0cbfd8eb830df740e4489ea5f77947821ef3e6c7744735fc9a2c59a54411b6134e14d71be46cf5")
-set(qtopcua_HASH "7dcd6fa710c7c5ef7f41421b12ee4c56ed14ea9da44799ff27ae0c74cda8c41436173d7280afaa34a0284c66540f107ec441ad3bd329a0b98db8814618cd7f45")
-set(qtimageformats_HASH "9be2c4dab869c7709775514ee2dbc9d84c8e76b98e8e8a01fcf96355b3309f1830bff57cd9455bc4a33c5f8f0cb948619806dff6f303233c35e5efbdf3cc92f7")
-set(qtmqtt_HASH "786e103971ed249b7656261c8844dd84e809246fca65b96b31ba86ee998beefcff9be059fd8c4bc3e2003f3b75b3c3026d7908c96ee4ec5e9ef3629a6280b380")
-set(qtnetworkauth_HASH "e7e73c57f9bfebaca7990b5d886682a4fbe5d46c8c952d056514236ae7d6beee4614dc9c957c1fa2526c89c0fc70e7dc8727533d3cc754d367cd7ec749cf2e03")
-set(qtactiveqt_HASH "0dfdf0ffe3f0ec1dc31fe8d27d402f07cf44ca85baba1cf6a3db1850347f41bf4ebc9eb85f631787dc6937545e854960c74d39570a7d51ec808b8b6604153c2c")
-set(qtdatavis3d_HASH "2d345e42dcb726b8bfa1ca12b0b7feb7f8df6f74f434a8ace58e1d28c3ce9ab4b0877b6918eb9354878ff4a429b56bb5c6cd95a80feeaa38dd67796f5d5171c7")
-set(qtdeviceutilities_HASH "9e7b6cc823855f18d97eca8ee1d10f29655cc9492e16deae1ba8d2a9678e716c9bb189ada09e516c1437a0025c9f5aefb899dd44c9063e079bff41a4c0847312")
-set(qtlottie_HASH "fbd2513a9c563c8608cf169b7733e5fffa4ec3e42128434175b0737269b1923bdd5f89cad6ccdd4cf7ce857ee7c389b54b91fc1569a264cd0a8f132f7d3ae73b")
-set(qtscxml_HASH "b4782c6e9e98dfd8dae0ce75e69db7a3bc2f2764f8f8ee086e05d01e1cd4b824512925d5afc48ed0a6e8d15d43086fefb05b917a28018786726a58ea5bab6a78")
-set(qtvirtualkeyboard_HASH "3e5e66b53bd9f0e45069b5423bb1f54cfe5cb36480b1fb5c786a726d7f8fdb69ba122f2b02f34ea6316ea3ae748999884c060c5b8f5ae1dd4fa684252f795234")
-set(qtcharts_HASH "c3aa002d9b9d41e55e440127ad84f1413869432ab361c373911a9ef29c25d72fb411f71e950a017f5e97c1d8bef92611fc9558d2619bd73b1e6df2e8963572b0")
-set(qtconnectivity_HASH "f35ec394d1be817369959a38528a64dc5a7f060fe37d84363d0b04e14776c796e079787cbe24e7678454a7edf82909d4a3630e614142595dc271fcf10c9a2a0a")
-set(qtpositioning_HASH "32cea980147487e5ea6dbd25347b3b37f74fd9d8180d7b463f784eb3877361862e38bfa310e36d83dd9c9eed91b4415812ec9ee7329c96818a32d99a17f76e5f")
-set(qtlocation_HASH "a5508da406ec6fb413dc63aa29ddffed0dbd10f0344c8f10231e68178d21b6986e4cf983eb180a40bfd48bef1731e295c0722b31b6495aebe6edc18f7fa55629")
-set(qtmultimedia_HASH "c557a8577a28df1997a07643c125033d6ab0e1d64a2e67b659f51d11d29c5634e7ea1264ad31705889e138521b65b74761ac68399dd94637ced8c5d6d07e03c3")
-set(qtremoteobjects_HASH "276f7744a2ee017e408957ab03546cb79f9ea92102b5c1fa28a206136ac14600612ca122c38f45b596ef5b9677563b8ba6ad2e3d778711f35b6d03aff6232eed")
-set(qtsensors_HASH "1e095e23e16a7360f5f2dc333ecf6dee448d0b96c93f820e94afcc2f4e9472cd24145f286f8669f9499def45d84281b9bfe2886a1e4da304cbf16e34f3491b6b")
-set(qtserialbus_HASH "614c83ae7b5289305d6bb5317e6e102874b76aab2d3de84211584fd0f5a02ff16724d73990b62f73ea79cecf3573b0d98bb5780612c511686940799d70496391")
-set(qtserialport_HASH "c774353fe019f9745ab8b6ffbb61f15a08a74368b3b8e7f6e16ab60c43ad9003690c013381515e4895288c3f5c22b956506795a153670e3b0c92c200a5283a9e")
-set(qtwebchannel_HASH "d253e087a9e97173a6a97eac46d8dfa740d3c77182dfd57514c14e68e50f6745cd90e9367cbb5f5d0a7c43fcbfc046af0bd9124fb2517d741bb5ab1a5af5bf62")
-set(qtwebengine_HASH "e00601a7ec6400551f7707d15cf326340ae8d6a5bb8cda55df4619148414f4b3ca3daabfd7263dd5a2ff2ca8ba64f9e91c9db3f1a50bea4903148c57b6dc81dd")
-set(qtwebsockets_HASH "25ab603753fdc1c65585b6aa91d3777f48e0763cff97978478586a0f04d0536b5c4d5853f9218d2a0c3b3d01b1bd9ca7e2f0e90020737c1fc70bdd4a3cd5a30c")
-set(qtwebview_HASH "73529993e2ca308c841d731c87180bbdb25df93ccf3e472349c5f141f5212678ebe090898f1ee396c4cf07f9eab46e1c3cc7a5371ef5c0dc8fc0c0b9709b2997")
-set(qtinterfaceframework_REF 577d0c7f7a2ab952c6eab2cf5798d18e668cbb64)
-set(qtapplicationmanager_HASH "7a74e8275bcb84eb946a04a0efc7bd6173b2c6556392da082c896304ab13df751a4be3d4aaf682026359c240a9f4ea252b90d9089df1509eb256ce8fa79b4bf3")
+set(qtbase_REF 79ad119e08701708585686f3dd2251fd5cae19b2)
+set(qttools_REF d156d49dc302aa8af9142cd53a023a5f1ad627f5)
+set(qtdeclarative_REF b63c1e8552adab0a99ae9a2b6693b6d9e5e80ab0)
+set(qtsvg_REF fe0f28c2b248a748bdfe7f6b7dbd877ec247ccb1)
+set(qt5compat_REF 987c42860463b6ad1781dcb3e591fc5f5042a85a)
+set(qtshadertools_REF 03bd19e9d6f83ffa4771da600198e0cca386f8c5)
+set(qtquicktimeline_REF d1bd9fd9ab3262da09d3d6c5c0ec72b53401433c)
+set(qtquick3d_REF f9a7a119d6fd93e6fc3411bc1067f82a57e2c5c4)
+set(qttranslations_REF 4ba1d8b90c1a17b5c9c746e1d806fe7f4a70f725)
+set(qtwayland_REF eaa40874ecf6cc3c22b60337a636a7698a769d85)
+set(qtdoc_REF 5240366e9a7636b02772b92e561ec5bb3886bec5)
+set(qtcoap_REF 0c1d319820950434ab29cb0eecad0667baedaa3c)
+set(qtopcua_REF ac52b1bd136563b7601b7fef867fa1a5590de2ee)
+set(qtimageformats_REF 1fc6f9f3820debc0d37d8971bf65eefb27a7ad31)
+set(qtmqtt_REF 65a08ede4c495c667f5ecb29bd05d98a9642d7b9)
+set(qtnetworkauth_REF 350966bb0a65768596b8f9e69bbc6a4bf8d3fc80)
+set(qtactiveqt_REF ed10eb94122d4ebd74c3d9e512d2be4b484283e2)
+set(qtdatavis3d_REF a672a0bc293edeb2dc4e9c697eb29227377efe54)
+set(qtdeviceutilities_REF )
+set(qtlottie_REF 11940dc4590491b110dd37ddda99d7c513114a51)
+set(qtscxml_REF 1372dec3e72650be16158c41f2faf34a99fd048d)
+set(qtvirtualkeyboard_REF dd4c10846572160a9935ed08752d90ee010124c6)
+set(qtcharts_REF 0180a68acd833e1f474b3cbe2ea633964aa0447d)
+set(qtconnectivity_REF 4347e7feaf9f32f02641a1d116ead60349ee19bf)
+set(qtpositioning_REF b8150527598672eabac48c9e1791e88626de2ffe)
+set(qtlocation_REF )
+set(qtmultimedia_REF 2fc9e167cfe2b043917f0bcb04a0e7d477063549)
+set(qtremoteobjects_REF 70e5bdd9565e78185eb3928546973991aa9ce805)
+set(qtsensors_REF cd67c230e97e1b0169a653bcf374d09a432f969f)
+set(qtserialbus_REF e2bf7421e0b896e10d2669791f2a7691bba0bc3e)
+set(qtserialport_REF 11b852c6920041a6762c26550f052ad4708a9da9)
+set(qtwebchannel_REF e4a0c79e02ca9edc5b081fe28f372492dfae78fe)
+set(qtwebengine_REF f0748ad02b01163e2a72d1c13276d746656df5b4)
+set(qtwebsockets_REF 417b51176412e64e9e93fb42b14c3fd949d7a57f)
+set(qtwebview_REF 0ec192a5c487fcc1ca467e96b8e51c6c4247af25)
+set(qtinterfaceframework_REF 175f7e213318a77763fbd5da1efc2780360363d3)
+set(qtapplicationmanager_REF fda5fd1f484c934fcf6808312dcd45caa989a35e)
+set(qthttpserver_REF 70dfa13e6b787ef0ec857c8a11079f7feaebcce2)
+set(qtquick3dphysics_REF 1571ff7ecbe65fb3f0d821eee072d060311835a0)

ports/qtbase/cmake/qt_port_details.cmake

@@ -7,7 +7,7 @@
 ## 6. The build should fail with "Done downloading version and emitting hashes." This will have changed out the vcpkg.json versions of the qt ports and rewritten qt_port_data.cmake
 ## 7. Set QT_UPDATE_VERSION back to 0
 
-set(QT_VERSION 6.3.1)
+set(QT_VERSION 6.4.0-beta4)
 set(QT_UPDATE_VERSION 0)
 
 if(PORT MATCHES "(qtquickcontrols2)")
@@ -72,14 +72,22 @@ if(QT_VERSION VERSION_GREATER_EQUAL 6.2.2)
              qtinterfaceframework
              qtapplicationmanager)
 endif()
-
+if(QT_VERSION VERSION_GREATER_EQUAL 6.4.0)
+    list(APPEND QT_PORTS
+             ## New in 6.4.0
+             qthttpserver
+             qtquick3dphysics)
+endif()
 # 1. By default, modules come from the official release
 # 2. These modules are mirrored to github and have tags matching the release
-set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager)
+#set(QT_FROM_GITHUB qtcoap qtopcua qtmqtt qtapplicationmanager)
 # 3. These modules are mirrored to github and have branches matching the release
-set(QT_FROM_GITHUB_BRANCH qtdeviceutilities qtlocation)
+#set(QT_FROM_GITHUB_BRANCH qtdeviceutilities qtlocation)
 # 4. These modules are not mirrored to github and not part of the release
-set(QT_FROM_QT_GIT qtinterfaceframework)
+#set(QT_FROM_QT_GIT qtinterfaceframework qthttpserver qtquick3dphysics)
+# For beta releases uncomment the next two lines
+set(QT_FROM_QT_GIT ${QT_PORTS})
+list(POP_FRONT QT_FROM_QT_GIT)
 
 function(qt_get_url_filename qt_port out_url out_filename)
     if("${qt_port}" IN_LIST QT_FROM_GITHUB)

ports/qtdeclarative/portfile.cmake

@@ -25,8 +25,3 @@ qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
                     )
-
-# remove `${SOURCE_PATH}` from the front of `#line` directives
-if(NOT QT_UPDATE_VERSION)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtQml/${QT_VERSION}/QtQml/private/qqmljsparser_p.h" "${SOURCE_PATH}" "")
-endif()

ports/qthttpserver/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
+                    )

ports/qthttpserver/vcpkg.json

@@ -0,0 +1,17 @@
+{
+  "name": "qthttpserver",
+  "version": "6.4.0-beta4",
+  "description": "Qt Extension: Qt HTTP Server",
+  "homepage": "https://www.qt.io/",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "qtbase",
+      "default-features": false,
+      "features": [
+        "network",
+        "concurrent"
+      ]
+    }
+  ]
+}

ports/qtquick3dphysics/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
+                    )

ports/qtquick3dphysics/vcpkg.json

@@ -0,0 +1,13 @@
+{
+  "name": "qtquick3dphysics",
+  "version": "6.4.0-beta4",
+  "description": "Physics engine integration for Qt Quick 3D",
+  "homepage": "https://www.qt.io/",
+  "license": null,
+  "dependencies": [
+    {
+      "name": "qtquick3d",
+      "default-features": false
+    }
+  ]
+}