diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 657c7bc9f98..8dc3f6ffb37 100644 --- 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 index 40ed73730f1..ba49d4348fa 100644 --- 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 index 6c5f53c8c2d..7f6f038dc26 100644 --- 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 index c17be503fee..d29d4885dc9 100644 --- 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 deleted file mode 100644 index 31b99c71d20..00000000000 --- a/ports/qtapplicationmanager/bump-cmake-version.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index f2236c0..904c5b7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - --cmake_minimum_required(VERSION 3.16) -+cmake_minimum_required(VERSION 3.19) - - include(.cmake.conf) - project(QtApplicationManager # special case diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 2a9e77ca648..7280aff8a30 100644 --- 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 index 03da0c873ef..89a90416ce3 100644 --- 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 index 37bec5f9fcc..0304bcc47de 100644 --- 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 + #include +#include #include diff --git a/ports/qtbase/clang-cl_source_location.patch b/ports/qtbase/clang-cl_source_location.patch index 6d0a9527e26..3811da601f3 100644 --- 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 --#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) -+#if __has_include() && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) && defined(__cpp_consteval) +-#if __has_include() && __cplusplus >= 202002L && !defined(Q_QDOC) ++#if __has_include() && __cplusplus >= 202002L && !defined(Q_QDOC) && defined(__cpp_consteval) #include #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 index 7a553973e32..c6393713a66 100644 --- 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= # 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 index f8796f3f322..e61e3068fc6 100644 --- 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) \ No newline at end of file +#set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e) +#set(qtwebengine_chromium_REF 0b138dc30d0aec7930c76a2595065629948ad9f7) \ No newline at end of file diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 49b94456536..b59345a2933 100644 --- 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) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index a2b6e4e6268..cc7e2974ffa 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -10,15 +10,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake") set(${PORT}_PATCHES allow_outside_prefix.patch - clang-cl_source_location.patch config_install.patch fix_cmake_build.patch harfbuzz.patch fix_egl.patch fix_egl_2.patch - clang-cl_QGADGET_fix.diff # Upstream is still figuring out if this is a compiler bug or not. installed_dir.patch GLIB2-static.patch # alternative is to force pkg-config + clang-cl_source_location.patch + clang-cl_QGADGET_fix.diff ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) @@ -273,7 +273,12 @@ set(TOOL_NAMES qtpaths qtpaths6 windeployqt + windeployqt6 macdeployqt + macdeployqt6 + androiddeployqt6 + syncqt + tracepointgen ) qt_install_submodule(PATCHES ${${PORT}_PATCHES} @@ -332,6 +337,7 @@ list(APPEND other_files target_qt.conf qt-cmake-private-install.cmake qt-testrunner.py + sanitizer-testrunner.py ) foreach(_config debug release) @@ -437,6 +443,12 @@ string(REPLACE [[set(QT6_HOST_INFO_LIBEXECDIR "bin")]] [[set(QT6_HOST_INFO_LIBEX string(REPLACE [[set(QT6_HOST_INFO_BINDIR "bin")]] [[set(QT6_HOST_INFO_BINDIR "tools/Qt6/bin")]] _contents "${_contents}") file(WRITE "${hostinfofile}" "${_contents}") +if(NOT VCPKG_CROSSCOMPILING OR EXISTS "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsAdditionalTargetInfo.cmake" + "PACKAGE_PREFIX_DIR}/bin/syncqt" + "PACKAGE_PREFIX_DIR}/tools/Qt6/bin/syncqt") +endif() + set(configfile "${CURRENT_PACKAGES_DIR}/share/Qt6CoreTools/Qt6CoreToolsTargets-debug.cmake") if(EXISTS "${configfile}") file(READ "${configfile}" _contents) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index f3b562bd353..dface61df82 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version": "6.4.3", - "port-version": 3, + "version": "6.5.0", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/windeployqt.debug.bat b/ports/qtbase/windeployqt.debug.bat index 54a50ff8d1f..796dc4f3e8a 100644 --- a/ports/qtbase/windeployqt.debug.bat +++ b/ports/qtbase/windeployqt.debug.bat @@ -6,5 +6,5 @@ set BAKCD=!CD! cd /D %mypath%\..\..\..\debug\bin set PATH=!CD!;%PATH% cd %BAKCD% -"%mypath%\windeployqt.exe" --qtpaths "%mypath%\qtpaths.debug.bat" %* +"%mypath%\windeployqt6.exe" --qtpaths "%mypath%\qtpaths.debug.bat" %* endlocal diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index 0641ee353e0..3ecfab09ef3 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.4.3", + "version": "6.5.0", "description": "QtCharts module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index 515c6930f50..049b5cc1d61 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index ff6633b743d..d7f7a527ace 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Connectivity", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 20949a208c0..7bb7968a969 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index a112c4760c9..b3529abe489 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json index 82ab496affe..74c35875349 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.4.3", + "version": "6.5.0", "description": "Utils for Boot2Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 9ced6ea943b..7070bd42622 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtgrpc/portfile.cmake b/ports/qtgrpc/portfile.cmake new file mode 100644 index 00000000000..142bb026d49 --- /dev/null +++ b/ports/qtgrpc/portfile.cmake @@ -0,0 +1,16 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) +set(TOOL_NAMES qtprotobufgen qtgrpcgen) +# native_grpc ->grpc WrapgRPC +# grp -> qt[network] +# qtprotobufgen -> protobuf WrapProtobuf +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS + -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON + CONFIGURE_OPTIONS_MAYBE_UNUSED + QT_BUILD_EXAMPLES + QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS + ) diff --git a/ports/qtgrpc/vcpkg.json b/ports/qtgrpc/vcpkg.json new file mode 100644 index 00000000000..b83052017a7 --- /dev/null +++ b/ports/qtgrpc/vcpkg.json @@ -0,0 +1,26 @@ +{ + "name": "qtgrpc", + "version": "6.5.0", + "description": "Qt framework based gRPC clients and services.", + "homepage": "https://www.qt.io/", + "license": null, + "dependencies": [ + { + "name": "grpc", + "default-features": false + }, + { + "name": "protobuf", + "default-features": false + }, + { + "name": "qtbase", + "default-features": false + }, + { + "name": "qtgrpc", + "host": true, + "default-features": false + } + ] +} diff --git a/ports/qthttpserver/vcpkg.json b/ports/qthttpserver/vcpkg.json index c6f2a6750bf..7229f547be8 100644 --- a/ports/qthttpserver/vcpkg.json +++ b/ports/qthttpserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qthttpserver", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Extension: Qt HTTP Server", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtimageformats/no_target_promotion_latest.patch b/ports/qtimageformats/no_target_promotion_latest.patch index 1b76e36b58e..244e09f4b1b 100644 --- a/ports/qtimageformats/no_target_promotion_latest.patch +++ b/ports/qtimageformats/no_target_promotion_latest.patch @@ -17,5 +17,5 @@ index 7fdd7ddbd..f189c472c 100644 +if(TARGET JPEG::JPEG) + set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE) +endif() - find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case - find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) # special case + find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) + find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index a6682002535..dd2898c541d 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.4.3", + "version": "6.5.0", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index 0a76f2969db..769e8f8eed4 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -49,3 +49,5 @@ if(NOT VCPKG_CROSSCOMPILING) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() endif() + +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/Qt6/QtInterfaceFramework/6.5.0/QtInterfaceFramework/private/qifqueryparser_flex_p.h" "${CURRENT_BUILDTREES_DIR}" "") diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index eecf56e9d5d..05ebe030cbf 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Interface Framework", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlanguageserver/vcpkg.json b/ports/qtlanguageserver/vcpkg.json index 9ba4f70e570..add387cc35f 100644 --- a/ports/qtlanguageserver/vcpkg.json +++ b/ports/qtlanguageserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlanguageserver", - "version": "6.4.3", + "version": "6.5.0", "description": "An implementation of the Language Server Protocol", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlocation/portfile.cmake b/ports/qtlocation/portfile.cmake index 15fa294cde7..d4afa6dfbc7 100644 --- a/ports/qtlocation/portfile.cmake +++ b/ports/qtlocation/portfile.cmake @@ -1,7 +1,5 @@ -set(VCPKG_POLICY_EMPTY_PACKAGE enabled) -message(STATUS "Upstream decided to split this into qtpositioning and qtlocation. qtlocation however is currently empty!") -# set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") -# include("${SCRIPT_PATH}/qt_install_submodule.cmake") +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") # set(${PORT}_PATCHES) @@ -17,8 +15,8 @@ message(STATUS "Upstream decided to split this into qtpositioning and qtlocation # "-DCMAKE_DISABLE_FIND_PACKAGE_Gconf=ON" # ) -# qt_install_submodule(PATCHES ${${PORT}_PATCHES} - # CONFIGURE_OPTIONS ${FEATURE_OPTIONS} - # CONFIGURE_OPTIONS_RELEASE - # CONFIGURE_OPTIONS_DEBUG - # ) +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index be27b210af0..f6eb06da44f 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Location", "homepage": "https://www.qt.io/", "license": null, @@ -17,6 +17,16 @@ ], "platform": "linux" }, - "qtpositioning" + { + "name": "qtpositioning", + "default-features": false, + "features": [ + "qml" + ] + }, + { + "name": "qtshadertools", + "default-features": false + } ] } diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index 99a5af264f5..af54a5807c4 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.4.3", + "version": "6.5.0", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index 306dd5e727c..2a248fa310f 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 4ba4f643dbb..c7b711bf55e 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtmultimedia", - "version": "6.4.3", - "port-version": 1, + "version": "6.5.0", "description": "Qt Multimedia", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 8c38f4aca0e..6346e699cb5 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtopcua/open62541_v1.3_support.patch b/ports/qtopcua/open62541_v1.3_support.patch deleted file mode 100644 index 84a34419e0e..00000000000 --- a/ports/qtopcua/open62541_v1.3_support.patch +++ /dev/null @@ -1,361 +0,0 @@ -diff --git a/src/plugins/opcua/open62541/qopen62541.h b/src/plugins/opcua/open62541/qopen62541.h -index aed1262..a4f63df 100644 ---- a/src/plugins/opcua/open62541/qopen62541.h -+++ b/src/plugins/opcua/open62541/qopen62541.h -@@ -11,6 +11,8 @@ - #elif defined(__GNUC__) //includes mingw - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wunused-parameter" -+#pragma GCC diagnostic ignored "-Wmissing-field-initializers" -+#pragma GCC diagnostic ignored "-Wmissing-braces" - #elif defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wunused-parameter" -diff --git a/src/plugins/opcua/open62541/qopen62541backend.cpp b/src/plugins/opcua/open62541/qopen62541backend.cpp -index f62ad6c..8714e7a 100644 ---- a/src/plugins/opcua/open62541/qopen62541backend.cpp -+++ b/src/plugins/opcua/open62541/qopen62541backend.cpp -@@ -176,7 +176,7 @@ void Open62541AsyncBackend::writeAttributes(quint64 handle, UA_NodeId id, QOpcUa - - void Open62541AsyncBackend::enableMonitoring(quint64 handle, UA_NodeId id, QOpcUa::NodeAttributes attr, const QOpcUaMonitoringParameters &settings) - { -- UaDeleter nodeIdDeleter(&id, UA_NodeId_deleteMembers); -+ UaDeleter nodeIdDeleter(&id, UA_NodeId_clear); - - QOpen62541Subscription *usedSubscription = nullptr; - -@@ -328,7 +328,7 @@ void Open62541AsyncBackend::resolveBrowsePath(quint64 handle, UA_NodeId startNod - UA_TranslateBrowsePathsToNodeIdsRequest req; - UA_TranslateBrowsePathsToNodeIdsRequest_init(&req); - UaDeleter requestDeleter( -- &req,UA_TranslateBrowsePathsToNodeIdsRequest_deleteMembers); -+ &req,UA_TranslateBrowsePathsToNodeIdsRequest_clear); - - req.browsePathsSize = 1; - req.browsePaths = UA_BrowsePath_new(); -@@ -466,7 +466,7 @@ void Open62541AsyncBackend::readNodeAttributes(const QList &node - - UA_ReadRequest req; - UA_ReadRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_ReadRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_ReadRequest_clear); - - req.nodesToReadSize = nodesToRead.size(); - req.nodesToRead = static_cast(UA_Array_new(nodesToRead.size(), &UA_TYPES[UA_TYPES_READVALUEID])); -@@ -503,7 +503,7 @@ void Open62541AsyncBackend::writeNodeAttributes(const QList &no - - UA_WriteRequest req; - UA_WriteRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_WriteRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_WriteRequest_clear); - - req.nodesToWriteSize = nodesToWrite.size(); - req.nodesToWrite = static_cast(UA_Array_new(nodesToWrite.size(), &UA_TYPES[UA_TYPES_WRITEVALUE])); -@@ -600,7 +600,7 @@ void Open62541AsyncBackend::addNode(const QOpcUaAddNodeItem &nodeToAdd) - { - UA_AddNodesRequest req; - UA_AddNodesRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_AddNodesRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_AddNodesRequest_clear); - req.nodesToAddSize = 1; - req.nodesToAdd = UA_AddNodesItem_new(); - UA_AddNodesItem_init(req.nodesToAdd); -@@ -644,7 +644,7 @@ void Open62541AsyncBackend::deleteNode(const QString &nodeId, bool deleteTargetR - { - UA_DeleteNodesRequest request; - UA_DeleteNodesRequest_init(&request); -- UaDeleter requestDeleter(&request, UA_DeleteNodesRequest_deleteMembers); -+ UaDeleter requestDeleter(&request, UA_DeleteNodesRequest_clear); - - request.nodesToDeleteSize = 1; - request.nodesToDelete = UA_DeleteNodesItem_new(); -@@ -673,7 +673,7 @@ void Open62541AsyncBackend::addReference(const QOpcUaAddReferenceItem &reference - { - UA_AddReferencesRequest request; - UA_AddReferencesRequest_init(&request); -- UaDeleter requestDeleter(&request, UA_AddReferencesRequest_deleteMembers); -+ UaDeleter requestDeleter(&request, UA_AddReferencesRequest_clear); - - request.referencesToAddSize = 1; - request.referencesToAdd = UA_AddReferencesItem_new(); -@@ -712,7 +712,7 @@ void Open62541AsyncBackend::deleteReference(const QOpcUaDeleteReferenceItem &ref - { - UA_DeleteReferencesRequest request; - UA_DeleteReferencesRequest_init(&request); -- UaDeleter requestDeleter(&request, UA_DeleteReferencesRequest_deleteMembers); -+ UaDeleter requestDeleter(&request, UA_DeleteReferencesRequest_clear); - - request.referencesToDeleteSize = 1; - request.referencesToDelete = UA_DeleteReferencesItem_new(); -@@ -810,10 +810,6 @@ void Open62541AsyncBackend::clientStateCallback(UA_Client *client, - - // UA_Client_disconnect() must be called from outside this callback or open62541 will crash - backend->m_disconnectAfterStateChangeTimer.start(); -- -- // Use a queued connection to make sure the subscription is not deleted if the callback was triggered -- // inside of one of its methods. -- QMetaObject::invokeMethod(backend, "cleanupSubscriptions", Qt::QueuedConnection); - } - - void Open62541AsyncBackend::inactivityCallback(UA_Client *client) -@@ -875,7 +871,7 @@ void Open62541AsyncBackend::connectToEndpoint(const QOpcUaEndpointDescription &e - return; - } - -- UaDeleter clientCertDeleter(&localCertificate, &UA_ByteString_deleteMembers); -+ UaDeleter clientCertDeleter(&localCertificate, &UA_ByteString_clear); - - success = loadFileToByteString(pkiConfig.privateKeyFile(), &privateKey); - -@@ -887,7 +883,7 @@ void Open62541AsyncBackend::connectToEndpoint(const QOpcUaEndpointDescription &e - return; - } - -- UaDeleter privateKeyDeleter(&privateKey, &UA_ByteString_deleteMembers); -+ UaDeleter privateKeyDeleter(&privateKey, &UA_ByteString_clear); - - success = loadAllFilesInDirectory(pkiConfig.trustListDirectory(), &trustList, &trustListSize); - -diff --git a/src/plugins/opcua/open62541/qopen62541client.cpp b/src/plugins/opcua/open62541/qopen62541client.cpp -index cecd9a4..d3e8863 100644 ---- a/src/plugins/opcua/open62541/qopen62541client.cpp -+++ b/src/plugins/opcua/open62541/qopen62541client.cpp -@@ -163,6 +163,7 @@ QStringList QOpen62541Client::supportedSecurityPolicies() const - , "http://opcfoundation.org/UA/SecurityPolicy#Basic128Rsa15" - , "http://opcfoundation.org/UA/SecurityPolicy#Basic256" - , "http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256" -+ , "http://opcfoundation.org/UA/SecurityPolicy#Aes128_Sha256_RsaOaep" - #endif - }; - } -diff --git a/src/plugins/opcua/open62541/qopen62541node.cpp b/src/plugins/opcua/open62541/qopen62541node.cpp -index 9885959..cbfba03 100644 ---- a/src/plugins/opcua/open62541/qopen62541node.cpp -+++ b/src/plugins/opcua/open62541/qopen62541node.cpp -@@ -29,7 +29,7 @@ QOpen62541Node::~QOpen62541Node() - if (m_client) - m_client->unregisterNode(this); - -- UA_NodeId_deleteMembers(&m_nodeId); -+ UA_NodeId_clear(&m_nodeId); - } - - bool QOpen62541Node::readAttributes(QOpcUa::NodeAttributes attr, const QString &indexRange) -diff --git a/src/plugins/opcua/open62541/qopen62541subscription.cpp b/src/plugins/opcua/open62541/qopen62541subscription.cpp -index 610596c..15fccb0 100644 ---- a/src/plugins/opcua/open62541/qopen62541subscription.cpp -+++ b/src/plugins/opcua/open62541/qopen62541subscription.cpp -@@ -146,13 +146,13 @@ void QOpen62541Subscription::modifyMonitoring(quint64 handle, QOpcUa::NodeAttrib - - UA_SetPublishingModeRequest req; - UA_SetPublishingModeRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_SetPublishingModeRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_SetPublishingModeRequest_clear); - req.publishingEnabled = value.toBool(); - req.subscriptionIdsSize = 1; - req.subscriptionIds = UA_UInt32_new(); - *req.subscriptionIds = m_subscriptionId; - UA_SetPublishingModeResponse res = UA_Client_Subscriptions_setPublishingMode(m_backend->m_uaclient, req); -- UaDeleter responseDeleter(&res, UA_SetPublishingModeResponse_deleteMembers); -+ UaDeleter responseDeleter(&res, UA_SetPublishingModeResponse_clear); - - if (res.responseHeader.serviceResult != UA_STATUSCODE_GOOD) { - qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Failed to set publishing mode:" << res.responseHeader.serviceResult; -@@ -181,14 +181,14 @@ void QOpen62541Subscription::modifyMonitoring(quint64 handle, QOpcUa::NodeAttrib - - UA_SetMonitoringModeRequest req; - UA_SetMonitoringModeRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_SetMonitoringModeRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_SetMonitoringModeRequest_clear); - req.monitoringMode = static_cast(value.value()); - req.monitoredItemIdsSize = 1; - req.monitoredItemIds = UA_UInt32_new(); - *req.monitoredItemIds = monItem->monitoredItemId; - req.subscriptionId = m_subscriptionId; - UA_SetMonitoringModeResponse res = UA_Client_MonitoredItems_setMonitoringMode(m_backend->m_uaclient, req); -- UaDeleter responseDeleter(&res, UA_SetMonitoringModeResponse_deleteMembers); -+ UaDeleter responseDeleter(&res, UA_SetMonitoringModeResponse_clear); - - if (res.responseHeader.serviceResult != UA_STATUSCODE_GOOD) { - qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Failed to set monitoring mode:" << res.responseHeader.serviceResult; -@@ -219,7 +219,7 @@ bool QOpen62541Subscription::addAttributeMonitoredItem(quint64 handle, QOpcUa::N - { - UA_MonitoredItemCreateRequest req; - UA_MonitoredItemCreateRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_MonitoredItemCreateRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_MonitoredItemCreateRequest_clear); - req.itemToMonitor.attributeId = QOpen62541ValueConverter::toUaAttributeId(attr); - UA_NodeId_copy(&id, &(req.itemToMonitor.nodeId)); - if (settings.indexRange().size()) -@@ -244,7 +244,7 @@ bool QOpen62541Subscription::addAttributeMonitoredItem(quint64 handle, QOpcUa::N - } - - UA_MonitoredItemCreateResult res; -- UaDeleter resultDeleter(&res, UA_MonitoredItemCreateResult_deleteMembers); -+ UaDeleter resultDeleter(&res, UA_MonitoredItemCreateResult_clear); - - if (attr == QOpcUa::NodeAttribute::EventNotifier && settings.filter().canConvert()) - res = UA_Client_MonitoredItems_createEvent(m_backend->m_uaclient, m_subscriptionId, -@@ -436,7 +436,7 @@ void QOpen62541Subscription::createEventFilter(const QOpcUaMonitoringParameters: - - convertSelectClause(filter, &uaFilter->selectClauses, &uaFilter->selectClausesSize); - if (!convertWhereClause(filter, &uaFilter->whereClause)) -- UA_ExtensionObject_deleteMembers(out); -+ UA_ExtensionObject_clear(out); - } - - bool QOpen62541Subscription::convertSelectClause(const QOpcUaMonitoringParameters::EventFilter &filter, -@@ -458,8 +458,9 @@ bool QOpen62541Subscription::convertSelectClause(const QOpcUaMonitoringParameter - QOpen62541ValueConverter::scalarFromQt( - filter.selectClauses().at(i).browsePath().at(j), &select[i].browsePath[j]); - } -- QOpen62541ValueConverter::scalarFromQt(filter.selectClauses().at(i).indexRange(), -- &select[i].indexRange); -+ if (!filter.selectClauses().at(i).indexRange().isEmpty()) -+ QOpen62541ValueConverter::scalarFromQt(filter.selectClauses().at(i).indexRange(), -+ &select[i].indexRange); - select[i].attributeId = QOpen62541ValueConverter::toUaAttributeId(filter.selectClauses().at(i).attributeId()); - } - -@@ -548,7 +549,7 @@ bool QOpen62541Subscription::convertWhereClause(const QOpcUaMonitoringParameters - } else { - qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Unknown filter operand type for event filter" << - filter.whereClause().at(i).filterOperands().at(j).typeName(); -- UA_ContentFilter_deleteMembers(result); -+ UA_ContentFilter_clear(result); - return false; - } - } -@@ -703,7 +704,7 @@ bool QOpen62541Subscription::modifyMonitoredItemParameters(quint64 nodeHandle, Q - - UA_ModifyMonitoredItemsRequest req; - UA_ModifyMonitoredItemsRequest_init(&req); -- UaDeleter requestDeleter(&req, UA_ModifyMonitoredItemsRequest_deleteMembers); -+ UaDeleter requestDeleter(&req, UA_ModifyMonitoredItemsRequest_clear); - req.subscriptionId = m_subscriptionId; - req.itemsToModifySize = 1; - req.itemsToModify = UA_MonitoredItemModifyRequest_new(); -@@ -780,7 +781,7 @@ bool QOpen62541Subscription::modifyMonitoredItemParameters(quint64 nodeHandle, Q - - UA_ModifyMonitoredItemsResponse res = UA_Client_MonitoredItems_modify(m_backend->m_uaclient, req); - UaDeleter responseDeleter( -- &res, UA_ModifyMonitoredItemsResponse_deleteMembers); -+ &res, UA_ModifyMonitoredItemsResponse_clear); - - if (res.responseHeader.serviceResult != UA_STATUSCODE_GOOD || res.results[0].statusCode != UA_STATUSCODE_GOOD) { - p.setStatusCode(static_cast(res.responseHeader.serviceResult == UA_STATUSCODE_GOOD ? res.results[0].statusCode : res.responseHeader.serviceResult)); -diff --git a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp -index 5a8562c..61a504a 100644 ---- a/src/plugins/opcua/open62541/qopen62541valueconverter.cpp -+++ b/src/plugins/opcua/open62541/qopen62541valueconverter.cpp -@@ -124,69 +124,67 @@ QVariant toQVariant(const UA_Variant &value) - return QVariant(); - } - -- switch (value.type->typeIndex) { -- case UA_TYPES_BOOLEAN: -+ if (value.type == &UA_TYPES[UA_TYPES_BOOLEAN]) - return arrayToQVariant(value, QMetaType::Bool); -- case UA_TYPES_SBYTE: -+ else if (value.type == &UA_TYPES[UA_TYPES_SBYTE]) - return arrayToQVariant(value, QMetaType::SChar); -- case UA_TYPES_BYTE: -+ else if (value.type == &UA_TYPES[UA_TYPES_BYTE]) - return arrayToQVariant(value, QMetaType::UChar); -- case UA_TYPES_INT16: -+ else if (value.type == &UA_TYPES[UA_TYPES_INT16]) - return arrayToQVariant(value, QMetaType::Short); -- case UA_TYPES_UINT16: -+ else if (value.type == &UA_TYPES[UA_TYPES_UINT16]) - return arrayToQVariant(value, QMetaType::UShort); -- case UA_TYPES_INT32: -+ else if (value.type == &UA_TYPES[UA_TYPES_INT32]) - return arrayToQVariant(value, QMetaType::Int); -- case UA_TYPES_UINT32: -+ else if (value.type == &UA_TYPES[UA_TYPES_UINT32]) - return arrayToQVariant(value, QMetaType::UInt); -- case UA_TYPES_INT64: -+ else if (value.type == &UA_TYPES[UA_TYPES_INT64]) - return arrayToQVariant(value, QMetaType::LongLong); -- case UA_TYPES_UINT64: -+ else if (value.type == &UA_TYPES[UA_TYPES_UINT64]) - return arrayToQVariant(value, QMetaType::ULongLong); -- case UA_TYPES_FLOAT: -+ else if (value.type == &UA_TYPES[UA_TYPES_FLOAT]) - return arrayToQVariant(value, QMetaType::Float); -- case UA_TYPES_DOUBLE: -+ else if (value.type == &UA_TYPES[UA_TYPES_DOUBLE]) - return arrayToQVariant(value, QMetaType::Double); -- case UA_TYPES_STRING: -+ else if (value.type == &UA_TYPES[UA_TYPES_STRING]) - return arrayToQVariant(value, QMetaType::QString); -- case UA_TYPES_BYTESTRING: -+ else if (value.type == &UA_TYPES[UA_TYPES_BYTESTRING]) - return arrayToQVariant(value, QMetaType::QByteArray); -- case UA_TYPES_LOCALIZEDTEXT: -+ else if (value.type == &UA_TYPES[UA_TYPES_LOCALIZEDTEXT]) - return arrayToQVariant(value); -- case UA_TYPES_NODEID: -+ else if (value.type == &UA_TYPES[UA_TYPES_NODEID]) - return arrayToQVariant(value, QMetaType::QString); -- case UA_TYPES_DATETIME: -+ else if (value.type == &UA_TYPES[UA_TYPES_DATETIME]) - return arrayToQVariant(value, QMetaType::QDateTime); -- case UA_TYPES_GUID: -+ else if (value.type == &UA_TYPES[UA_TYPES_GUID]) - return arrayToQVariant(value, QMetaType::QUuid); -- case UA_TYPES_XMLELEMENT: -+ else if (value.type == &UA_TYPES[UA_TYPES_XMLELEMENT]) - return arrayToQVariant(value, QMetaType::QString); -- case UA_TYPES_QUALIFIEDNAME: -+ else if (value.type == &UA_TYPES[UA_TYPES_QUALIFIEDNAME]) - return arrayToQVariant(value); -- case UA_TYPES_STATUSCODE: -+ else if (value.type == &UA_TYPES[UA_TYPES_STATUSCODE]) - return arrayToQVariant(value, QMetaType::UInt); -- case UA_TYPES_EXTENSIONOBJECT: -+ else if (value.type == &UA_TYPES[UA_TYPES_EXTENSIONOBJECT]) - return arrayToQVariant(value); -- case UA_TYPES_EXPANDEDNODEID: -+ else if (value.type == &UA_TYPES[UA_TYPES_EXPANDEDNODEID]) - return arrayToQVariant(value); -- case UA_TYPES_ARGUMENT: -+ else if (value.type == &UA_TYPES[UA_TYPES_ARGUMENT]) - return arrayToQVariant(value); -- case UA_TYPES_RANGE: -+ else if (value.type == &UA_TYPES[UA_TYPES_RANGE]) - return arrayToQVariant(value); -- case UA_TYPES_EUINFORMATION: -+ else if (value.type == &UA_TYPES[UA_TYPES_EUINFORMATION]) - return arrayToQVariant(value); -- case UA_TYPES_AXISINFORMATION: -+ else if (value.type == &UA_TYPES[UA_TYPES_AXISINFORMATION]) - return arrayToQVariant(value); -- case UA_TYPES_COMPLEXNUMBERTYPE: -+ else if (value.type == &UA_TYPES[UA_TYPES_COMPLEXNUMBERTYPE]) - return arrayToQVariant(value); -- case UA_TYPES_DOUBLECOMPLEXNUMBERTYPE: -+ else if (value.type == &UA_TYPES[UA_TYPES_DOUBLECOMPLEXNUMBERTYPE]) - return arrayToQVariant(value); -- case UA_TYPES_XVTYPE: -+ else if (value.type == &UA_TYPES[UA_TYPES_XVTYPE]) - return arrayToQVariant(value); -- default: -- qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Variant conversion from Open62541 for typeName" << value.type->typeName << " not implemented"; -- return QVariant(); -- } -+ -+ qCWarning(QT_OPCUA_PLUGINS_OPEN62541) << "Variant conversion from Open62541 for typeName" << value.type->typeName << " not implemented"; -+ return QVariant(); - } - - const UA_DataType *toDataType(QOpcUa::Types valueType) -@@ -672,7 +670,7 @@ void scalarFromQt(const QOpcUaExtensi - { - QByteArray temp = obj.encodedBody(); - UA_NodeId encodingId = Open62541Utils::nodeIdFromQString(obj.encodingTypeId()); -- UaDeleter nodeIdDeleter(&encodingId, UA_NodeId_deleteMembers); -+ UaDeleter nodeIdDeleter(&encodingId, UA_NodeId_clear); - createExtensionObject(temp, encodingId, ptr, obj.encoding()); - } - diff --git a/ports/qtopcua/portfile.cmake b/ports/qtopcua/portfile.cmake index 3dfeca0a474..ff5602572be 100644 --- a/ports/qtopcua/portfile.cmake +++ b/ports/qtopcua/portfile.cmake @@ -1,7 +1,7 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES open62541_v1.3_support.patch) +set(${PORT}_PATCHES ) # General features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index fc2397de976..b38dcc63cf9 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtopcua", - "version": "6.4.3", - "port-version": 2, + "version": "6.5.0", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index 4a89009aac8..7f7c4c33785 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Positioning", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 1167148cdf9..ad84adda890 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtquick3d", - "version": "6.4.3", - "port-version": 1, + "version": "6.5.0", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3dphysics/vcpkg.json b/ports/qtquick3dphysics/vcpkg.json index 7c85a586d38..4438577bf20 100644 --- a/ports/qtquick3dphysics/vcpkg.json +++ b/ports/qtquick3dphysics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3dphysics", - "version": "6.4.3", + "version": "6.5.0", "description": "Physics engine integration for Qt Quick 3D", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquickeffectmaker/portfile.cmake b/ports/qtquickeffectmaker/portfile.cmake new file mode 100644 index 00000000000..effa2d5b110 --- /dev/null +++ b/ports/qtquickeffectmaker/portfile.cmake @@ -0,0 +1,14 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES) +set(TOOL_NAMES qqem) + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} + CONFIGURE_OPTIONS_MAYBE_UNUSED + QT_BUILD_EXAMPLES + QT_USE_DEFAULT_CMAKE_OPTIMIZATION_FLAGS + ) + +set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/qtquickeffectmaker/vcpkg.json b/ports/qtquickeffectmaker/vcpkg.json new file mode 100644 index 00000000000..7a3cc4c0f54 --- /dev/null +++ b/ports/qtquickeffectmaker/vcpkg.json @@ -0,0 +1,29 @@ +{ + "name": "qtquickeffectmaker", + "version": "6.5.0", + "description": "Qt Quick Effect Maker (QQEM) for creating and editing custom shader effects.", + "homepage": "https://www.qt.io/", + "license": null, + "supports": "native", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] + }, + { + "name": "qtdeclarative", + "default-features": false + }, + { + "name": "qtquick3d", + "default-features": false + }, + { + "name": "qtshadertools", + "default-features": false + } + ] +} diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index b1f8fc9aa08..5d82eb7c51f 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.4.3", + "version": "6.5.0", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index 2d27cc8d9cc..23a33b09036 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt distributed object system", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index b196eed46dd..fc3b51026fc 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.4.3", + "version": "6.5.0", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index f7db1f3e45b..c18ba91fe73 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Sensors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index d5a9868b332..5ddcf226a3d 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.4.3", + "version": "6.5.0", "description": "Support for CAN and potentially other serial buses.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index c15abfd6d9c..240f5f5b1b4 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Serial Port support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 2ae2a15243c..93e8fecbae4 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.4.3", + "version": "6.5.0", "description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtspeech/vcpkg.json b/ports/qtspeech/vcpkg.json index c64335551b0..905620cfd13 100644 --- a/ports/qtspeech/vcpkg.json +++ b/ports/qtspeech/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtspeech", - "version": "6.4.3", - "port-version": 1, + "version": "6.5.0", "description": "Qt Speech support", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index ff593dc7b09..9d33739b65e 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt SVG", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/devendor-litehtml.patch b/ports/qttools/devendor-litehtml.patch index 442244b62c6..ed3b43a1527 100644 --- a/ports/qttools/devendor-litehtml.patch +++ b/ports/qttools/devendor-litehtml.patch @@ -54,3 +54,16 @@ endif() - -endif() +diff --git a/src/assistant/CMakeLists.txt b/src/assistant/CMakeLists.txt +index 5d2bf2b67c..abd9b513d3 100644 +--- a/src/assistant/CMakeLists.txt ++++ b/src/assistant/CMakeLists.txt +@@ -34,7 +34,7 @@ if(TARGET qlitehtml) + # but found in the system, because they are imported only to the subdirectory scope + # where find_package was called. But that's fine, we wouldn't be able to set compiler flags + # on them anyway. +- if(TARGET litehtml) ++ if(0) + qt_internal_set_exceptions_flags(litehtml OFF) + qt_disable_warnings(litehtml) + endif() diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 7a0c771b879..849875d76b2 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qttools", - "version": "6.4.3", - "port-version": 1, + "version": "6.5.0", "description": "Qt Tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 7e7d5c682bc..18ff8ebdbe8 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt Translations", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index 7709bdb2ffa..fd1170b9458 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.4.3", + "version": "6.5.0", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index 62a197ac2b2..2799ce9f14b 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.4.3", + "version": "6.5.0", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index 5531260cb82..4ed4777ddba 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt WebChannel", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index dbe7936eccd..a9a9f8b5d27 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -1,8 +1,7 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES - ) +set(${PORT}_PATCHES "") set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict) @@ -106,6 +105,7 @@ qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes. -DBISON_EXECUTABLE=${BISON} -DFLEX_EXECUTABLE=${FLEX} -DNodejs_EXECUTABLE=${NODEJS} + -DQT_FEATURE_webengine_jumbo_build=0 OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG} OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE}) diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index e7bac0c5f2b..3df78cd7b47 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,7 +1,7 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt WebEngine", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index 7961411c0d3..473152094b3 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.4.3", + "version": "6.5.0", "description": "Qt WebSockets", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index b3c721ba184..4735c17327b 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtwebview", - "version": "6.4.3", - "port-version": 1, + "version": "6.5.0", "description": "Qt Web View", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/rtabmap/fix_qt_deploy_plugins.patch b/ports/rtabmap/fix_qt_deploy_plugins.patch deleted file mode 100644 index 979ee8313d2..00000000000 --- a/ports/rtabmap/fix_qt_deploy_plugins.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt -index f0cef72c..f007eb83 100644 ---- a/app/src/CMakeLists.txt -+++ b/app/src/CMakeLists.txt -@@ -53,7 +53,14 @@ ENDIF() - INSTALL(TARGETS rtabmap_app - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT runtime - BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime) -- -+ -+qt_generate_deploy_app_script( -+ TARGET rtabmap_app -+ FILENAME_VARIABLE deploy_script -+ NO_UNSUPPORTED_PLATFORM_ERROR -+) -+install(SCRIPT ${deploy_script}) -+ - IF(APPLE AND BUILD_AS_BUNDLE) - INSTALL(CODE "execute_process(COMMAND ln -s \"../MacOS/${CMAKE_BUNDLE_NAME}\" ${PROJECT_NAME} - WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/bin)") diff --git a/ports/rtabmap/portfile.cmake b/ports/rtabmap/portfile.cmake index 710db46e5ad..2147226e9d6 100644 --- a/ports/rtabmap/portfile.cmake +++ b/ports/rtabmap/portfile.cmake @@ -7,7 +7,6 @@ vcpkg_from_github( SHA512 47fa00e760cd9089d42dc27cc0120f2dc2ad4b32b6a05e87fb5320fd6fe3971e68958984714895640989543be9252fd0fb96ccebf0d00d70afbad224022a7a53 HEAD_REF master PATCHES - fix_qt_deploy_plugins.patch fix_autouic.patch ) @@ -118,24 +117,22 @@ if("tools" IN_LIST FEATURES) # Remove duplicate files that were added by qtdeploy # that would be already deployed by vcpkg_copy_tools - file(RENAME ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/tmp) - file(GLOB RTABMAP_REL_LIBS ${CURRENT_PACKAGES_DIR}/tmp/rtabmap*) - file(COPY ${RTABMAP_REL_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(RENAME "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/tmp") + file(GLOB RTABMAP_REL_LIBS "${CURRENT_PACKAGES_DIR}/tmp/rtabmap*") + file(COPY ${RTABMAP_REL_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tmp") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/translations") - file(RENAME ${CURRENT_PACKAGES_DIR}/plugins ${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins) #qt.conf - file(WRITE ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "[Paths] - Prefix = .") + file(COPY "${CURRENT_INSTALLED_DIR}/tools/Qt6/bin/qt.conf" DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "./../../../" "./../../") # Debug - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/tmp) - file(GLOB RTABMAP_DBG_LIBS ${CURRENT_PACKAGES_DIR}/debug/tmp/rtabmap*) - file(COPY ${RTABMAP_DBG_LIBS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/debug/tmp") + file(GLOB RTABMAP_DBG_LIBS "${CURRENT_PACKAGES_DIR}/debug/tmp/rtabmap*") + file(COPY ${RTABMAP_DBG_LIBS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/tmp") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/plugins") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/translations") - endif() endif() diff --git a/ports/rtabmap/vcpkg.json b/ports/rtabmap/vcpkg.json index 86754dd8dba..ecbc94570e5 100644 --- a/ports/rtabmap/vcpkg.json +++ b/ports/rtabmap/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rtabmap", "version": "0.21.0", + "port-version": 1, "description": "Real-Time Appearance-Based Mapping", "homepage": "https://introlab.github.io/rtabmap/", "license": "BSD-3-Clause", diff --git a/ports/spix/portfile.cmake b/ports/spix/portfile.cmake deleted file mode 100644 index ed9443f4116..00000000000 --- a/ports/spix/portfile.cmake +++ /dev/null @@ -1,25 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO faaxm/spix - REF v0.5 - SHA512 fdc35ff4920a83d4b2d0abe84eae7c8f46cb259e525d4445b091eb01990bcdeade7e60a00795f4acccc09f0702fa61d17ba6c7b8bbf19ff218e8bd42e1eb7f7c - - HEAD_REF master -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DSPIX_BUILD_EXAMPLES=OFF - -DSPIX_BUILD_TESTS=OFF - -DSPIX_QT_MAJOR=6 -) - -vcpkg_cmake_install() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) - -vcpkg_copy_pdbs() diff --git a/ports/spix/vcpkg.json b/ports/spix/vcpkg.json deleted file mode 100644 index f35646bb39a..00000000000 --- a/ports/spix/vcpkg.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "spix", - "version": "0.5", - "description": "A minimally invasive UI testing library that enables your Qt/QML app's UI to be controlled either via c++ code, or through an http RPC interface.", - "homepage": "https://github.com/faaxm/spix", - "license": "MIT", - "dependencies": [ - "anyrpc", - { - "name": "qtbase", - "default-features": false - }, - "qtdeclarative", - { - "name": "vcpkg-cmake", - "host": true - } - ] -} diff --git a/versions/baseline.json b/versions/baseline.json index 1847be8258e..4d512480cee 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6413,15 +6413,15 @@ "port-version": 1 }, "qt": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "qt-advanced-docking-system": { "baseline": "3.8.2", "port-version": 2 }, "qt3d": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qt5": { @@ -6597,63 +6597,67 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "qt6betablock": { "baseline": "6.2.0-beta", "port-version": 0 }, "qtactiveqt": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtbase": { - "baseline": "6.4.3", - "port-version": 3 + "baseline": "6.5.0", + "port-version": 0 }, "qtcharts": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtcoap": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtdoc": { - "baseline": "6.4.3", + "baseline": "6.5.0", + "port-version": 0 + }, + "qtgrpc": { + "baseline": "6.5.0", "port-version": 0 }, "qthttpserver": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtimageformats": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtkeychain": { @@ -6665,116 +6669,120 @@ "port-version": 1 }, "qtlanguageserver": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtlocation": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtlottie": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtmqtt": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtopcua": { - "baseline": "6.4.3", - "port-version": 2 + "baseline": "6.5.0", + "port-version": 0 }, "qtpositioning": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtquick3d": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "qtquick3dphysics": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtquickcontrols2": { "baseline": "deprecated", "port-version": 0 }, + "qtquickeffectmaker": { + "baseline": "6.5.0", + "port-version": 0 + }, "qtquicktimeline": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtscxml": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtsensors": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtserialbus": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtserialport": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtshadertools": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtspeech": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "qtsvg": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qttools": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "qttranslations": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtwayland": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtwebengine": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.4.3", + "baseline": "6.5.0", "port-version": 0 }, "qtwebview": { - "baseline": "6.4.3", - "port-version": 1 + "baseline": "6.5.0", + "port-version": 0 }, "quadtree": { "baseline": "2022-04-24", @@ -7058,7 +7066,7 @@ }, "rtabmap": { "baseline": "0.21.0", - "port-version": 0 + "port-version": 1 }, "rtaudio": { "baseline": "2021-11-16", diff --git a/versions/q-/qt.json b/versions/q-/qt.json index cfa34d82664..3add2fcb82a 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ecd656220f58ebf6651801b9fc439ba5d8f6b62b", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "6e93109d6a3a6a6ef65470ce467a01a931a723b9", "version": "6.4.3", diff --git a/versions/q-/qt3d.json b/versions/q-/qt3d.json index 90bd05b2fd4..1b31dfb73af 100644 --- a/versions/q-/qt3d.json +++ b/versions/q-/qt3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56a3a7a27a022640d0f965aeb1d56ece4c63006d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "c3c0d24660bf42af84e27538b011b36e831ba942", "version": "6.4.3", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 3d9f3174f48..d293e8a5487 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4a3c116018e4b6f97e056193c82af718bda10b3", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "0a79c6cfb2113f764e603ee13a4c12493f16b6d5", "version": "6.4.3", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 0ca3bd6c748..27a7c3c94d1 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "906e0b257af28f5690907f94ad79bc95f3a34f5c", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "f2ba14310d63294366c151fc33bc22807ddc4381", "version": "6.4.3", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 31fc3ff601f..08a6640edae 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02767f9ffe5a4a96fa2555440e17e92d1795548d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "abe5601cca736c754b78f7451584d76fa06387f7", "version": "6.4.3", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index d7808b0279a..d5535790adb 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "501903e9d1d55ca5dbeee2ff61c8c846e77fe7b3", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "cc1cc5c1a5d6a7c4c10feebe8d43a069d3a375a7", "version": "6.4.3", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index 7bafe6243fd..9d0dea1b2a6 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9cb7b445154fb5957aec5455428d0bde929fcda", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "2cf33ba2051247bb8a97afec744df43f608f995f", "version": "6.4.3", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index fa3d2a68235..3eb5bb87a0a 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f5c864cedd1698478c95617d82ba56b1dd240ab2", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "0ec02fcfbcdf7429b89d559491dce4912d93533a", "version": "6.4.3", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index ab1ed549671..a4640ce6d08 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e87723595352e8637721bea77ffc9c1ad73c031", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "3c207cf03cd774a0540d8199ca4c3e5d1279949b", "version": "6.4.3", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 751dc6a846e..cb08e903b89 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55f14b0a4149603a1d171ebf4cc99d8dfb2739c3", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "b240e1a2bf68f450855c7a93d6ff755e9e519afb", "version": "6.4.3", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index e3a1a338904..d4d5e0f1eba 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0d4c48a9b7ef8047bb2068271fb433deddd3ffb", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "d95042b70d48866fce13c9474b4bedd62ac9be7f", "version": "6.4.3", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index d6d53bb78e0..b15350f5d10 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21885adf14cf548990d1a47fb4baf3c75bc00859", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "30f0d972b16884ce41d64dea7550976b4bb102d5", "version": "6.4.3", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 52ace62f3b9..833701a4f31 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54a7e5b497830856aad12dec08b7bb01c37b4999", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "6b0bc07f88766c3534b163684451151b4f7346ef", "version": "6.4.3", diff --git a/versions/q-/qtgrpc.json b/versions/q-/qtgrpc.json new file mode 100644 index 00000000000..d028852436a --- /dev/null +++ b/versions/q-/qtgrpc.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "8fb784c858ca56e7ed43e80c0d5937962a2f72b2", + "version": "6.5.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qthttpserver.json b/versions/q-/qthttpserver.json index 74f07476813..7ed7220ce5a 100644 --- a/versions/q-/qthttpserver.json +++ b/versions/q-/qthttpserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9467160ab402bfd2f04461aee718cb9043d3a094", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "0725482920b4594c7f9345ef21124041aa648075", "version": "6.4.3", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 9c774a45bab..8d8d9fc0672 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a6f759bf37a0bbc86ccdac3eccbfa40816cbd79", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "bf254edd44146eaac43755ff680855122d2a8705", "version": "6.4.3", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 43f58f66f17..882ef2e3a23 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3c0fac0141ef882b26d1904189a1aafd4dc4540f", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "0bb5fdc2bde29cd083a90c67dc1892d68772dadc", "version": "6.4.3", diff --git a/versions/q-/qtlanguageserver.json b/versions/q-/qtlanguageserver.json index 6a2eb47fe68..219b349f4a3 100644 --- a/versions/q-/qtlanguageserver.json +++ b/versions/q-/qtlanguageserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "248be805b9a3c9d95efa723392d374a9c94a5c27", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "9e626f373f4ca8f18e9bde990f75c34aef89baa2", "version": "6.4.3", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index 27419f01233..86ed9fb5f74 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d015b0691674d099f1a1ab1c6b812a914f3bad80", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "9ff1609af9be7a187f0edcc495b0d646dc36a976", "version": "6.4.3", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 935d5a4b56c..b24084b8ef0 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c8d01536a9c595ddc58327caac428c86ffe2262", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "d8887bee44785f3c285c103d31d6c1436908ea8f", "version": "6.4.3", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index 38699392fbc..06261e261a1 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3129ca4a0ba4f6e94550a56d32228560cb3483f9", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "67ca11347716f0408dd58bec49c52b8bc3c04da5", "version": "6.4.3", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index a07f50f8969..e5a777ec545 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a10258ebedf8a3f71b8d761b58933e40bf70fac3", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "833b2e1397868c7a5ba8f195dca85ac73ddd93bc", "version": "6.4.3", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 385ec93f473..838c7cd9313 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "767609a9d9713dae6a4c0fd2696a1ec994e28e21", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "e521ca0bc29e9c96290d6765997d4c7df3712599", "version": "6.4.3", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index ac1043269bf..47523a1ab12 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4e08f45ca76dba44e3de1c48d6210e1d987f44b3", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "4c9519c0e8f61a9f9cddd4711fb8d8a6139baef9", "version": "6.4.3", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index 1dcc9a49c63..a02dc9496b1 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0da142e2b032f345e88aed41ef444684523be056", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "e6e37d5325bba76a2c912dcc537c36f5214e45d7", "version": "6.4.3", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 2904ac68634..5ad1e9dd784 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab3f7bbf20de8d370d5ac8711f2190d96db87f7e", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "a927a30de733a8bb6f1149dd4a5a37aeeca8f521", "version": "6.4.3", diff --git a/versions/q-/qtquick3dphysics.json b/versions/q-/qtquick3dphysics.json index 860df2f1db7..d3543e2862a 100644 --- a/versions/q-/qtquick3dphysics.json +++ b/versions/q-/qtquick3dphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dc5e1726976f64617ee280062596560c791d4b38", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "2fe5d74e187c7131e0b799d59a9bdf056a921396", "version": "6.4.3", diff --git a/versions/q-/qtquickeffectmaker.json b/versions/q-/qtquickeffectmaker.json new file mode 100644 index 00000000000..f7ef5feb071 --- /dev/null +++ b/versions/q-/qtquickeffectmaker.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "fafa1b506a25f0b343afc09ee5708e885ac56076", + "version": "6.5.0", + "port-version": 0 + } + ] +} diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index c28cbcc86d0..de8bf8cfdee 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3f9caf40f1987be65ca3ce699cd176c4453bea14", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "8272dedda604707ed4bdd252fb855ca828b41719", "version": "6.4.3", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index 4a3f2991213..e6f4c86e0df 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cce29bbf6dbad6125ffd59ca29bbc0fd8f9d1108", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "bcb4cf681ccbf7b720b26eb93cf4d656a107652f", "version": "6.4.3", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 08194fe23a5..ee8d95fa049 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a900efa4d344d886cba9d538ecee24346957a76f", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "60116e86139859df7acad954b48f839240e78272", "version": "6.4.3", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index f0773c11527..99d0e1cb91a 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2520f438dda2ec0a8b244be6e1b0fc839e26948d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "21c5259e771214cb14555b2b0310a4ef4c068294", "version": "6.4.3", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index 120c5579c07..99b6ab53a09 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8a3dea63a3bfc75f36c32fffd27ff7e300febc8f", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "3dba771f89dc1c260819b83479a1daba0a822936", "version": "6.4.3", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 8358f2985f1..dbed7c2bea6 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e16e52bb2baeb3a3af3d096cf6357e2494b325d6", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "32ebc82d527f3da5977dcfae337c4eab9e6f228f", "version": "6.4.3", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 2fb92580b1b..bfb1122c8c9 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "664a5427ec4a5d715d4e09f9bbe1222810ddb898", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "c935fae16c7d0dba049dae8b7cc5709c2cc237cf", "version": "6.4.3", diff --git a/versions/q-/qtspeech.json b/versions/q-/qtspeech.json index da1c702029d..e79adce1eab 100644 --- a/versions/q-/qtspeech.json +++ b/versions/q-/qtspeech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6407a70cfbb2ced50ed116bd1e51b8f3a7e54c8a", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "3e3478f6de5a8d655c7d97e40b158bc7dfdfa39c", "version": "6.4.3", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index e25bfc50088..54159cb07b9 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "816b0eb532cf6901c8448ccba8363cfe9938ef5b", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "864d53d5bedd0946c9790551a06258580647478f", "version": "6.4.3", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index a1df9ef99c4..08e13092e4f 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1e559212d2b8a05e7e59a21a6fd035e7f0e05347", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "f3e02443f5bc251e7fdaffdfe1079ac2d1492a42", "version": "6.4.3", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index a657006ad32..c4fca0f9a0f 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b75cda024ccc8c8ba3f9a196a9a6149309d93425", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "48b6fd21acccdffacd9390b9b860a5b2e3ba554a", "version": "6.4.3", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index 5b282747e42..da12f197a52 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2591b11ad8fe48bb353ece5a06c8c27492cb1c1d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "6cbb11db41affe7798e62dbec8ebb5aa8e728b5d", "version": "6.4.3", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index f241ad6db10..09f6b847b99 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "860b82f5d06b7f0eed9ed449507a47d156cfb4ca", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "f40d9bfc0c57c9facd1b4db9da9eaa7ba565692c", "version": "6.4.3", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 9a798ee8c08..794c2aef273 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "40d6a94591187d5fdfb57beebbbad45aa26a1859", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "27b0c979401491880b2dad92b728e14fb5b7e37b", "version": "6.4.3", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index c7d109d2ff7..1e36fc3adc6 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d44e1b4b4683a771c3457652baef60f290f1776", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "7a5dda5f36b2686d421d061f93a73da169815174", "version": "6.4.3", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 28cd5b519b5..eeb9b691144 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c325d5163eea00256739eb59ac084c0c386c2b0d", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "89352bf06b1d966295a7b5e919836e9994eef0a9", "version": "6.4.3", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index ddab3b39655..49fcca77d81 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "250bcb4eb32ec73ee4376ec7af6a365c8f8f61f1", + "version": "6.5.0", + "port-version": 0 + }, { "git-tree": "cef8861fee214027a5ade446692eafb6490fb7ea", "version": "6.4.3", diff --git a/versions/r-/rtabmap.json b/versions/r-/rtabmap.json index fb84b557569..f063294b3ce 100644 --- a/versions/r-/rtabmap.json +++ b/versions/r-/rtabmap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a0ba7b4b9ea0239aa474d40263d96919a81958c", + "version": "0.21.0", + "port-version": 1 + }, { "git-tree": "557a37dc751f64ec6040505e57074251f2441822", "version": "0.21.0",