diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 3414f74c06d2ad..629b9a92f5596f 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version": "6.9.1", + "version": "6.9.2", "description": "A cross-platform application and UI framework.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt3d/vcpkg.json b/ports/qt3d/vcpkg.json index 2f67c0bda17bfe..20528ba5b157d6 100644 --- a/ports/qt3d/vcpkg.json +++ b/ports/qt3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt3d", - "version": "6.9.1", + "version": "6.9.2", "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 ae4b7061bb9aa4..d2f8a1298ed20f 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt 5 Core Compat module contains the Qt 5 Core APIs that were removed in Qt 6. The module facilitates the transition to Qt 6.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index 1682ceaedaa895..ad2dea6b587bf3 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.9.1", + "version": "6.9.2", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index dd6959eb71ace9..d9babf19bf86ac 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt component for application lifecycle management", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtbase/cmake/qt_port_data.cmake b/ports/qtbase/cmake/qt_port_data.cmake index 3b682e82a17728..a5f962ad075cf9 100644 --- a/ports/qtbase/cmake/qt_port_data.cmake +++ b/ports/qtbase/cmake/qt_port_data.cmake @@ -1,50 +1,45 @@ -set(qtbase_HASH "f0fdf4e2c10db73d8036e4b1324f04f48eced78feeed450b0ffa1fac5574daa4173996a4d25da761f5eeaa6037eab02418a88a59fd760d96a08d813c9b8136ed") -set(qttools_HASH "84891798a1227d6ec5d353fe510e02cea1f26d1639cfc87e95eefe63ca9522f36b252666b9954ec0a3a83b2561f53538d9aad51fdc02149a56f1177466be6c22") -set(qtdeclarative_HASH "665acf561f74373f5d220c7c7b8b32ded627d9d17bf709ad30b155863086c20c59f02032fbb8a8046bc6041576ff52ff67621a1b57e19657ad537e20aee024c4") -set(qtsvg_HASH "d36fe4921fb9d7968378e0e1f7131574642baba7eec9a492283c039fec64e307f0a4148bd7fed83ce7b3d92a1af3d9cb31917ced0f15a186262de8bb7fdc615e") -set(qt5compat_HASH "3350a9734e923401a43990dffcdd3f4d6bdfe4a3ff01c6f75e2f0be1410f8794242e2fc712b8dc112102f8cd0d7859e7e010935c42cebe85912fb99300440153") -set(qtshadertools_HASH "f914e27032422af02ebfe16bb4d84ea2bab01b8b6c49e728d4da8f95c36c41849429b7c37c6b677b74b36ccc9341608c85bccf7836f5abbdb5bec520e740d2e6") -set(qtquicktimeline_HASH "23974c45f6a415fae9310a2eec01b87de289ec76846d24d49f7752b029da53d62b68006a5199347d0e6457b0ca4043b75c247475c0f2d10ea882b3a6911a818a") -set(qtquick3d_HASH "ed300ec9eaab59cdd6b15217c0f6b39f2f4678c6757e76ed5ad76654cf542f09abc9af959a2f525abdc8ee43855a3fd4a4f0b6d84cdd3221065cd2e4ae95e517") -set(qttranslations_HASH "eeb48eeaef01f7d8460cf0198e09e8ebd72ef9f023d6c595f4a2c3510d9f6caf8fce17a7af06256940de993bfc29faef44d53a45f03e2b8b31e39746a52b7052") -set(qtwayland_HASH "1647087d695dccbc2b0edd07dc6ea36c22317394ec3b87993938124057d0cf2bbc84eee560ea59e7b2bffeaf8be79d56458f5ba309e36c5ebcf0c738f317b7b7") -set(qtdoc_HASH "f94ae097e873d1316d024804789a6dc210506d40d0d45977e52876a6ce0d43800e10dbb8fcf4b92d5246c5994cca67db219c63dcbb11f050c0fc1ee6a5d571a9") -set(qtcoap_HASH "344b3f7928789561dc2a0d24c706258d29c11a83d8aa187916cd03ef18306a04f100396e460f41ab80331ded4252c24223e4daf433497862c1192f41ace05fc6") -set(qtopcua_HASH "a7a7088a1df60092efcce2dab7d615685a3b86d9a04150935c34dcb8ea41d1f3ce369500616f1e4d34a3f624c28eb5bcfffc4446f90418356f15321e44af23fd") -set(qtimageformats_HASH "6b16801dba5fd8f9431fa96588e030b76865a0d975ad74af0e343ffb05f96a0cf14a5c1a00554238ef087562ea875efaef642ed8b9d2a0352cc3d2aa018f9719") -set(qtmqtt_HASH "f9c4ebc4b2d9e9b674fabe82ae0a21c3451c970a962885d81eda3818752566d3b73b8f0e6d03acb9f65451f5bc7efd7ab7eb1034f43c944ba5c51b6bdea4f136") -set(qtnetworkauth_HASH "455e835b8ab3ab22421966220902d45c6aed6a1f1517da15ada3af2670324f9b6e0f8ee20a70b24c45dd0d1894a0a1e00c6e7d03630de94705da2c9379af3627") -set(qt3d_HASH "585f11ec520a338ecedf7d446af696f1851e45f5758364c91f40d6d254eb120d74da54405496be6fe4bd58ab87d4aeb8f5793e5ffe78ba12b685346c8770d404") -set(qtactiveqt_HASH "cec2c909716cd3513ea7f415675519fe92e126a69b050657dd2fce91013eaa84b6389fc4c6ae94177952be6582da58ccbb4a1fd529e19aa0285b034963f31a8c") -set(qtdatavis3d_HASH "ef18735c4b3b272e518af0b4e3cb4761bbe2e3764f501884eb2568da20e19bf56ad992f61178ed5b198c0c87939fc8e30924b64091c60ba2c482234815bfc28e") -set(qtdeviceutilities_HASH "7bab1d72f0b817915e8fdca670e7eea3dd9977d807049b3d3e0109a8f5cde6fb1e156dc209feff2cf96e9c65be3638e454c6607f4cef005c660a1156ddc497a0") -set(qtlottie_HASH "3a179aed1367eb70d03e5c12762186590ee21174277c742ee22b38bd84c575fcfb6cba60556fa974a3a938849fc4c707b09c9334ef7a2528640b74a136320c56") -set(qtscxml_HASH "f32fc3322eabec7135dc0820f8e39d24b84e8e14e9a9021d1c15021355c5a491bb8c4bbf0d25a2e4e44d8df0d9c7f270a0191f34fffad56f92e2ab0c742691b4") -set(qtvirtualkeyboard_HASH "97814ec5a5ae35bb2adb41c78fd82f23f2e683b02508cfcc34e8f3808f843b0e3aee4d37440158c588ae038d1427b4864062eed18bfb520a3099da36b1b51025") -set(qtcharts_HASH "3171d8a2f9423cd71ee0331d222143b36e72e154214984c1315e0e689387d478eeea097f4189535b5697ba978aec3e7f45ed9decacada56f47cef5fcfd6baa3b") -set(qtconnectivity_HASH "5591a7b4140e9580186b20bf8b3c75f07f8d22f48910ca017f8ab7609a4438297bdb0e9f04cc31ebc238bfd58d85b6e980938e2014b4106f48034fda6294df96") -set(qtpositioning_HASH "8deff5eb12ccd5bd0187788834a18c0f41338abcca2f0e918645f25524a3364510fecade316a4d36a735aa0e205e62f754810e38f91abf47f929981d3805024f") -set(qtlocation_HASH "25b1154608bad6e41556b64d098653157a1b4cd8ee2443af284d93bff4828bb4e5af737933b26d03c05e420837e884555e7676d91ffcf47269b01dc1e744ba49") -set(qtmultimedia_HASH "8b246af98d643699017713614e441068e5adea8b825be2776934716875b04a4fdb5ff48984ad9b63cc10c78d57dc653b00d9648c00236f4755840da911d5845e") -set(qtremoteobjects_HASH "252497afb67941ad16cac84af4e302ce859ab7f28550ee0991a3ddcfe3e9731468b33f4f64ffc61b7aa24f9980bdb8ea8c788c6523bdc6d03c6c37a0dd8362ab") -set(qtsensors_HASH "04e960ca2b129886aab3e32b782f6f512cc79df58bf7fd127839760f628ae8301d7aa3ab60b99e35cba06cbbf3c650e2315633c602de9c80c5f4ff4c5afa477e") -set(qtserialbus_HASH "b99c2c64285c7f5f3bb7dc2128a2bac2dd3a8c50b32574377865fe8ddf0e91bf4dbbae813c1414a6bf0db57d01dd6ccc8f064bc896e382137de1821e31f1cfa4") -set(qtserialport_HASH "ad6ff79082566303b8e08590e7cc7d23efae6945d37b445d04f16b9002828cf9981b7abf2c28a806a68a8ee56580e4dc761852a06b2235174e1c28b6f4afc695") -set(qtwebchannel_HASH "acc7b1394c35c604ac0921e2276fab465e27723f71b39bb4125e74142da656cfcce31e0ac1f867ed756214d2b38c72739fbb5e7a5043811a4e03e5b912e8f099") -set(qtwebengine_HASH "fa1c5219973570ef1644d9bd5b12728056983b15002d08acfc9d76465b9055c3ac01be1f6a4ce4112b896988a4714000cf5353804cdf1af2b803bca962416ca5") -set(qtwebsockets_HASH "ddad63a748d35749b46aa87f918667c4eda4323981c36f9ba2b150df9f9cbfd22ce85f93a03e89979c35e3ee27b6585ef4ac75b2ee1b1ab8dfe786d9c1d26152") -set(qtwebview_HASH "b7ee827d21af10831ba08b41051d2cd525bc80ad887a935a2a1fc339d52dacc96721607a864fdb5e3784dacbf9c8305acda6c60e1b1fa2ec4565c883b0b29f1b") -set(qtinterfaceframework_REF "6aa51ce241c202f30a5850ae989e6cea33a82aba") -set(qtapplicationmanager_HASH "b7bb6b0c19a2b2f6f817a01e6fac690b52156cf30ac47bcd685de5018f4b8b21e9b664b03f28f38b064c97b05c2e0df75390ba9e55eab80a5668b0fa13d43923") -set(qtlanguageserver_HASH "32213a518e4f16ce048d1e67d17d0617bb2eaa4f92432bf9b49ff6f818dbd14ef6137be7dc186ab1721cf18db21fa1da0a5e93c2e5907ec172780e7cd92296a3") -set(qthttpserver_HASH "2171bf20a2bd72c0b1404f2f34a4f027e25c8daf4c9a1f1d5ecefa41d128de029bbbbf8a74474605bd23c03b79fd78d810c68ce82ffffb849f952f41a4aa1b88") -set(qtquick3dphysics_HASH "33dd887d2511ec30e0db650c1dcf9ca9b35dcd82aa16c34f0c7324bcae9ee2da93d17541316da0ec2c1d13cbfe9e175592508b39538c9d7c3b30846b66afd7d3") -set(qtspeech_HASH "6384208edb5e1350ff8119a8c4e79101a41c605b8c77220db04a683602a996c582516b2cd31d36c72821b5628e4255fe88c80c5976979d49d73461a4b1fcecd4") -set(qtgrpc_HASH "a84d0cc125e6e57e2675388bf5c7c7efa15d15560db815dc92fe3253b896ecc1a5a7b5340dee135779387d445839da6a1409fa4d0e60a93ef8472fd5882b9e81") -set(qtquickeffectmaker_HASH "13c723cb577e6c343251b0f0c2e143feb1bf0286dbb938c6fd07b9f0806348af2a2563d27dbf703e00b92bb4095a6987a565b307925483ca9d6d1f8e7966bcc7") -set(qtgraphs_HASH "7a2ca552a296ac700cf92a03cb3e1edda678882147b64e858409aa5bbe440b6d7e969c7c68b7364dfa824f167492446c6933dc818decf16692d41359e2782641") - - -# Keep for beta/rc -#set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e) -#set(qtwebengine_chromium_REF 0b138dc30d0aec7930c76a2595065629948ad9f7) +set(qtbase_HASH "3fab05fd17165b5e4501236f736c2b4c8d28929e17ce19de614851ae69adad88d621360c441d1ff2954ab24dee0d461d948cf699bc1c58f4b766ca8379de651e") +set(qttools_HASH "95f2e666accbb474d2a7bb0ac88b4fb006e14a419301272fdb1f168b79e9437cad224b678298a355faba243853e9314c5f2b5e5192e56f4772a373e41d74dce0") +set(qtdeclarative_HASH "75ec507c7c55089d91415f8365aef97456692dd563ac55571f73f1e5ace81e38a5515589b40a4e144790f9ab6ce4ed6150b26a79b62afc1bd6bad85d00306d1d") +set(qtsvg_HASH "f8439aff22976a1a76ebccba87478f7546c6b496efd4f4f2e20c868fa8073dad0360dc5a5056c433b40c1ad6d09fdc08bc6d8041593b5d821f6607c4dc8b9376") +set(qt5compat_HASH "281e60fdc9559279fb249d80fd04ea52282db9db402cc81365acafea1d87e96923bfb5a9607163182736a9ca30618da5578cce7271083c08692e95396bbf307c") +set(qtshadertools_HASH "3f35146868d7908ca5144858275250f27ba56910103ea1f86797d3a12e6dd71870dea34d1959ba6d1b3a523a09814abc5a113d4f495dd06f072858602aaae29a") +set(qtquicktimeline_HASH "81f76a57032ac5361f0d871a0f19af8b1c9103da1bbc79dbe8029b5e1835bc7e32e2a2566c42fd90a3a8a089d9b6227de29bfd80fa743589fbd8acdd5ae3ff84") +set(qtquick3d_HASH "83db833d7446a7f7bd4e4b6d2973ba2e85f4d9f05b2d8c4957ff12fb03920ff01a74d825f806feeb4c768db3bc46c50847ce68097f4952745c02b7dd690f0101") +set(qttranslations_HASH "7d742bd63287d1ac45f022c5e377f264e37f868e1e51f878cc0fb97a7e3dd0c80b398c46762dd72f0d46721a172a4a92a6c55d0f87e0d38eacb221d7fe2792f5") +set(qtwayland_HASH "b53f96a3b94265241fb73a35b8b4db6934cbfea3fb7b7611f34cad8490a4eff952e66044b95f56a15f398e851a9da8553dcad5a63dfeac0c99c6e8c171260a9a") +set(qtdoc_HASH "678ba644bdb1e37ec34b33ed9f7ce09991fe154c412e62e631f301dacbba2df04fd9c3150dcfea18d39505ad36a97fbf6d026ff6b5496959f35eec396282e2c2") +set(qtcoap_HASH "544a4ca6a8ada5a9bfb51a5849e9291e52499d846ababd6d1ce5ae0c411a9b4d3d8c41f810885756ee1981a309f1c7cfe5e99f46f3e08c38f289a750cfef161d") +set(qtopcua_HASH "2aa48c7adaf3d6a3df781b96bd632e21ac257bd8779275388e783d5f1f057f9d3e1137b60eae1fa3a41b3b3489cc8e99b3d7b38354146fdb513771b9e5ec0a5b") +set(qtimageformats_HASH "8b8eb9b85d42dc9c07f5652748a4a83181c4be7cce1b1de9e18af92a34a13b47a2094c98794cc7aaf65f3f9470e5481f0b32186055b9636e63389ec507f8a914") +set(qtmqtt_HASH "cb35f5df8f4a3a7c6f66b52ebbdab34acd61dc7273b6b3999706ed186064250b2d6ff17502c577c7d682c928d1e8e136ea4d4e651379f8f37b811da7eb9828d1") +set(qtnetworkauth_HASH "ee6c54314dc390ed453081afdce317eedaab097873bd6606b1f7452cbeba518c27111f99ac8ef61e1a0819f7aa3cd3100397409c3cc76cbbe7164d7a19b67ba9") +set(qt3d_HASH "f0ffceb7185b16ffcf6e757007b6b500e111285dcbb90a85c1a6e9c4400451688f3d631a25d95ab36838dfdea40b4c5557a9c6d67aab11d2f66e7d4dc86ef4b5") +set(qtactiveqt_HASH "d17f62c17e7f71f5b473598276a77efcc9efcecd6a3eabfef9494d40fb6248c40278b543309f924455c8e26ee68e78a51731cefbdc70b1e6fd2e594166a75a2e") +set(qtdatavis3d_HASH "2d8042db3589d571d4851820791bb6dfd4f283baffd33f99ed322a471fdc319d64eeb3dac1e36bb2fdeb1957116edd23bbf6e3c51a8e041a00a9a1d13ca8a645") +set(qtdeviceutilities_HASH "304c06dd719e96421dfc48f07eb2d0676d2427a2d4a00878523644e84d8c614e375fdbadd390444a7cf9560809462347ad75461b62850ecb95f6a93fbfe25182") +set(qtlottie_HASH "efb584f842cf93927b9eee61c35743e127b79c3249d0ded95e97b220f6a3585f2d541eca89250e959a91c9dca29cca194922f2866ed47d47d726341249c58fdc") +set(qtscxml_HASH "3c21424f1941ea5e9e0a217149cb9bdd7b3ba729f40e506f2debde4aeaa314e214979436d38ac5c4b423e2a9fee5261a75df5fdc66731c911ae653a4d784e4ff") +set(qtvirtualkeyboard_HASH "0e7bdcaa3b37499f7160c12ad7b178365b1b246a77fed6ae1903eefab4dfb09758305893a62496d515c0a762beb7602cdf73cc01a5ecbd01d47c4bfbe01a3835") +set(qtcharts_HASH "d2c7f068e60c47e337c8814a90bc63094227fe263562c33bfd802e8239da6cd184d49e0bfbff44fd92799988673c8d218d7add4e624bfba88d3c96cef641421b") +set(qtconnectivity_HASH "94df6d32404121f6d3763fc32f83430e135f4be9198ac03008c9743f82f3c8c8008b3563d87c823f723a830bb76021d1c30b7804b60bb5ad533291c0605c86dc") +set(qtpositioning_HASH "ab9fdb39e7e564b5b9c6a07ddfa024830b3721d5ad697da313ec48c743ec990d29d3e7e7d66e77e8c9589c653b222aefb7c639bf0547f94927083322daff5333") +set(qtlocation_HASH "7e1d40249798200e4a938277e1cab02ab07a08a4f28db11abdee3f8d9d6a33f536ab3b0ec1e67d8e99287fe247235c99aa9c4169f98419e40a308fd432d43924") +set(qtmultimedia_HASH "58cb438247cc5230d72775cf30311b346f097c2946c63b47c8aea9d4a8ca6599940dff93744f7cf3652340793a1a418dd1e86b61f7a786b7764d50b04396e8a8") +set(qtremoteobjects_HASH "bdc79b2ab7dc8971c856f0b0332a3d4c0a4ecf047b25516377150a4b237eec32e22c3a21a07d2ce453ec2f8c6ee9a5f6ce075d3d506c834998e6f72d8a625c74") +set(qtsensors_HASH "c5045f5a05f1ceacbd4e9476a6f3d654b9970100de67a47574d807a8df3ddb09f6d2227c81da4d2408ab0ccde08fd315b5655982bca7f2cffebe279fa84b5485") +set(qtserialbus_HASH "8dd814c2f755318492c15adb2fb03012028e5ae870eebe405b0d8ea71796dc43793223e4e37d6479fe49c9e30b03daff0f89e4f69f806669f1f54c03c9e11e45") +set(qtserialport_HASH "40effe49c63c706408d87bc8d95912a12a4dce296779a0e8c49aaaa9bda5c37b34ba6b62f28f61e1b5865d9653301edfe9f3bf5b48977dcd117dfe3d72ea5226") +set(qtwebchannel_HASH "d5bb5c4848622318ca521a548a7bd5617d7ddb677b1e1b20ea1f94775c156cf99f148e4032dac70a388c35c65a073a0529927deeb78f200572c117c0a91c63a9") +set(qtwebengine_HASH "bcb5899170051e6e7f51e95a0a175f99eae26db393d674e8d1670e895ea75d2a7adda647c3ce1ff213c02a92062d164ddff6774f7d872e0762accedc28272e27") +set(qtwebsockets_HASH "28b798f412afd45b99a06cf388cbf79ed424b2facfb88bac8367e8c99f5c42e3c7ea0adbc41be9a1217cf68680a12e4df5db02812167c7296919dcac5e007d46") +set(qtwebview_HASH "7806e93b32787529c6149784a75d956218734a9768cd32fda058351cb5d77e590d48f5c5beae23d81e1eef85e8f96b86fde31056a988e5932b38800609cea6ae") +set(qtinterfaceframework_REF d7f7b3e722070d056dff0ea098bda3d098dc991a) +set(qtapplicationmanager_HASH "0dcbf8fc475959e52db79147e640dd03dde1639f61a781326dfbffacf6d7aab98dfacfe1c91118b13de80be5f47691c739493ae66bd73498f5597b29945433fe") +set(qtlanguageserver_HASH "d13807e618d39fbc9ed6234310f4a47ecb4fcceeb215b3a29e6e3ade7033a334a8a0e6de4690a0a938cbb71db0c0eaca00fb408e1b0205d218cc98497bb52e88") +set(qthttpserver_HASH "958a424878f2d6fe8e950eb093c0f4d54fcfe2b08e48962c6b72b7546d524e0a266118357c609ebb687fef8c4f4c1ee32eac75218c13cb1442be6cc5f747327c") +set(qtquick3dphysics_HASH "6800df1ed990784919b40ec2659c86c3dd8ea1a0c53840b0b797ba517e62045346fc0430b504e099364e93e9b560ac669ac312f312dc7aab8161908ce46582fd") +set(qtspeech_HASH "68116bf2a91a72167a33ead0b5daca89514092bf6411035cc4667610bc256af0aa34af1132f09703f674ae09050a08e5e05f47ef089d41bf4a16782dbc489b68") +set(qtgrpc_HASH "90ae5e82e05b76f0436f61264f8bb0a9834f22458820db68fd67f5278b5d0d40bf3bbe1cdb4a1af0c4cae6e748503abfa1d0ce3b8846c251cc33e693d2a395eb") +set(qtquickeffectmaker_HASH "073ea2ced674af395cbf1552030e82053afa273242b51067a4cd797cd200addcdb397a9d3d85d06dd5ea1675f0f4b9cbaaefbfde0f631be436d133d9eaa3996c") +set(qtgraphs_HASH "bba07dbda24a9a6e591ee6060a1eb3ea46295afe7af89c390805c1254522f93098b37628671e257327194733fad99d69df3bdbecedac1bbfc7b0083a9466f41b") diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 5e1bfc70ba7e64..1b3bab55c21589 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.9.1) +set(QT_VERSION 6.9.2) set(QT_DEV_BRANCH 0) set(QT_UPDATE_VERSION 0) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index c001b85d7b15bc..d1ce165432df34 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtbase", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt Base (Core, Gui, Widgets, Network, ...)", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index de9d7ece082365..8175b538bc192a 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Charts module provides a set of easy-to-use chart components. It uses the Qt Graphics View Framework to integrate charts with modern user interfaces.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index a02ff3ea778601..09b5aa09710d1c 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt CoAP implements the client side of CoAP.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtconnectivity/vcpkg.json b/ports/qtconnectivity/vcpkg.json index 054a8dd4bf038a..1534b1f3330504 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Connectivity module provides access to Bluetooth and NFC hardware.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 5e24a451752a34..ff158f2ea52ffb 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Data Visualization module enables you to visualize data in 3D as bar, scatter, and surface graphs.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index c89b2c4e50963c..18b1049af73ee2 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.9.1", + "version": "6.9.2", "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 817efd9fc6a150..3becfacd282fd1 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt Device Utilities provides functionality that is useful for controlling settings in embedded applications.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 1cad9e78a71ee1..6000ea79f6117d 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt documentation.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtgraphs/vcpkg.json b/ports/qtgraphs/vcpkg.json index 06f4beb1d03a11..f43db8d039ef1a 100644 --- a/ports/qtgraphs/vcpkg.json +++ b/ports/qtgraphs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtgraphs", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Graphs module enables you to visualize data in 3D as bar, scatter, and surface graphs.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtgrpc/vcpkg.json b/ports/qtgrpc/vcpkg.json index 4842826425b638..106436e1df02d3 100644 --- a/ports/qtgrpc/vcpkg.json +++ b/ports/qtgrpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtgrpc", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt GRPC and Qt Protobuf modules together allow you to define data and messages in proto files, and then use the code generators, which generate client code allowing accessors for fields and gRPC services in the Qt framework.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qthttpserver/vcpkg.json b/ports/qthttpserver/vcpkg.json index 5f7def1e0ad032..2b9afaafd12f70 100644 --- a/ports/qthttpserver/vcpkg.json +++ b/ports/qthttpserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qthttpserver", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt HTTP Server supports building HTTP server functionality into an application.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index c3b201a323e692..686220a01305ff 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Image Formats add-on module provides optional support for other image file formats.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index c3eb4729dd29c3..f3ff6ac7291bbf 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Interface Framework module provides both the tools and the core APIs, for you to implement Middleware APIs, Middleware Back ends, and Middleware Services.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlanguageserver/vcpkg.json b/ports/qtlanguageserver/vcpkg.json index 69e1b461a25269..5c2dd460fa889f 100644 --- a/ports/qtlanguageserver/vcpkg.json +++ b/ports/qtlanguageserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlanguageserver", - "version": "6.9.1", + "version": "6.9.2", "description": "An implementation of the Language Server Protocol.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlocation/vcpkg.json b/ports/qtlocation/vcpkg.json index 4b899de2226024..efae74f97afade 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Location API helps you create viable mapping solutions using the data available from some of the popular location services.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index e26073162bb9ad..0298eabb0cc261 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.9.1", + "version": "6.9.2", "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 4ee7cedab8cc83..cecf60ea3be54e 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt MQTT module provides a standard compliant implementation of the MQTT protocol specification.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmultimedia/9c33ede.diff b/ports/qtmultimedia/9c33ede.diff deleted file mode 100644 index e257621e1b8a7b..00000000000000 --- a/ports/qtmultimedia/9c33ede.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/multimedia/windows/qwindowsaudiosink.cpp b/src/multimedia/windows/qwindowsaudiosink.cpp -index 157172c..2ba6319 100644 ---- a/src/multimedia/windows/qwindowsaudiosink.cpp -+++ b/src/multimedia/windows/qwindowsaudiosink.cpp -@@ -285,7 +285,7 @@ - } - - uint32_t requiredDataSize = m_format.bytesForFrames(requiredFrames); -- auto hostBufferSpan = as_writable_bytes(QSpan{ hostBuffer, requiredDataSize }); -+ auto hostBufferSpan = as_writable_bytes(QSpan{ hostBuffer, qsizetype(requiredDataSize) }); - uint64_t consumedFrames = QPlatformAudioSinkStream::process(hostBufferSpan, requiredFrames); - - DWORD flags = consumedFrames != 0 ? 0 : AUDCLNT_BUFFERFLAGS_SILENT; diff --git a/ports/qtmultimedia/ffmpeg-compile-def.patch b/ports/qtmultimedia/ffmpeg-compile-def.patch index 95e531510fec9a..436bcc1a42b7ab 100644 --- a/ports/qtmultimedia/ffmpeg-compile-def.patch +++ b/ports/qtmultimedia/ffmpeg-compile-def.patch @@ -1,13 +1,13 @@ diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt -index 77c459a..af5229e 100644 +index cc09fa8d4..836dc50bd 100644 --- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt +++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt -@@ -273,7 +273,7 @@ if(BUILD_SHARED_LIBS) - else() +@@ -285,7 +285,7 @@ else() + # applications need to link against the ffmpeg libs via qt_add_ios_ffmpeg_libraries foreach(ffmpeg_lib IN LISTS ffmpeg_libs) qt_internal_add_target_include_dirs(FFmpegMediaPluginImplPrivate ${ffmpeg_lib}) - target_include_directories(FFmpegMediaPluginImplPrivate PUBLIC -+ target_compile_definitions(FFmpegMediaPluginImplPrivate PUBLIC ++ target_compile_directories(FFmpegMediaPluginImplPrivate PUBLIC "$") endforeach() endif() diff --git a/ports/qtmultimedia/ffmpeg.patch b/ports/qtmultimedia/ffmpeg.patch index 7877d17cdaa1b7..6aec394de32317 100644 --- a/ports/qtmultimedia/ffmpeg.patch +++ b/ports/qtmultimedia/ffmpeg.patch @@ -1,26 +1,33 @@ diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake -index 0aa3ff9..b651472 100644 +index decac97dc..672991080 100644 --- a/cmake/FindFFmpeg.cmake +++ b/cmake/FindFFmpeg.cmake -@@ -287,13 +287,15 @@ function(__ffmpeg_internal_set_dependencies _component) - set(prefix_l "(^| )\\-l") +@@ -282,10 +282,10 @@ function(__ffmpeg_internal_set_dependencies _component) set(suffix_lib "\\.lib($| )") + set(framework_regex "-framework [A-Za-z0-9_]*") - string(REGEX REPLACE ".*Libs:([^\n\r]+).*" "\\1" out "${pcfile}") -+ string(REGEX MATCH "Libs:([^\n\r]+)" match "${pcfile}") -+ set(out "${CMAKE_MATCH_1}") - string(REGEX MATCHALL "${prefix_l}[^ ]+" libs_dependency ${out}) - string(REGEX MATCHALL "[^ ]+${suffix_lib}" libs_dependency_lib ${out}) +- string(REGEX MATCHALL "${framework_regex}" framework_dependencies ${out}) ++ string(REGEX MATCH "Libs:([^\n\r]+)" match "${pcfile}") ++ set(out "${CMAKE_MATCH_1}") + string(REGEX MATCHALL "${prefix_l}[^ ]+" libs_dependency "${out}") + string(REGEX MATCHALL "[^ ]+${suffix_lib}" libs_dependency_lib "${out}") + foreach(dependency IN LISTS libs_dependency) + string(REGEX REPLACE ${prefix_l} "" dependency ${dependency}) +@@ -298,9 +298,10 @@ function(__ffmpeg_internal_set_dependencies _component) + endforeach() + + # we don't link private dependencies, but just populate the FFMPEG_STUBS - string(REGEX REPLACE ".*Libs.private:([^\n\r]+).*" "\\1" out "${pcfile}") -+ string(REGEX MATCH "Libs.private:([^\n\r]+)" match "${pcfile}") -+ set(out "${CMAKE_MATCH_1}") - string(REGEX MATCHALL "${prefix_l}[^ ]+" libs_private_dependency ${out}) - string(REGEX MATCHALL "[^ ]+${suffix_lib}" libs_private_dependency_lib ${out}) ++ string(REGEX MATCH "Libs.private:([^\n\r]+)" match "${pcfile}") ++ set(out "${CMAKE_MATCH_1}") + string(REGEX MATCHALL "${prefix_l}[^ ]+" libs_private_dependency "${out}") + string(REGEX MATCHALL "[^ ]+${suffix_lib}" libs_private_dependency_lib "${out}") - list(APPEND deps_no_suffix ${libs_dependency} ${libs_private_dependency}) - foreach(dependency ${deps_no_suffix}) + foreach(dependency IN LISTS libs_private_dependency) + string(REGEX REPLACE ${prefix_l} "" dependency ${dependency}) diff --git a/ports/qtmultimedia/fix_avfoundation_target.patch b/ports/qtmultimedia/fix_avfoundation_target.patch deleted file mode 100644 index 849f011fba7bd6..00000000000000 --- a/ports/qtmultimedia/fix_avfoundation_target.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/plugins/multimedia/darwin/CMakeLists.txt b/src/plugins/multimedia/darwin/CMakeLists.txt -index a1a0cb1..242ceac 100644 ---- a/src/plugins/multimedia/darwin/CMakeLists.txt -+++ b/src/plugins/multimedia/darwin/CMakeLists.txt -@@ -34,6 +34,6 @@ qt_internal_add_plugin(QDarwinMediaPlugin - ${FWMetal} - ${FWQuartzCore} -- AVFoundation::AVFoundation -+ ${FWAVFoundation} - ) - - qt_internal_extend_target(QDarwinMediaPlugin CONDITION NOT TVOS AND NOT VISIONOS diff --git a/ports/qtmultimedia/fix_qwmf_support_p_type_issue.patch b/ports/qtmultimedia/fix_qwmf_support_p_type_issue.patch new file mode 100644 index 00000000000000..e42abd0de3989e --- /dev/null +++ b/ports/qtmultimedia/fix_qwmf_support_p_type_issue.patch @@ -0,0 +1,13 @@ +diff --git a/src/multimedia/windows/qwmf_support_p.h b/src/multimedia/windows/qwmf_support_p.h +index a3f69462b..3124a5b9c 100644 +--- a/src/multimedia/windows/qwmf_support_p.h ++++ b/src/multimedia/windows/qwmf_support_p.h +@@ -60,7 +60,7 @@ auto withLockedBuffer(IMFMediaBuffer *buffer, Functor &&f) + f(QSpan{ data, currentLength }, QSpan{ data, maxLength }); + return {}; + } else +- return f(QSpan{ data, currentLength }, QSpan{ data, maxLength }); ++ return f(QSpan{ data, qsizetype(currentLength) }, QSpan{ data, qsizetype(maxLength) }); + } + + template diff --git a/ports/qtmultimedia/portfile.cmake b/ports/qtmultimedia/portfile.cmake index 95d630e00303ed..dac96b9a8f3e28 100644 --- a/ports/qtmultimedia/portfile.cmake +++ b/ports/qtmultimedia/portfile.cmake @@ -3,11 +3,10 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES static_find_modules.patch - fix_avfoundation_target.patch remove-static-ssl-stub.patch ffmpeg-compile-def.patch ffmpeg.patch - 9c33ede.diff + fix_qwmf_support_p_type_issue.patch ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/qtmultimedia/static_find_modules.patch b/ports/qtmultimedia/static_find_modules.patch index 1fc348de649bf5..a0bf165d23e480 100644 --- a/ports/qtmultimedia/static_find_modules.patch +++ b/ports/qtmultimedia/static_find_modules.patch @@ -1,67 +1,8 @@ -diff --git a/cmake/FindFFmpeg.cmake b/cmake/FindFFmpeg.cmake -index 47d8769..46a5c9b 100644 ---- a/cmake/FindFFmpeg.cmake -+++ b/cmake/FindFFmpeg.cmake -@@ -215,7 +215,7 @@ foreach (_component ${FFmpeg_FIND_COMPONENTS}) - find_component(${_component} "lib${library}" ${library} "lib${library}/${library}.h") - - if (${_component}_FOUND) -- list(APPEND FFMPEG_LIBRARIES ${${_component}_LIBRARY_NAME}) -+ list(APPEND FFMPEG_LIBRARIES ${${_component}_LIBRARY}) - list(APPEND FFMPEG_DEFINITIONS ${${_component}_DEFINITIONS}) - list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIR}) - list(APPEND FFMPEG_LIBRARY_DIRS ${${_component}_LIBRARY_DIR}) -@@ -306,18 +306,19 @@ endfunction() - string(TOLOWER ${_component} _lowerComponent) - if (NOT TARGET FFmpeg::${_lowerComponent}) -- add_library(FFmpeg::${_lowerComponent} INTERFACE IMPORTED) -+ add_library(FFmpeg::${_lowerComponent} UNKNOWN IMPORTED) - set_target_properties(FFmpeg::${_lowerComponent} PROPERTIES - INTERFACE_COMPILE_OPTIONS "${${_component}_DEFINITIONS}" - INTERFACE_INCLUDE_DIRECTORIES ${${_component}_INCLUDE_DIR} -- INTERFACE_LINK_LIBRARIES "${${_component}_LIBRARY_NAME}" -- INTERFACE_LINK_DIRECTORIES "${${_component}_LIBRARY_DIR}" -+ IMPORTED_LOCATION "${${_component}_LIBRARY}" - ) - - __ffmpeg_internal_set_dependencies(${_component}) -- target_link_libraries(FFmpeg::${_lowerComponent} INTERFACE "${${_component}_LIBRARY_NAME}") -+ if(WIN32 AND _lowerComponent STREQUAL "avutil") -+ target_link_libraries(FFmpeg::${_lowerComponent} INTERFACE "Bcrypt.lib") -+ endif() - if (UNIX AND NOT APPLE) - target_link_options(FFmpeg::${_lowerComponent} INTERFACE "-Wl,--exclude-libs=lib${_lowerComponent}") - endif () - endif() - endif() - endforeach () -@@ -361,14 +364,18 @@ if (shared_libs_desired AND NOT FFMPEG_SHARED_COMPONENTS) - endif() - - if (NOT TARGET FFmpeg::FFmpeg) -- add_library(FFmpeg INTERFACE) -+ add_library(FFmpeg INTERFACE IMPORTED) - set_target_properties(FFmpeg PROPERTIES - INTERFACE_COMPILE_OPTIONS "${FFMPEG_DEFINITIONS}" - INTERFACE_INCLUDE_DIRECTORIES "${FFMPEG_INCLUDE_DIRS}" -- INTERFACE_LINK_LIBRARIES "${FFMPEG_LIBRARIES}" - INTERFACE_LINK_DIRECTORIES "${FFMPEG_LIBRARY_DIRS}" - ) -+ target_link_libraries(FFmpeg INTERFACE ${FFMPEG_LIBRARIES}) -- add_library(FFmpeg::FFmpeg ALIAS FFmpeg) -+ if(WIN32) -+ target_link_libraries(FFmpeg INTERFACE "Bcrypt.lib") -+ endif() -+ add_library(FFmpeg::FFmpeg INTERFACE IMPORTED) -+ target_link_libraries(FFmpeg::FFmpeg INTERFACE FFmpeg) - endif() - - # Compile the list of required vars diff --git a/cmake/FindGObject.cmake b/cmake/FindGObject.cmake -index 19a8a67..09e95d1 100644 +index 89a02435a..0774dfb68 100644 --- a/cmake/FindGObject.cmake +++ b/cmake/FindGObject.cmake -@@ -13,8 +13,8 @@ +@@ -16,8 +16,8 @@ # ``GObject::GObject`` # The gobject-2.0 library @@ -72,7 +13,7 @@ index 19a8a67..09e95d1 100644 qt_internal_disable_find_package_global_promotion(GLIB2::GLIB2) if(NOT TARGET GObject::GObject) -@@ -40,6 +40,7 @@ if(NOT TARGET GObject::GObject) +@@ -43,6 +43,7 @@ if(NOT TARGET GObject::GObject) target_link_libraries(GObject::GObject INTERFACE ${GObject_LIBRARY} GLIB2::GLIB2 diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index c289fb5aaf3a63..58e7b78b7e42ec 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmultimedia", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt Multimedia is an add-on module that provides a rich set of QML types and C++ classes to handle multimedia content.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 7d52c8553ce810..b9be0e81b2bed9 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt Network Authorization provides a set of APIs that enable Qt applications to obtain limited access to online accounts and HTTP services without exposing users' passwords.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 9f24549440343e..98087919f7f11e 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt OPC UA module implements a Qt API to interact with OPC UA on top of a 3rd party OPC UA stack.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index dfe3ab1c4d8eb9..824601cf3e5033 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Positioning API provides positioning information via QML and C++ interfaces.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3d/0001-devendor-meshoptimizer.patch b/ports/qtquick3d/0001-devendor-meshoptimizer.patch index 094bed6f223ea8..20f3041a2b4280 100644 --- a/ports/qtquick3d/0001-devendor-meshoptimizer.patch +++ b/ports/qtquick3d/0001-devendor-meshoptimizer.patch @@ -1,5 +1,5 @@ diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt -index 78ad8af..bee1ca6 100644 +index 515fa0f51..16df533fe 100644 --- a/src/utils/CMakeLists.txt +++ b/src/utils/CMakeLists.txt @@ -7,6 +7,8 @@ @@ -11,7 +11,7 @@ index 78ad8af..bee1ca6 100644 qt_internal_add_module(Quick3DUtils SOURCES qqsbcollection.cpp qqsbcollection_p.h -@@ -26,49 +28,17 @@ qt_internal_add_module(Quick3DUtils +@@ -26,53 +28,17 @@ qt_internal_add_module(Quick3DUtils qquick3dprofiler_p.h ../3rdparty/xatlas/xatlas.cpp ../3rdparty/xatlas/xatlas.h qssglightmapuvgenerator.cpp qssglightmapuvgenerator_p.h @@ -31,6 +31,8 @@ index 78ad8af..bee1ca6 100644 - ../3rdparty/meshoptimizer/src/vertexfilter.cpp - ../3rdparty/meshoptimizer/src/vfetchanalyzer.cpp - ../3rdparty/meshoptimizer/src/vfetchoptimizer.cpp +- ../3rdparty/meshoptimizer/src/partition.cpp +- ../3rdparty/meshoptimizer/src/quantization.cpp NO_UNITY_BUILD_SOURCES ../3rdparty/xatlas/xatlas.cpp ../3rdparty/xatlas/xatlas.h - ../3rdparty/meshoptimizer/src/allocator.cpp @@ -49,6 +51,8 @@ index 78ad8af..bee1ca6 100644 - ../3rdparty/meshoptimizer/src/vertexfilter.cpp - ../3rdparty/meshoptimizer/src/vfetchanalyzer.cpp - ../3rdparty/meshoptimizer/src/vfetchoptimizer.cpp +- ../3rdparty/meshoptimizer/src/partition.cpp +- ../3rdparty/meshoptimizer/src/quantization.cpp DEFINES QT_BUILD_QUICK3DUTILS_LIB INCLUDE_DIRECTORIES diff --git a/ports/qtquick3d/portfile.cmake b/ports/qtquick3d/portfile.cmake index 9a55f5f095367d..06f18bb06bc117 100644 --- a/ports/qtquick3d/portfile.cmake +++ b/ports/qtquick3d/portfile.cmake @@ -17,7 +17,7 @@ INVERTED_FEATURES ) if("assimp" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=system -DTEST_quick3d_assimp=ON -DHAVE_Assimp=ON) + list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=system -DTEST_quick3d_assimp=ON) else() list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=no) endif() diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index afb2cb976b4327..56a6e0368b83b4 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt Quick 3D provides a high-level API for creating 3D content and 3D user interfaces based on Qt Quick.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquick3dphysics/vcpkg.json b/ports/qtquick3dphysics/vcpkg.json index 727188b3cdd133..d9a5c456acd57f 100644 --- a/ports/qtquick3dphysics/vcpkg.json +++ b/ports/qtquick3dphysics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3dphysics", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt Quick 3D Physics provides a high-level API for physics simulation.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquickeffectmaker/vcpkg.json b/ports/qtquickeffectmaker/vcpkg.json index cbadcc83417a61..7e9ad9ab07a2e0 100644 --- a/ports/qtquickeffectmaker/vcpkg.json +++ b/ports/qtquickeffectmaker/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquickeffectmaker", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt Quick Effect Maker is a tool for creating shader effects for Qt Quick with high productivity and performance.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index e07bccd27dc72e..d83a465f66c54b 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Quick Timeline module enables keyframe-based animations and parameterization.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtremoteobjects/vcpkg.json b/ports/qtremoteobjects/vcpkg.json index c5de4d6c083c31..343ba868e11ea2 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt Remote Objects (QtRO) is an Inter-Process Communication (IPC) module developed for Qt. This module extends Qt's existing functionalities to enable information exchange between processes or computers, easily.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index 834c995df430dc..bce0ae2bd0c130 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt SCXML module provides functionality to create state machines from SCXML files.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsensors/vcpkg.json b/ports/qtsensors/vcpkg.json index fbb9e31b5b5566..8b3e61c2dbfa95 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Sensors API provides access to sensor hardware via QML and C++ interfaces. The Qt Sensors API also provides a motion gesture recognition API for devices.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialbus/vcpkg.json b/ports/qtserialbus/vcpkg.json index d60a1724392d16..b7e284953dcd0f 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Serial Bus API provides classes and functions to access the various industrial serial buses and protocols, such as CAN, ModBus, and others.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtserialport/vcpkg.json b/ports/qtserialport/vcpkg.json index dfd80637593ae2..634c42d2491435 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt Serial Port provides basic functionality for configuration, I/O operations, and getting and setting the control signals of the RS-232 pinouts.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 41765b7b8adb59..0e709221592f65 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Shader Tools module is designed to provide a set of tools and utilities to work with graphics shaders.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtspeech/vcpkg.json b/ports/qtspeech/vcpkg.json index c6aa918c12d43b..3cb3fa599ee98e 100644 --- a/ports/qtspeech/vcpkg.json +++ b/ports/qtspeech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtspeech", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Speech module enables a Qt application to support accessibility features such as text-to-speech, which is useful for end-users who are visually challenged or cannot access the application for whatever reason.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 449377b80d8356..34c8c5c3c25f67 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt SVG provides classes for rendering and displaying SVG drawings in widgets and on other paint devices.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 5554d24202bb8d..cf2942460fc27c 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version": "6.9.1", + "version": "6.9.2", "description": "A collection of tools and utilities that come with the Qt framework to assist developers in the creation, management, and deployment of Qt applications.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 2521eea50736e3..b9b5af3e7059e6 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt translations.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index 4a903c1a548628..188a9d680bee93 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend for Qt 6 on Linux Desktop/X11, Windows Desktop, and Boot2Qt targets.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index 73afedf0eb1570..67e4aff0d91bc3 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.9.1", + "version": "6.9.2", "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 89fc682962cf90..4f97de98bfd26a 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt WebChannel enables peer-to-peer communication between a server (QML/C++ application) and a client (HTML/JavaScript or QML application).", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebengine/nested-name-fix.patch b/ports/qtwebengine/nested-name-fix.patch deleted file mode 100644 index 3f25409600c49d..00000000000000 --- a/ports/qtwebengine/nested-name-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/3rdparty/chromium/v8/src/heap/cppgc/marking-state.h b/src/3rdparty/chromium/v8/src/heap/cppgc/marking-state.h -index 4ce1ce4..2207466 100644 ---- a/src/3rdparty/chromium/v8/src/heap/cppgc/marking-state.h -+++ b/src/3rdparty/chromium/v8/src/heap/cppgc/marking-state.h -@@ -342,7 +342,7 @@ class MutatorMarkingState final : public BasicMarkingState { - ~MutatorMarkingState() override = default; - - inline bool MarkNoPush(HeapObjectHeader& header) { -- return MutatorMarkingState::BasicMarkingState::MarkNoPush(header); -+ return this->MutatorMarkingState::BasicMarkingState::MarkNoPush(header); - } - - inline void ReTraceMarkedWeakContainer(cppgc::Visitor&, HeapObjectHeader&); diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index 53552378eb3211..74c80ab14701b7 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -6,7 +6,6 @@ set(${PORT}_PATCHES "cross-build.diff" "disable-host-pkgconfig.diff" "fix-error2275-2672.patch" - "nested-name-fix.patch" "osx-sdk-info.diff" "pdf-system-libjpeg.diff" "pdf-system-libpng.diff" diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index a6abce3a7331e5..061ab10d9bc7bd 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.9.1", + "version": "6.9.2", "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index cc43e5f1609597..3f5d993334d90a 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.9.1", + "version": "6.9.2", "description": "The Qt WebSockets module provides C++ and QML interfaces that enable Qt applications to act as a server that can process WebSocket requests, or a client that can consume data received from the server, or both.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebview/vcpkg.json b/ports/qtwebview/vcpkg.json index 218a1a7b440155..8899bcc1981249 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.9.1", + "version": "6.9.2", "description": "Qt WebView provides a way to display web content in a QML application without necessarily including a full web browser stack by using native APIs where it makes sense.", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 373b01a6562835..fad769c6fc2045 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7777,7 +7777,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qt-advanced-docking-system": { @@ -7785,7 +7785,7 @@ "port-version": 0 }, "qt3d": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qt5": { @@ -7969,67 +7969,67 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtactiveqt": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtbase": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtcharts": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtcoap": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtdoc": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtgraphs": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtgrpc": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qthttpserver": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtimageformats": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtkeychain": { @@ -8041,43 +8041,43 @@ "port-version": 0 }, "qtlanguageserver": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtlocation": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtlottie": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtmqtt": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtopcua": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtpositioning": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtquick3d": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtquick3dphysics": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtquickcontrols2": { @@ -8085,75 +8085,75 @@ "port-version": 1 }, "qtquickeffectmaker": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtscxml": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtsensors": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtserialbus": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtserialport": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtshadertools": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtspeech": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtsvg": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qttools": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qttranslations": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtwayland": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtwebengine": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "qtwebview": { - "baseline": "6.9.1", + "baseline": "6.9.2", "port-version": 0 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 6a9027d4449e5a..32c9f5ed353e82 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "81855c0210951c9dccd3878ff24ef927573464b5", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "12e0b54dc4c27a89d96a7bd7d39de8203c262ca9", "version": "6.9.1", diff --git a/versions/q-/qt3d.json b/versions/q-/qt3d.json index 13bc94b87f7720..175726be363214 100644 --- a/versions/q-/qt3d.json +++ b/versions/q-/qt3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7e88e377f8d99e78af69f475c8f5a15a54950e09", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "bfe66933044796b30963657672d58960b8333162", "version": "6.9.1", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 89e7a055f02a09..63fd9526cd9bbd 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b89e3bc40958dd7bbd95c010444f2dbda5557ff2", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "04116d98f2c36b839920dc1e34ca9e0ec8de4e15", "version": "6.9.1", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index ec2cff7c6fbc1c..55eb011e6b78f2 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "69dde55ddc1f5e704edb922e50b99343228ce30e", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "c0fa9967b747d8cf864c553532fc38d16fa960e0", "version": "6.9.1", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index da01b29aa1c4c3..a46620b56844f1 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f38bd8de0cc2d9e5aafdf7351e53304825619a96", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "a533ad79d39eeda8c983402fa28d219660ff5000", "version": "6.9.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index c34bf4c38cc159..cf697a46c91d41 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af31d0bcaddce24abaf97211cd8fd0769c2c1560", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "be98b37ac43fb19787d8eb594a22343810259f17", "version": "6.9.1", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index b232063399501a..0f3b0ca3fa3578 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "684a9867beb2cd6bddf9978f1de18850def84403", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "363f32f9c51d6ca67d4f0b395dd617171be9f986", "version": "6.9.1", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 04c98b2b74362d..f03427bad05adf 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3474aa8c5fc70ad0526ea0b5e5dbe54b2251375b", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "e160f6ba3c68593248485fd8682e047171509596", "version": "6.9.1", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index eae3ae274e7059..37021c660ddb38 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "34bf46645ac3f0b625db2ece48b43d36b1bac0a9", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "96aef451b4e9e9f79a353567a17683896f429c81", "version": "6.9.1", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 3fd773c52088f7..8195d6e0823bde 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b2df4848cdb3818c3ae0a876f4a59eb3e8627451", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "7beb0897127edd77336d1bdb0c070205dc6a2c41", "version": "6.9.1", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index 4e1f04f6ece13a..664de19cadc704 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7f6acaecc397ab8f27666fa98f01708fb2d30691", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "bf2df7f427bcf7459f1dd7ed84ef290528bc3c08", "version": "6.9.1", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index 97f2e1ec76a758..b9e354f4f46414 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a79e008eb7ec23c0cdfa63d27aa5ce307e150b1", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "a5e7638da1c276193fa948ddec066fea8c18aa06", "version": "6.9.1", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 6d8f38aeae9d5c..597f56b6091a7a 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4c23f6eb32ee5383fecd2b4f317ac2f991a1641", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "d01204cdeee7e32b89006dd63ee0fa726861550b", "version": "6.9.1", diff --git a/versions/q-/qtgraphs.json b/versions/q-/qtgraphs.json index 1e42690258a8b1..c8e5cf2531f7a1 100644 --- a/versions/q-/qtgraphs.json +++ b/versions/q-/qtgraphs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7114460fd88fd8bc3915736beafe5896c5ba3b6a", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "a915745605ec0c9e399e07b773d85c15fbfafc3f", "version": "6.9.1", diff --git a/versions/q-/qtgrpc.json b/versions/q-/qtgrpc.json index ebca6c04768c69..556bda63de450f 100644 --- a/versions/q-/qtgrpc.json +++ b/versions/q-/qtgrpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd4a21a1f4036cb3cb4cc4522c8ac4c1ba1b0e3a", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "f4b5714000fdbd00b9cb3400989429251838c7ef", "version": "6.9.1", diff --git a/versions/q-/qthttpserver.json b/versions/q-/qthttpserver.json index 2f65219f2c964b..d6de84ddbaedcf 100644 --- a/versions/q-/qthttpserver.json +++ b/versions/q-/qthttpserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c186381c039a23614b2c8033d791018cd49c168", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "0ac7fffe5e5c11707b9998b71c4cd9fee250a981", "version": "6.9.1", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index d17269e7856ea0..95e58fa748b7d3 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "907075f2a6bf3f32f9d2b29dd1966304291cc031", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "119511f3308b7f611b6179f68bfd003700ef3777", "version": "6.9.1", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index a8bf80d31e67fd..a7e8689ff3e54f 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "94dcad70f56da3afe3a1917ed4310ee9bfd4a7fa", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "62fc89cbbcc3305c1e9815f4154c44787001a440", "version": "6.9.1", diff --git a/versions/q-/qtlanguageserver.json b/versions/q-/qtlanguageserver.json index 9da20d3c66211a..65471112d1a2c6 100644 --- a/versions/q-/qtlanguageserver.json +++ b/versions/q-/qtlanguageserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8d0f50ac426022752e4606a25a18c2430fabbf92", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "4550fb0e542c91eeb54a1c0ef875789c2c70b492", "version": "6.9.1", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index 345837c7cecde6..86a9cf8cefacc9 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "92f393d14bd6a79a67c4bea8cadaffbd7963b827", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "cced50395df7ced2958598a1115c043626b08152", "version": "6.9.1", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 8206487a20c4a8..d942767b731d5e 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbc3d193252b94a25a682054dc7031b349ab2af2", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "530317429ff27509e15559d01915bf8dc1192edb", "version": "6.9.1", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index d4c8ee6769cecf..314a26f6a3fce9 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5a6df96dedee30b537a3541388fc34ff1ee920bb", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "1e50b482f31e7ec4ef7717bfe34ecc2ec5fc1694", "version": "6.9.1", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index a76896ab0b5c51..4e1703fc2c595e 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b174d3e45054ee65af0466784749a125295e962", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "46639abeaa2b81e685d88e02e0fed806765e0007", "version": "6.9.1", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index bd1629f73c11f6..680e51ffa3cfb3 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9c829fd0d0b22dc5a88e374ecf1dd51de74ce50", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "e39e0293f87729ae808deeb80cecf690c7044c71", "version": "6.9.1", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 10add444601c18..b997fe644dc2d0 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f926a605d01b16bcfaa5f508db18d09c76021436", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "d51d0c7aeb7fbead6e460b4929b7836d0eee0fc5", "version": "6.9.1", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index 4f44aac648d76c..8ac5ab8924080c 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4dbb861f5380852dbc655346af34394557a0bd7", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "436fe786b6450a52705186521f01012165127a25", "version": "6.9.1", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index db63bc4462db76..db561309cf37be 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a7b0e01f2e20999527fa5522b45c07f247156b72", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "b916f8c5cde9285bbe41cc644865b117848ea7e9", "version": "6.9.1", diff --git a/versions/q-/qtquick3dphysics.json b/versions/q-/qtquick3dphysics.json index e05a33916c0c2a..839b1430f63fc3 100644 --- a/versions/q-/qtquick3dphysics.json +++ b/versions/q-/qtquick3dphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "773c5c40fd648257111a5626bdaceb8cd6882886", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "297d6cafb233efa1e1b9ee12a54a42168fb17fd1", "version": "6.9.1", diff --git a/versions/q-/qtquickeffectmaker.json b/versions/q-/qtquickeffectmaker.json index 57eaaa6f22d435..901e0a1a878556 100644 --- a/versions/q-/qtquickeffectmaker.json +++ b/versions/q-/qtquickeffectmaker.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "636639b166fad7e6d1085e5d0b220cb74001be44", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "11615287741e12d667c3998f58655bbea6967b95", "version": "6.9.1", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index c7dfdb990fe3b3..e97ac9edc69efa 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a9070f7b2b8b87a33e90980742d9611a0bc61829", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "6a47f58ae20c060fafd5c386065a1c060bb1117b", "version": "6.9.1", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index d644a405437b71..14400d4d1a75a1 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "234daa51f3a77fd1472c7b88e4dc9a79f661aee0", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "8e691f4407828459bea9ce02af31532be81d11e1", "version": "6.9.1", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 367cff38924a22..308150f6e20734 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c817d6d69d20d9be20720b1518dabf8eb34eece", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "1121a929d6d9b228cb393e8daf32641ed48e3158", "version": "6.9.1", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index fe229e14867f8f..35a99529cbed6a 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a95aeef7c1b461f5fd0e72a6c742b163e57545d1", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "a55fd85ff4a899214d71522f64374705887e2874", "version": "6.9.1", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index 24ae82e476e97b..1a4eea56709dd1 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "874ce8c61e8a989474d08aa5c62d1b56a2ea13d9", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "4d52a5b0b7ee7e21bfde7ceb1b88529169ba20dd", "version": "6.9.1", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index dfc343fb4c5618..6f2614d317be1b 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "21cff4bddea7b39aedae28e01bdc8c1cb7273784", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "b81cb9e667eee693c9d91958fec6205d8b43d4f2", "version": "6.9.1", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index e6d20d26a8213f..94fef642941669 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8375031d05b0a2deb67d33f9f76550a455cbf9f1", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "dbfd983894ce6fdef34c7203f202c252420acd73", "version": "6.9.1", diff --git a/versions/q-/qtspeech.json b/versions/q-/qtspeech.json index c6bddfb874ca7e..8d057cdffb7172 100644 --- a/versions/q-/qtspeech.json +++ b/versions/q-/qtspeech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31db98f54b83a128587600840e959af3087f1a24", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "598c6cedd65edd6f04861677d14404e808559ab5", "version": "6.9.1", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index d180bee4bcbdaa..36664c62de4d9f 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "313de0b52b1f984b6551a348201fb651533c1689", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "76772ce7a19719158627edf5d82a55819192bd39", "version": "6.9.1", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 0fe9bba6e78b69..af62218c3e1349 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c5954922469c206dc0faaa2e7b3fd097020ae34", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "5f6f1c831294545f6cca196ae916874c89028326", "version": "6.9.1", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index 288f5dc4e291dc..de032edd3f57f2 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8cf4399d6cecd9cf5833dd76b7b66d0c2ad9e2b8", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "42e3a615bc4c9a0e34dd01a9cbcbe0b6dee285c9", "version": "6.9.1", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index 99adb9fcc8d575..8053a7805278c5 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "af603dd5b4455eefcaac7e05fc86a22dcead6455", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "017a821ccd4a8b46390f10556b1eadbc3ce9c4e1", "version": "6.9.1", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index ae606dac919b6c..42608531a58824 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b1673d9f49e0b363680c937621022d9465e30fd1", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "7ffdd3b89db88f83932d5e1b2b20d70f301eea07", "version": "6.9.1", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 168a21b77482bf..8c401d20fb131a 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "11d646c6420f35a2fe832c221ec7f1b56a3f967f", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "87b52ad0154db41ce1374463c49a15d5c127f68f", "version": "6.9.1", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 478451dc4ff5ed..5f144d7722d8e6 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee4fd2733bc3040503b4addfb14c6657e520feac", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "20af3e13a13986979309806ed3db5dd9f6926757", "version": "6.9.1", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 46c7ff5ffcc592..72cdf10e7c99f7 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cf7aaa4d7ca8bb55294fb1e69b1ed31255311b4b", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "c960d4c192ad61a541783079768bb4200e859482", "version": "6.9.1", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index 5da3c13b90dea2..9f6c1c5191e60b 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ffc3ee5bed4f5b24883a4a56ce1842cd231ff891", + "version": "6.9.2", + "port-version": 0 + }, { "git-tree": "7a892af5d5ee265f3c255ee58a2f660cee9318fc", "version": "6.9.1",