[Qt] Update to 6.5.0 (microsoft#28536)

sarvex · Apr 26, 2023 · 70c262b · 70c262b
1 parent 0a3bc3d
commit 70c262b
Show file tree

Hide file tree

Showing 115 changed files with 552 additions and 632 deletions.
diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "qt",
-  "version": "6.4.3",
-  "port-version": 1,
+  "version": "6.5.0",
   "description": "Qt",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qt3d",
-  "version": "6.4.3",
+  "version": "6.5.0",
   "description": "Qt wrapper for existing OPC UA stacks",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "qt5compat",
-  "version": "6.4.3",
-  "port-version": 1,
+  "version": "6.5.0",
   "description": "The module contains unsupported Qt 5 APIs",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtactiveqt",
-  "version": "6.4.3",
+  "version": "6.5.0",
   "description": "ActiveQt",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtapplicationmanager/bump-cmake-version.patch b/ports/qtapplicationmanager/bump-cmake-version.patch
diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake
@@ -2,7 +2,6 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
 include("${SCRIPT_PATH}/qt_install_submodule.cmake")
 
 set(${PORT}_PATCHES 
-        bump-cmake-version.patch
         wrapper-fixes.patch
         stack-walker-arm64.patch
     )

diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtapplicationmanager",
-  "version": "6.4.3",
+  "version": "6.5.0",
   "description": "Qt component for application lifecycle management",
   "homepage": "https://www.qt.io/",
   "license": null,

diff --git a/ports/qtbase/clang-cl_QGADGET_fix.diff b/ports/qtbase/clang-cl_QGADGET_fix.diff
@@ -4,7 +4,7 @@ index e40cd85..ba68a01 100644
 +++ b/src/corelib/kernel/qmetatype.h
 @@ -18,6 +18,7 @@
  #endif
- #include <QtCore/qhashfunctions.h>
+ #include <QtCore/qscopeguard.h>
 
 +#include <type_traits>
  #include <array>

diff --git a/ports/qtbase/clang-cl_source_location.patch b/ports/qtbase/clang-cl_source_location.patch
@@ -2,12 +2,12 @@ diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h
 index 823b2057b..4a8cd4fa8 100644
 --- a/src/corelib/kernel/qproperty.h
 +++ b/src/corelib/kernel/qproperty.h
-@@ -49,8 +49,8 @@
+@@ -16,8 +16,8 @@
 
  #include <QtCore/qpropertyprivate.h>
 
--#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC)
-+#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) && defined(__cpp_consteval)
+-#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC)
++#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_QDOC) && defined(__cpp_consteval)
  #include <source_location>
  #if defined(__cpp_lib_source_location)
  #define QT_SOURCE_LOCATION_NAMESPACE std

diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake
@@ -150,6 +150,7 @@ function(qt_cmake_configure)
         ${disable_parallel}
         OPTIONS
             -DQT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS:BOOL=ON # We don't want Qt to screw with users toolchain settings.
+            -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON # Because Qt doesn't correctly scope find_package calls. 
             #-DQT_HOST_PATH=<somepath> # For crosscompiling
             #-DQT_PLATFORM_DEFINITION_DIR=mkspecs/win32-msvc
             #-DQT_QMAKE_TARGET_MKSPEC=win32-msvc

diff --git a/ports/qtbase/cmake/qt_port_data.cmake b/ports/qtbase/cmake/qt_port_data.cmake
@@ -1,50 +1,48 @@
-set(qtbase_HASH "a2d0779ba7ee8b8b78f5dc8db06177d04d50463fea7cad0b7785721acfc33dbbbaa1a7bfc052edb90ba1d11b488c30004daa43b6924a97126b9b8f82ad1a7f43")
-set(qttools_HASH "24dc02b760d4b1640eac539c9d0dfff9fe516332e5932f43456140daa3044c1e748731a883cc4f80e94626602241d040341e2af27efd470e7d6f50a908660382")
-set(qtdeclarative_HASH "ba1a477d4e388e93cdbf76c594650b431fbea1212af110fda994fa1ebca0d6cf2dba699c995744deba71bad2a9c45d214b671ddef01a995d7c6c82c61ef82aa2")
-set(qtsvg_HASH "75c20eff54f45e5a501ea965677b708e211a3fa435d3304868ca1b6e3cf0b4ef89e61631e4936b1ef789a06be1d3d43ec9db64be2498159eecfde1cce21e76c0")
-set(qt5compat_HASH "22e3d6360afdb83b4bd122153cf3bba09d8593dbdd65ccf5b80e032b9de437f868b05c7170e636fd6bd8f42dd1eb56b07f21b73fd0c4a5437fcb72aa070d830b")
-set(qtshadertools_HASH "11d6111c4b645d2d31b19c6cf788726546f484bd9c6a3940bdb2ce82f76eecf56a47655065fb87bf488a12968ea26e48e4c0c8b3ff9d702339bd497bef31630e")
-set(qtquicktimeline_HASH "8310e0b360859e59157b5968647a5bb82bfd09f2f61c1b289669e551781e8fd1285f3efb8ed1324013ad14b192f0d9963c8584cfec98a136c82f5956ac1de9ae")
-set(qtquick3d_HASH "511c8585ea8686b1e1cf2e3dd47ac5650ba312d583da7e86dc86aaff6769a5751e3d75ff3fd07664098ba6488f75c9dab68d060b0394ad0182c35c44b5306970")
-set(qttranslations_HASH "200dd7418263474be95de25023ddd881f1cbc46fe4a0767aa33733414564aef9615b36429f511698d012704c4e94088026b3d9e454d9078e8975b48119c45c0d")
-set(qtwayland_HASH "15d74d057c09a734dd10617d018f4dc54e6be4fef5dc96d6eefd6b3f47952bbdb98bc39cbc9545c7ae1a9ec87a512a72d2f019ee47210bfab8cbae0cf01e4ae4")
-set(qtdoc_HASH "a96f9112b9ad557695779ee2039ad3ff93c8476d0f6fa7eff7177f0a05f4089d8b25030795f1428fe69a7423151241022a6bee812e6dcc5b047e13d39934e405")
-set(qtcoap_HASH "43dae7eaa19811aeeb5c140949421c2449671e71cfc8d553bd608e6bbdf344a4bd58b2a3405d51b3e621c1b817487b0adf87e51841f237a2ae6df96573a6c735")
-set(qtopcua_HASH "c7664a438323653e809dccfbaf81717c4abcbabc552bf678461ee28bef05bed78d4c4e1c520f08d334f4f45bb4777831de20cbcc1d5e242ddbc63d5a2f4df709")
-set(qtimageformats_HASH "8e165986394c184520412533fbe088577d3a5661fecee8ef7938467ad329da28aa2771721f7ed84c75f1878426d24a17812aee3c492da68618cf6bbcc5580a36")
-set(qtmqtt_HASH "e0de3d3a3c12ac7c407f002b6e680583c1d9ca437013ce277f18cb0de97b39269c6eb45ca3de46589de9177d8c62ea4020d55a514ace4667e8ff3e7780df5f2d")
-set(qtnetworkauth_HASH "ccb488646f450541ce8546463c99d45d567339f676948e62c013fc0d7588af408c617bb0bec1d122b3fcb42e79d5ce04f5f779ad6d515fa9f223af70f06c84d9")
-set(qt3d_HASH "d283e42effdb1b7199e4bf6fba3769b0ba3358b855d166fcad00cfc71858a5e71324e902d4ce163137a18b413c4463967563825ee8b902142c4c7559ff08efe5")
-set(qtactiveqt_HASH "5fa17905697d1dbda9852b9f2555348e1c5fb428062806b5b78db22924927ebcf4db4932c04de155f517caf08487fb74d6afa30a223ed762bb46df61552ae149")
-set(qtdatavis3d_HASH "0d687d29b20bf80a4274267c94bdfbf64048764f213dbf98361a00ee98c85bb2a3c25c1fe4aa17fc4d981cd54ea727bd0cec884b4fdb7e245f1801fc917a9123")
-set(qtdeviceutilities_HASH "936a73e571f79c6c499b2c0705414ebb6eb45bb9209af6db9183285f37d81d8caac3c273ca1695f3cc1bf637a42c96242eb83b1f2034b5e9f0bcaa211368e85b")
-set(qtlottie_HASH "1a3e7a462a1a886dfe556816dcb7811f0488ccca64106aebcc8178951f9e3db78dfd977c81b2eaa003b2ceddbd5d42bd1753fda80ad5562cf3e38699eafd1d0f")
-set(qtscxml_HASH "0d6b31b1c5f29f19fb15ee5a77e100c5df122f1ccba6229131456f4d66ee99978b0392a0f3c61ae1e31923041a973e80dc23df7814ed704a4d80d75b60741fac")
-set(qtvirtualkeyboard_HASH "943a96a35df368d63102b296c7e173d9d2929665c86044c33b1eec7bdc42f7fd6d6e5ed2f75caf582ecdb6cba5738d52121d3ed466cc26f1da58c36ea3a32a4f")
-set(qtcharts_HASH "369e5e69596a0fc4be1c3ab936d32e3690d2efe5bf28344ef71022af209813a5f1435f11ad7ed42f3dd825471d2e2d38c33564bfa514ddf8dc173b708afa3994")
-set(qtconnectivity_HASH "2d5f0c6ca5ed5e0a8ef056344441b2828834a334129e337d51596c774f0e121e9f393a6a2f7ca24b8186ee28e8d398316abdf3f32fda6cd097c3139d92dd30aa")
-set(qtpositioning_HASH "ad8fa75430ef94596673de15c1067bcf648c76a5e938348b26ee44dae97f17c3d36e5a283a9ee78760be57df3d1390f36f476e47f26928dd72e466e469c795a7")
-set(qtmultimedia_HASH "1e3d6d9d78acf10863fe2d4624ed044d86149fe8a72c8c47150975eff6f76edcb8a7d4dcdb73ab127ed3cc4414b7f7100b0e9e9c633e50c90ef3c0d36134d9b5")
-set(qtremoteobjects_HASH "019bc17922eb72b2bb79d527c1d53bcf7f5b67f66a33ab79cd10391099de671eb3b7f978b8b493a560c6c943587b0a942f887f4ddeb87860ca3e6e30f30541be")
-set(qtsensors_HASH "a1a39ab73cb15384fa29e62d8193e796bfb5e8349fd85eff106e9fb6fd45677db39f200f5b8e47be268c34d8ff35142e608adc33b85cd4dcc5180f5c3220deba")
-set(qtserialbus_HASH "1ec94eebbb1e123ebcb353577f8de33710d623df364492ad33cb949ba81b36b4dfbbccbbce394d766fab2434ccc561dc47dc5d5b95b986160bf21096c78a77b4")
-set(qtserialport_HASH "4871035b714732e7a40579c9a31b0cd955ec9360a996bbffeb16781a89b8df55d9be4408947832f2c6c39646f4d3b64cfb0bf91a83fc73e1808defd108048cd4")
-set(qtwebchannel_HASH "6bab95a2df742c6ff023a72a3b192e7c5e56e23834dc7513aadc09d5ce0fadabf4b5590a9911b1dc8c83a7e1c984c4ac57c6957a3fa168de10af5d540d7d6af3")
-set(qtwebengine_HASH "e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39")
-set(qtwebsockets_HASH "231135ac75f704aeebe5286cd30640bacb6192f08785ac94fe848d6d5164597db314054c9d48a2300e9967c609681802b82055ab6bf806b3a351d891d3855bf3")
-set(qtwebview_HASH "585b73cb0ca6a9e8b9fd16c92720e3bb7535bf142049c9453cf9f479b656827d450885e6bc1b09c0f8c9462f80f722f58a388f283d2b132cf83936e28c6f217a")
-set(qtinterfaceframework_REF 35892bfbfa4c405bba2a648d1a4d4d17b1bc62b2)
-set(qtapplicationmanager_HASH "2771edec2d8195158fcdfaaa08641db7363695e569e100fc0a949300b6616403bc1c8946526d3e6f0ec0a20b0e117c0bcd0b0d7f8fc09dfe3e6bc95326ff9f30")
-set(qtlanguageserver_HASH "291239b61470c86cc1d371a533ddb4f8c289590831d3f835cff551dd24049061dcab7bdade904a1397f2c3cc8701747bc2568bad1d034ed8c51aad04257a83fa")
-set(qthttpserver_HASH "25dfb101dd57143ee97122c46a8fd85668d16c0b7520285f72ea37db6d9e0c43876a3d5c1016ecc4cb4ec08f2ed9813afbaa1b4812e6816159b11d620bb8dadf")
-set(qtquick3dphysics_REF fc155dd34fa53a8c7520f1c150a2b8eeb4c760c3)
-set(qtspeech_HASH "f101c9a27b300f5b7dfb502f342dc565f206a119f667d02ed23ec0103a2d0d8025d15bccb42bacd238853f695523691dc22e1a4b703f0ea13aab0922c922cb1f")
-
-# Not in newer releases
-set(qtlocation_HASH "a5508da406ec6fb413dc63aa29ddffed0dbd10f0344c8f10231e68178d21b6986e4cf983eb180a40bfd48bef1731e295c0722b31b6495aebe6edc18f7fa55629")
+set(qtbase_HASH "29f70b9a9650afdd8e34703a7a8191feab4c3a25d0bc3a41010ea842389335b24e2685721fdb4a03653475ebd9bf8a8e4f4a77bf5d64b1289590b5ca0e4623f3")
+set(qttools_HASH "fea7a2d6e4b8fde8696122f212d9ba4bf8ae878e7392232a07aadc1f6e77667cabeb8c091f676f997b215f8870c9a4aeb72420dd95d09513222c49f7048af7dd")
+set(qtdeclarative_HASH "df31f08be3849b2775c1fbeb72f9922f7fa64b8b18b506e5ce309b718cfaeef9bb7225cb55610c8cf695f85e5fc0430461f1317b335358b4196b5e48242a7d00")
+set(qtsvg_HASH "ef317b9b3621b5554df20bc570b67392f9c0ab37929b4c9dc0e9902c1b63763aff5d9bdf50b50f7c0a3c9f74c513a53553744dda68d8d29f593fc70f787f1009")
+set(qt5compat_HASH "097f6cda4dee6eac8dd224d8539c26c1c016cb065f1718040f1b8e0b230b562f9b46f05d20655d30fe719d0886e02961a6dfbe7226d0dcc30f7145fe2f32a000")
+set(qtshadertools_HASH "da62ec1ea4d20f91d83cfbbfc3cc25feb87051a1c2af58fd50afe4ee42b2fce9bb645e59291beb5893ec5dc7c0cb9d1defea0e90d7023c175e30c34dac13cdc5")
+set(qtquicktimeline_HASH "80e1a979f86f68a817d5138a3e3033a3934123e72dad58bfad6383430ab24a7f1010e76cd41e549f00baeca6be76f2f17bff6b39855d0e5c47b003c59e5b1d55")
+set(qtquick3d_HASH "84e5e7015596c035a74f94ec2c6ea254c820b7c4bdc730ec487642108eb6e948867aae1033314a7a4cf0fc37db673537008ec1a44079594acd76ecbaf475c467")
+set(qttranslations_HASH "aa10c2e6937597805e385e52e36cc3dcecf0980a80d34fe8b642b7f830f1667e8c6b9aec17019cba7d2f3fe2f640c794a96f834ed8d4cb782f7fa73954ad892d")
+set(qtwayland_HASH "d0a9b3cb5f93b99b20eca98512ebc8b6b8453df822e2aad7cd38169cd22ab1661ac0fc14223679174e8dbeaa63c2f3013287fef1b8ef620aa23ff6abbb6b730e")
+set(qtdoc_HASH "59ff6e9afe4635e437b26fd37fd4c88a8ddb5b8f1e3903615c3b9687e973f4287863ad0075595c00b212ea10ab9c446c277446d82948108745e2ba71cd37fe21")
+set(qtcoap_HASH "b90d5f79045f0c5cb441d4888265b2048ee28e977bc8c4e3d600e61c2eb07698ced2d97b40b1e44ca3e3e168b6580fdbd43fdd892da4ca6503f85055812dc8d7")
+set(qtopcua_HASH "f362750263db27cc64df0a2bb1a12cc07ddbc332553e7f54cecb103126b79d86e9dcf3da82a37da423d3b3124bd4b4e2ccd0aeb3413c49334064cd9f39124246")
+set(qtimageformats_HASH "2456f6e85baccc933f275e2d1f0e1ee75ef6816b811d52544345b208e19755d9a9ced5fd314d47744d894bd0395c0b9f9792b739d021f90fa67e7c3c08b9f751")
+set(qtmqtt_HASH "45aa0d834eae5d5264e5571d4c2f37ba842933b212dd6ca16af38123f848151e43b1a47b99f723b911fa52f1a58b1d601b8c76950ab07f68e04665e73d6c59ed")
+set(qtnetworkauth_HASH "bf18b3a677306ff4d3dd0e9f579f36a14f6b8b51134c45c2e0cd1988c453b5ca52dd0cda9189f6f41050e6d6ea1fe27872099db5af0d3616de7751e4f25c34c0")
+set(qt3d_HASH "875e1e3a94de59d9b1a2eb94c0a289b76ac7c2163075447d6fed9dbb32846242300f52d5c141d985ce89437e012af43171f2bd2f640e527a370800b51b83b344")
+set(qtactiveqt_HASH "e1a3d412cb51eac6cd3b107a0aba710edbb84720c5ee2d2908b8fbfa01e464b68698d09c9e0ea2e76dbf3cb0eed5ae04907d97c1ce17d487767c66e8b0738698")
+set(qtdatavis3d_HASH "9f57efebe40baa2ff1fdce049f4bab6383bda76519e86ac36d0cc45e4a43f4503b22294efe8dbe80d14971260bfbf3ad1fe2a11b00edae65f678358c75e23397")
+set(qtdeviceutilities_HASH "31c6be3de9dc19f9b8549cee1231ae99e935f4d186e51113bca3f69a8ac75b183993d0954ca6f81ecfe7eff9d62bdd7821ecbf34328cbfa4359ec06ca69459d1")
+set(qtlottie_HASH "ed60cb385a4a252f1bc3ceb64fa9a62babdd12a7595fd61c847e9a363d8c91f897603d1cdfe11585e7bcbf303ccc273ad1b51af1cbda17e31335e95c76585942")
+set(qtscxml_HASH "21933952c5eecce2cfe45c8c7b50d249b71f49538ee6736a7180534abd44b6032ea9e4d2aa9b658b78f60ffd61cd065046da6df5abed13483237e8d8dcd9fe56")
+set(qtvirtualkeyboard_HASH "5d9b0936d937ee8a18a3badb6418dff66b7b600a71329b3ea9fe399b43d89745633d6a2ea7b7199cd9c25a6751bfec60a91d8364285334a98e61b2cf27421d31")
+set(qtcharts_HASH "6b9b5081ae96af7fa122b6d9b59334d2bc69ebb44e91e544d39d62b570fa0cf763494162f7aa5c6960fbcd1197e856b19c2b278713e1d5e843e30fb25d9a2648")
+set(qtconnectivity_HASH "8113dfb556d29c7e3cbac197498b532beba6a22fdfafe6d5fa778be11e8f83b318d06f6e159002c3e1bda39adae173dd2df06b819ca04066cc5a536b80da882b")
+set(qtpositioning_HASH "c4ba9c6a1b73eb5db74eb405d2a5814e18309ad353536116bbf9042aa58d31607683593d797b78e662bb246941baa61f1856357b1a6c2fc1bf0a7bcf18fe921e")
+set(qtlocation_HASH "e0b0c8f4093436aa53661fbcea885ee86565ff8e61bae4b567be24e7251e56b77071b78e160903ddc487b36931ce6f1a525c74135cd360cdd1d189da4463a96d")
+set(qtmultimedia_HASH "fe0dd9a534d30fa47129c4dbefb789ce1fc5b3d2a59b7583c986262a26a0638e2147edc77cf7c484af9c01acce9aaccaaa4a406c12bde324555790a956859341")
+set(qtremoteobjects_HASH "a917d766538040706d5bb78590bd2a577a98759ebfd516dce9c55d3c5a34411907e55de9da04d47f2b37e927541b915802fa66fceb03826c88bed4f8e8e75fa9")
+set(qtsensors_HASH "1daf326529075d978a6deda1ed2f77f4c32468962fae44837ad7f54c6052ae2ac475df6e40f954375d0d7a1bd1ce3c7947668f1a726fca2556fab5e972f08805")
+set(qtserialbus_HASH "ad92c88e13da77477eb9bc9a1b81ef316c56ea456ed962e010ef8e1e00409d12c7527b1230447ad9a2fa18f6737a8ab84a37712bc948dda7f1b0acb388c2dda8")
+set(qtserialport_HASH "6d20025bedcd4f049f99efc775380d1d3578daa59e8f008961fa0e5c495d57992265917fad5471b917f60a4eb4e72491184e1281021320aed94cbedde22f2d71")
+set(qtwebchannel_HASH "146bf4b190a5d9af36f17cff9340df8faa2465ccb47fec767157d4c47a9ff4554bd3917d6694da1ee6914e34ac3793b6c99673712b12b65b1f3e9f59e274933f")
+set(qtwebengine_HASH "02413eaf5e4e4d5d8401bf28ea2362cc9f147cc002c014b1a50daf3dfa092b1c923652eefb0b727e94e36d3d53ddf93b5b4c5e8830986902b34b53a848d7a8e0")
+set(qtwebsockets_HASH "b13a6c385573cd19cefa48dfd6be1066c09b046f5a54d2c61fda3ab83903dc75b2f3fa0aa45f9e56610526214a64416f90d955becf2aff90611387a605314b67")
+set(qtwebview_HASH "ad572e4921c92bd160d84b88987bd125b9f9c5a9f2123f552cf7840f15146d76e13ea621e3f0506c308cbe836f0e6a9cbfd4847ae93fe6fbf6122b0dfc8bbca7")
+set(qtinterfaceframework_REF "062662be9975e186a64c19a43b04f13c3e2aebfc")
+set(qtapplicationmanager_HASH "d5f09e13d364169f4bfca933c612b8b9e950a229d2ff81f58cdf4eae2a31f4b9d1200d4a71dbb20a947fbf9034a82091eee989aaa47ab4b1b707b6bf23d490a2")
+set(qtlanguageserver_HASH "22c13eef40382b45b8f3c07d2aae95c09a24f438ba214dd0e19f601578386883f35df41630ebf512f263cbd0c3c5c296ba19d1dcd0e323381150dcf47cbf7661")
+set(qthttpserver_HASH "50b5f96f0a63aca5f73d639c0ea08f525b3df4e416767fc4612872bb5b7edb8332711d7682f47b91c630c9e6f8e7d3c9ca2674d521fa054d6265dec06467a414")
+set(qtquick3dphysics_HASH "49125a76427ce6eee85be5ca543b4f88877d782415c054ff09062769cad8cd10932eda58e9320b722c8eb6e6bf8b5bf717df9ace2514b5112652032cf5737cc2")
+set(qtspeech_HASH "aaf6a788b5d602708d2b6d0528d43190405135a291834ab719c3886709f43254050d0845d7531689b4426961793bddf42d45b9c7ce381da9c6b9cf6043cf60d3")
+set(qtgrpc_HASH "b74514d4c181dd3ebb64fe0943064e074ab65a7a172dff747d1315c460dbcea03ae3488b0d8e01285d54c18ec819b68218170bf974e8d2f0943f842d6c95a2ca")
+set(qtquickeffectmaker_HASH "8896045c56c5a05feb3bc2ea3610376585d8f5d2afa30e9a0cb48b96eace31ec98e753bc72669e8c1255a205754ee01a44c89b41f4cc8124ae30fc2b3a4c797f")
 
 # Keep for beta/rc
-#set(qttools_qlitehtml_REF       0)
-#set(qttools_litehtml_REF        0)
-#set(qttools_litehtml_HASH       0)
-#set(qtwebengine_chromium_REF    0)
+#set(qttools_qlitehtml_REF       bd70f93ce41443a6a90a269531393f575685283e)
+#set(qtwebengine_chromium_REF    0b138dc30d0aec7930c76a2595065629948ad9f7)
diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/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.4.3)
+set(QT_VERSION 6.5.0)
 set(QT_DEV_BRANCH 0)
 
 set(QT_UPDATE_VERSION 0)
@@ -17,10 +17,6 @@ if(PORT MATCHES "(qtquickcontrols2)")
     return()
 endif()
 
-if(PORT MATCHES "qtlocation") # No 6.3.1 tag/branch
-    set(QT_VERSION 6.3.0)
-endif()
-
 ### Setting up the git tag.
 
 set(QT_PORTS qt
@@ -58,7 +54,7 @@ if(QT_VERSION VERSION_GREATER_EQUAL 6.2)
              ## New in 6.2
              qtconnectivity
              qtpositioning
-             qtlocation
+             qtlocation # back in 6.5 as tech preview
              qtmultimedia
              qtremoteobjects
              qtsensors
@@ -87,13 +83,20 @@ if(QT_VERSION VERSION_GREATER_EQUAL 6.4.0)
              qtquick3dphysics
              qtspeech)
 endif()
+if(QT_VERSION VERSION_GREATER_EQUAL 6.5.0)
+    list(APPEND QT_PORTS
+             ## New in 6.5.0
+             qtgrpc
+             qtquickeffectmaker
+             )
+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 qthttpserver)
+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)
 # 4. These modules are not mirrored to github and not part of the release
-set(QT_FROM_QT_GIT qtinterfaceframework qtquick3dphysics)
+set(QT_FROM_QT_GIT qtinterfaceframework)
 # For beta releases uncomment the next two lines and comment the lines with QT_FROM_GITHUB, QT_FROM_GITHUB_BRANCH, QT_FROM_QT_GIT
 #set(QT_FROM_QT_GIT ${QT_PORTS})
 #list(POP_FRONT QT_FROM_QT_GIT)