Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Qt6] Update to 6.7.3 #41222

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ports/qt/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qt",
"version": "6.7.2",
"version": "6.7.3",
"description": "A cross-platform application and UI framework.",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion ports/qt3d/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qt3d",
"version": "6.7.2",
"version": "6.7.3",
"description": "Qt wrapper for existing OPC UA stacks",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion ports/qt5compat/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qt5compat",
"version": "6.7.2",
"version": "6.7.3",
"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,
Expand Down
2 changes: 1 addition & 1 deletion ports/qtactiveqt/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qtactiveqt",
"version": "6.7.2",
"version": "6.7.3",
"description": "ActiveQt",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion ports/qtapplicationmanager/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qtapplicationmanager",
"version": "6.7.2",
"version": "6.7.3",
"description": "Qt component for application lifecycle management",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
29 changes: 12 additions & 17 deletions ports/qtbase/allow_outside_prefix.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,16 @@ diff --git a/cmake/QtBuildPathsHelpers.cmake b/cmake/QtBuildPathsHelpers.cmake
index bd186c28b..2c1994d2e 100644
--- a/cmake/QtBuildPathsHelpers.cmake
+++ b/cmake/QtBuildPathsHelpers.cmake
@@ -135,11 +135,13 @@ function(qt_configure_process_path name default docstring)
elseif(rel_path MATCHES "^\.\./")
# INSTALL_SYSCONFDIR is allowed to be outside the prefix.
if(NOT name STREQUAL "INSTALL_SYSCONFDIR")
- message(FATAL_ERROR
- "Path component '${name}' is outside computed install prefix: ${rel_path} ")
- return()
+ #message(FATAL_ERROR
+ # "Path component '${name}' is outside computed install prefix: ${rel_path} ")
+ #return()
+ set("${name}" "${rel_path}" CACHE STRING "${docstring}" FORCE)
+ else()
+ set("${name}" "${${name}}" CACHE STRING "${docstring}" FORCE)
endif()
- set("${name}" "${${name}}" CACHE STRING "${docstring}" FORCE)
else()
set("${name}" "${rel_path}" CACHE STRING "${docstring}" FORCE)
@@ -141,11 +141,9 @@ function(qt_configure_process_path name default docstring)
elseif(rel_path MATCHES "^\.\./")
# INSTALL_SYSCONFDIR is allowed to be outside the prefix.
if(NOT name STREQUAL "INSTALL_SYSCONFDIR")
- message(FATAL_ERROR
- "Path component '${name}' is outside computed install prefix: ${rel_path} ")
endif()
# Keep the absolute path.
set(new_value "${${name}}")
else()
# Use the canonicalized path.
set(new_value "${rel_path}")

91 changes: 46 additions & 45 deletions ports/qtbase/cmake/qt_port_data.cmake
Original file line number Diff line number Diff line change
@@ -1,48 +1,49 @@
set(qtbase_HASH "eb4b2f1fb02ab0ed5508d32449e140778278ff1a619cfcae14920b276b5c46e01a566d73fb8f84cf2cfc81e19cb11e53ab500df6b27d12ab875aa8c07bd15d6b")
set(qttools_HASH "311467d0e6970711b4d984fe792d2b75609f38c04121073d5c3c34c682fcee89787f6982c886e62206a76b1f647de60e56510439b0288f8bd1ae21a2683a37cd")
set(qtdeclarative_HASH "ca172e79af317f481d6f5e6388dc074fc6f99966b896135ab9991fa1a9502e46b0ac21b7f2bc38278448939e77882c5fd17252e3e6460c1665f8156fa99bceaf")
set(qtsvg_HASH "5a4209134afd3265d4b4b02a388a3078f2f915613c83e8a4aafd292e6b49d77019597f820468c8a9fe6c046c64e6890ac94ebc52e6b321a9b57a5ef3b51552e4")
set(qt5compat_HASH "31da40af3ab0a2283ead3363ee6c94a45018beccb777d2e4188f182d45ffb7e70d97543e22e5f6bc2c13df149676e44e259c8785626c54a4ed8757dcf414b4b0")
set(qtshadertools_HASH "b33e55f81d6878518dfe05db8ea3b319614dda10e215784496a61daaf8415fdeed1a3d802efc3cddc4fbca6c9894faf13475b35b3bb7d9a215b91238f9b38233")
set(qtquicktimeline_HASH "cb460db34b726216f539bcd305e257375b01250a4f2df546a9a27c53bf78287e2c9d1ecc81edc336e5d55b87006a271ddc435e5fb57a898947bcf93cf5ea1b90")
set(qtquick3d_HASH "d5a4557a6f0ea73b43de9238b8cd42fc037c417e72443a8cae96e8be779f82d5fd9efe1a09258a4d5dd55c4791b84192cb72e31bb1d744b618951080fe6fa1e2")
set(qttranslations_HASH "a1937f117af71a6896ebaf89f05bcb9c61c34711105609ac80a0f85d96cd427786e902ae4e2dccc38060c4fd9161f42a0cfdd7e39e618e3996fbe1c7f05c84d9")
set(qtwayland_HASH "2cd4f45f05ae60bc7f82b94f2e9c217ee4b8322f60381e1b079b90e0687e51cfbeb10b5dd724e1cca7e422b1b101d2b91c0ee47b1a732411cef330fb052c97c2")
set(qtdoc_HASH "5c0a58c28e11a1c5f3a1dedb4626e36a9c69d002dbbdccee8b843f0c24c9f31b781899b8467f36cbf098ae10fb81bc5217a38ea3f6c650646c17ffc72e8a79a1")
set(qtcoap_HASH "ac49332841a3f7a995be52224b00fdb9be728495069aa4873df8b67bb063a2726b58ecb19f51b9e75a40f941ae278786b96b723f2cdd51753ba9d9434c06be60")
set(qtopcua_HASH "7949331239c2556efdfcb790c79c1b3bdc7b06761613f54038588e4e3d2450e0a61ce8550d9af6b630a233aa8e5cc833d168a53c59fa58c2259d37fde11f1091")
set(qtimageformats_HASH "78871edcdf1ea0dec172e5d17fb7fee75c0512d18a7830ddcdcabb04719f57fc41faa7d1a82bcf4639213dbe98f495f817f5680745eb43a80b2e321f141d562a")
set(qtmqtt_HASH "02c5c30471ca7031facf978c05b00e6a300e90eeeb958389489f3e90a076bb4bf976aa2835af0443711d3c48e6abd4e1ef39d351e8c04e44d83a860867e63309")
set(qtnetworkauth_HASH "8357b2b833da9f652c88e706c7bf15b19b2c5b8f054914bfc16d33ea69dce86999b03fb7dd5b79e2a58d8d4e16af0fd2ff6dcf8e621ed251e63171fc8151f75b")
set(qt3d_HASH "d2b5ccf76f75db886acf4a73b1f2bc77e79a584f08f39915b7565179943c09a3ea90904af342a6d2d668b033161c41d6d4d20022e5e990ad55fa40fcb6746480")
set(qtactiveqt_HASH "f33ea2f2044a90fd7ee8bd6c20816d302324909100bb67b01484511139ea5e2221180ea648f6e07ec23819fcac8004048f6ad08100b147e54eb34a098920b510")
set(qtdatavis3d_HASH "e77112393e1c80091eb82aa7a11ad47ece46a24344d39ba097be991b36ff0d20ec0fd57533dc31c4727e8a99f0fefc0f9d4533122d2652b1294bbac50b0eb470")
set(qtdeviceutilities_HASH "70354cf3c8423662bb1c44bfd6a7c06b85d68338d67f2dd68190b6794ea1abfa591dfae27f41abf88dce248b9fcf921ec2a89d33645e6e5179652c6b3fe0e7ca")
set(qtlottie_HASH "be021c8800fc797e1c17d2bd40b6a8c1fbabf14a3e31caaa270807041151eb8ccad315a42c26914085e878e9d9f3ba99f26f872d345ed5900545a94fe6586ce7")
set(qtscxml_HASH "4eba366c2c10593cfc0fdeeff92aa9951b838837cacf113bf849b5da68da4d41d550490bc4be28620f766ab412ca4066c71ee7a1ff18651dd08267b01df6c2fe")
set(qtvirtualkeyboard_HASH "016400a65e14a5ec960f20ecf6b2b7c32fa0c67d530c5046b423633b02efce200e0967642a072ff825c54c334dfe45be3e569c16d641a735f181d233fa414782")
set(qtcharts_HASH "8e142bb3a925e802ab482890363ec1b7ed8c7b1d1bbbf6b30361afc8571ddef75d82f10b7d44bc29e6d87b752f235171f282080591f1ca252b2e47ad0b58b5ef")
set(qtconnectivity_HASH "381098e406ac18d87d34eb9087d1655c16e604059d69b77c04df9d444cefc77630a212f52b0fc2a1573c524044aa1837379d70460e152cd353731e52c4bd0e67")
set(qtpositioning_HASH "2983fde05cbccf86288cd989279551b5babeddcf9be2848870e59dbbfc2d91749465bf43c17e291d6df37ee746b5490c0bb1e6b3fd4298b4f0a22cc6d67db04e")
set(qtlocation_HASH "d7b8d4b9c99247362747d2d8fcf9207e710bed70c320d5c38e6868760cfe5ae2a158d1c0496af939a3e0d74369a86673cddfb25096ff8dda8dc209fd0df94e21")
set(qtmultimedia_HASH "bfcd04a5ba142e2a3bee3b67a261ffb4f651ac4e043e3dcafc0175bd25409de375041aa6fdda4f6899b00e4bad6c06ae9fd0d6a1e7db0b874f1bcf0a578d3c70")
set(qtremoteobjects_HASH "1b6030776c285f33a90379b235043125e06120521ff3dd8e3277c94243638c9294831e3e9866a2c04de3828b9246dd4756d762404ba8c0d987e747a4a767d4b0")
set(qtsensors_HASH "fcc437407191ea8d56f54bdbef07d0c25f15e1eefa74f5bb2c3a49af4418fb75cd8f7a16a9afc9efcba7e14ed842ca6bddeff6225949e1d193bb6e8ff55fe565")
set(qtserialbus_HASH "ba4d8c698e68508080f851d96428908b83f3d2f5d36dbcb00586567beb3001a8ca3f1d79fd9895aefb32c7d1a8400024e43cee2cdd4f427e80d47949593a3055")
set(qtserialport_HASH "faedff39212a98e6b3d96e0fb530c6b63c5fec519f5226b015771b8c5122528c8b087b6ccf74aed42ee87f61ffe324ac5c87152dad282395013a84e3f5cb2d3f")
set(qtwebchannel_HASH "6d9dae2925acfe560c2c1b4382d6e7ce7762f840e76b513f03f5e9e892fb4ad3fb0059ffef725210d88ee4210a8a09678af9b7d3dfbc6d7ff55f3e65396153dc")
set(qtwebengine_HASH "5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7")
set(qtwebsockets_HASH "ccd2bde6f68aa0993f099b4755f6e79f64d8ff85be8891b2682194984851e0ec0f71dfa69aec53df6c7f49df7f123eff30920c9b1f5c79da5285ab5605d22dee")
set(qtwebview_HASH "9cae6f415941049c975a86f99afbb62f3177285a15d182655b9fbab5b3d9ff19d7fb0b646c243db75f382fd971f5b89bf29659c150294e9c4e7ced2921b77c2d")
set(qtinterfaceframework_REF "146d9eabba1bf49b333744e19519f3746c3e2adc")
set(qtapplicationmanager_HASH "eec95d8722ee264080c7d1b97b0e2c5dafbcf3a94ee34124a663db40e455e9635366a16e43b631ee9cf16169ad857797476a1445195e3d87997a90caa0c20243")
set(qtlanguageserver_HASH "15ece6a24b43502a66b992404230d4561fe3e3ac561bfbf75b1e56ca4b6f5e0110a95155207b844692b72e43fbaa44ab7c9ea39bfb21c30b2c3fd30f92ec3303")
set(qthttpserver_HASH "0830fb4c5968ec5e23576f58e117dcca9f012cf742043c8b4786fb7bdcd68cd86f49d15d1ba66ee64e80d5a50d3c797dbffdf6f977ad7c101bb5be1bc02c1323")
set(qtquick3dphysics_HASH "9be6bd188ff7d027d1d682809d7c53cf4ad49a99c65542d90908a5a1e5df3513929f8724205b71d5d5507be4cabb0c36fc00d7e1cc9a8fbb759d284cef216d49")
set(qtspeech_HASH "f6e598834ab455c9feb5836b0add05802261210be088f7860b746a214a5be7d332a43d7c09bd03eef48d362165f2739b858e966249c061c9ef537346453bd588")
set(qtgrpc_HASH "b643fbf69531b09183c4a0a7984b7b1b2f284df172718e76dbf8ba4275bb3d8b1d5d0e0f42e5dda3f88fcc42afa1cfbdf76be29dd1e9bb944921cd3e851ab272")
set(qtquickeffectmaker_HASH "9051418bd18c9bfe2afa4a8613456f8f4d58808f202510b66eb25c14f7e1036ed8ea320d1dba718d92cf9e6452e9fae01b8fb132009a775562bb31056cf68d88")
set(qtgraphs_HASH "b39f93def4b770a80a14480b47688ea5d567693893f93ed2826916087e92a27f5edb75a4013c5694caa5c21a5c6d1c478a49cdc1c329cbc6b5f3139745ba949c")
set(qtbase_HASH "99495c6ed942b3a7bd19f9471bac76502baaafc20ad7e139adf25726f699c1b4deffa1ab761fe9a49a3ffe6a36d830422a20f8a369aded67a083652bf4a19290")
set(qttools_HASH "c15a76a84e8cea53e8c68b00325acf2cd3fe8097c578f3e96fbb68958453116f02fed25d2811d4485b82f196b988870f0078aea0450c4526523fb8ffacbfae57")
set(qtdeclarative_HASH "54e9b262b07c80eb6530da3e980319edd7370cc90f4241ebaf22a73e1f7f4f14177cea06276a0d3b2b553c6ed0825be0c56b9e2ddca53e99db57b67c3ad4bb47")
set(qtsvg_HASH "4113d12b3662d37e1119f4f506b3b0c6712fc0718ce7840e92acd300990ad4ac6a753e839b4adc91fc1ef7dc938fc517340f990bd7b89636a42d40a25f8f4bdb")
set(qt5compat_HASH "5a9cdf6cc4d56c2576e68aaf1c68f59a6f0b7655685235876dd2916506afb11253a8fc88c8b1e7756533c39bf42263499f7fc2ef72ad6ba672a45a55cc7048a3")
set(qtshadertools_HASH "751c1e321c98a8074a9c071f7484a840ce1b0cee44b0c355c33df0e496d277fa2c1ed26e68d46412fd9c2be6231946d97c57b31601b841f65e4b8dff166e106d")
set(qtquicktimeline_HASH "e01acaad6080bec84b1efdf33c71859c609dd3a9b3e5a4af57384e9ad6b875a8ba9e426a62cea90ac51f0adf842d5e6abbcd6ec0453fba45133c39408e365816")
set(qtquick3d_HASH "cdfc34521a201325ee0d41dfb5608fc9deca6c27d71d27e170d147a53fad808c4e70ee67b5c7598c8685b8c534dd5fa8460f436ae4e7a208b7d5be27bf1631d5")
set(qttranslations_HASH "06c9ac70c77de52e750315bb74c5ad580c154805b924a95387bbac1297ca04df643f69e3ada74bd027071b179cf009927a1c0db8825104bb355036402092c405")
set(qtwayland_HASH "9e15f3798ae7738b69e367343ffd7992fcdaebeffbcb10414fe2f24be553ca63e5504ef0a8405348702d0581dabebd1c2360728f63757c7445900b04df5e9ad7")
set(qtdoc_HASH "faed302aa21e565c8a2222f34a9c3b003eee784a095c6756f4385d7715d507b647d8519a2ddf9e58ef2923a8f04b0b7a22bfe5fd97ba5480ebe302a29c47274d")
set(qtcoap_HASH "298ca42855c664b85636d1ce3482ef345672421a15f1dd0781e99c2dd3d3c4344e18ad5a440a4188a93616f5d5712a078044b356b0f5c0d051d3d5382dbeee9e")
set(qtopcua_HASH "dccd571d9764da8beda5942db8cb3577049ee0d7efd162e25008314089a1e67b17d3d46e7d868f933823d7f4f54d52e0cd277f1cbf6d6703f2745992200f0df3")
set(qtimageformats_HASH "ca4ef39cc0bdf53ff00ff870301ec184c52bb7db422eb04011926b03bedac22ba9c9426c75cb124d0016d2e70a108383c57c6826cc9e2c5d62adcd2f68db6471")
set(qtmqtt_HASH "f77b058d9a33a9006f349bdefc851d5128e37ec5ff5ebbcab2b7414ea2668cc5f869b29b9f0b3e3a72f205c658d4053b54959d918dce43a5d58db7f056193e1f")
set(qtnetworkauth_HASH "f5eacb898423bcee0b063f70bf227ef954702b281964dbf182a2e280ef98d203fd88e2696c5f6f45f62b0a6a2e6b9a33f968c71f63b02647e57c475c4c37f6df")
set(qt3d_HASH "8337c68e99a634e367899a49ce6aa51b98443c5f5e9c7487e1e79b0f2988d6543c78d8cf5e305506703d196032664a1dad33073530a10a5999ad623c6f7af98d")
set(qtactiveqt_HASH "b18186cc99d487487352714f6a351f73c3c51b768e186f11c5c35f5e92b29432a7972d12d6751e7bb1f09d03743d46dfe81d2dba335e243b50b33ea880396626")
set(qtdatavis3d_HASH "0b0835e36deff4dcb7cf0eca9391fe5a4b92cb13d6273d7d2780f6cac1d6d07e388041fe02e453684d1cb7bf9603bb3625b09ed1d0396ff078948230955df3ab")
set(qtdeviceutilities_HASH "5f1cc33af33e7541e73ad9201cd12aa1ff8e1d4b9b0ab5632f07f9bac666a12777bd24cc98ad70ca3d59757b40822641c68e2742786a3f21b7c4568bcd2d25a1")
set(qtlottie_HASH "84c79b01de4411b3ff72d30928436b35c6b042fbb8f0cb794b3a9658a09b9d91daaba6d27a4f0434df372c3154f31f3b8671c836d2217aeb94a20f88648669c5")
set(qtscxml_HASH "d2d561f7a94d1fad2ad578b602c51c5f506bb0ea2c145647ea490399bac5995191c56ad62454775f15a2d3973e99cd220487ead3d5873163949b9ddd58bdada7")
set(qtvirtualkeyboard_HASH "cc08560c565289c43e9e89f247f9eb26eed6d678892681310728c639f6f70bdaa5947b436dfce437b8e0dd9d9386229a391f19587080f043e41a53f4fcf06067")
set(qtcharts_HASH "5e1e9387bee3a500a0178390ee827d76c58ac66486236e677e2854c3ea06011aadaaa08f742bdb0674b382209d54d30e8a0fa5f110d78c2b0dbeab49d46736e4")
set(qtconnectivity_HASH "46d77b7c02a03f8aee3401c889121ada5979858d95959ab4d7f31d54ce17c92c5f9c18097297baecc08c468c4f020a826b08edffb55e00e5d3fdaa0523600362")
set(qtpositioning_HASH "feb900f7371e712a63be6798f924d42e79676c317e18d1b347ae3cc870e9bf1003accc147dfeaa18d91ce6fdf2a7f3626c11a0419cb5058fa81f6f9ef17d6554")
set(qtlocation_HASH "e905001e5edd4aa6fc3e28e7d9e0461083706510ae652bb8329a3eb9d0ca6a8cbea75ded54538e35a1a9389d743a41a4d1834f29184d398bdbb1281c0f4f591a")
set(qtmultimedia_HASH "6c8c7c18ad71e32507af57456d1c11544f3e6c67c9cd3811a83fd0c20e12d6457ab294d91905e3911bdef1977ec1b535de82e9d92b2a38bd9eef7851e6349b5a")
set(qtremoteobjects_HASH "42b744dc946296bbd57ed31509b720285fd50760484243eede06ac25205fced40060601bef257745635ab4e15a59ddc8bd207dec52246adfde94078706d23e0f")
set(qtsensors_HASH "78ddb7cad68f37e7e6f1206c1f9db1b86ecba0806659a1049b562c45ed94439200230040a441e7e3c8cc5a17460e5e2e236cf42adfa88ff640f8aceb786c2288")
set(qtserialbus_HASH "fb032e65392ea6ee5e3edfe4dccbae3514493dca8fa5b3ffada18f0ce661475f847bc27e4c49573d360d55ed1bd17d4bb7e5faf5a31fc169a6984070c8fd8cae")
set(qtserialport_HASH "b5296a1494b9601d29b74518abade07274559eb2cade9cedd10e922bede0e759334a6982d799ea2438b0e3940e122a43fc07e0250e273d97c0307f9d9f0cac5b")
set(qtwebchannel_HASH "4cf329c865f9b9eb30584061a0cc684a014f6bdd8cc1f7cd037416cd6aacb386a8d16fe58b5c1c9854c3df4182fd6117ec6297e8d941d5215f0f86ad51f80180")
set(qtwebengine_HASH "f20769ac9b3f4a9fda9865c86d9dd2c779e404823d85aaf12cbbc425880352c19352ed39eb804a80a06a99e13582d22d45dbf2a8d7bbefea3592ff965b863cbe")
set(qtwebsockets_HASH "3dd1ed7a29c4bcc070241f465608a2f0b35142f73bc5cf0b3e964504a68da5a76002dabd4c6f14330f29200c8fb8d5e0ad46c5bc6de7af4889fd355796bce261")
set(qtwebview_HASH "d23ca95d252078a8b2dc4738298603a45384d88e0a4c0d4880ea7bf20195f0f6dfb201704cc7b7cb7127a702ec9b87b90a6e9d1f94a721efb291d7e50720cc26")
set(qtinterfaceframework_REF 4b0f0b7cf669b5be55a300ff8f5df457d4a6ec69)
set(qtapplicationmanager_HASH "ebe8ab7afbf1ede3d0ec4e3f0e5e604a811be9bf62e64159ae5ed1f81e4ae36d06f9e9a6ec6c74969e99ee260857a57bc37da2c182d7b36789387ca8d9fa2e16")
set(qtlanguageserver_HASH "29ade3d88c5c2d33cd777ffef87f1e7606664ab25194912f4a575c364f2621b99128e821d1685acc332671b77235a02c92333e4186a133b5f180e5b184bf7551")
set(qthttpserver_HASH "05238a97b9576f015a741446cfda434355fee8599975b5f4bf062bd28c63127d4bfbf52c4b84ff1f7b88def31200f4c3d298812a7eff5583546a5b925a390edf")
set(qtquick3dphysics_HASH "db437b74c6970badf197d0666923bd1927a0ff86d07dd2bbb341709eda28a2483e4307e9c773bd71b49c3493429a464ffd79f3ee2edd638f1e99f0292622e8dc")
set(qtspeech_HASH "b2b5a3b67160b75a679701eeac97587add53a1f8c2a2d120a61c54ead1d519d1fb726945fd2d4871b800f028e70f44e1079480322f71e2010c72b675b1cf935f")
set(qtgrpc_HASH "919ef9e97dfa6ae8d24a187eea0d0744099b991760f618cff0de25e025fbc3b9c1035ec7c2ff1893b20d6cde142fa849defb3738d06a430cbb97d344bdd5d146")
set(qtquickeffectmaker_HASH "afeaefa94fefda3a8d5561cb313f6094220dfd57af836a4e5e93cd381141bd52c43533e9ce284b152a5ccc3a798dc7b4401fe68d8d2c20df29aaf5ea71715061")
set(qtgraphs_HASH "3a74894ad37370a241fb7c866a5347ce43004623ab276bc2d571fd1e0a65739e6196ca2866c63ee3dcdfdfc6d020e1f9a3962fd64f21268bab23d30e12445b37")


# Keep for beta/rc
#set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e)
Expand Down
2 changes: 1 addition & 1 deletion ports/qtbase/cmake/qt_port_details.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.2)
set(QT_VERSION 6.7.3)
set(QT_DEV_BRANCH 0)

set(QT_UPDATE_VERSION 0)
Expand Down
12 changes: 12 additions & 0 deletions ports/qtbase/fix-link-lib-discovery.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
index b6f1242..eaa4d65 100644
--- a/cmake/QtPriHelpers.cmake
+++ b/cmake/QtPriHelpers.cmake
@@ -37,6 +37,7 @@ function(qt_generate_qmake_libraries_pri_content module_name output_root_dir out
get_target_property(lib_target_type ${lib_target} TYPE)
if(lib_target_type MATCHES "^(INTERFACE|UNKNOWN)_LIBRARY")
get_target_property(iface_libs ${lib_target} INTERFACE_LINK_LIBRARIES)
+ string(REGEX REPLACE [[\$<LINK_ONLY:([^>]+)>]] "\\1" iface_libs "${iface_libs}")
if(iface_libs)
list(PREPEND lib_targets ${iface_libs})
endif()
5 changes: 3 additions & 2 deletions ports/qtbase/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ set(${PORT}_PATCHES
clang-cl_QGADGET_fix.diff
fix-host-aliasing.patch
fix_deploy_windows.patch
)
fix-link-lib-discovery.patch
)

if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
list(APPEND ${PORT}_PATCHES env.patch)
Expand Down Expand Up @@ -310,7 +311,7 @@ set(TOOL_NAMES
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}
CONFIGURE_OPTIONS
#--trace-expand
##--trace-expand
${FEATURE_OPTIONS}
${FEATURE_CORE_OPTIONS}
${FEATURE_NET_OPTIONS}
Expand Down
3 changes: 1 addition & 2 deletions ports/qtbase/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "qtbase",
"version": "6.7.2",
"port-version": 3,
"version": "6.7.3",
"description": "Qt Base (Core, Gui, Widgets, Network, ...)",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion ports/qtcharts/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qtcharts",
"version": "6.7.2",
"version": "6.7.3",
"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,
Expand Down
2 changes: 1 addition & 1 deletion ports/qtcoap/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qtcoap",
"version": "6.7.2",
"version": "6.7.3",
"description": "Qt CoAP implements the client side of CoAP.",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
3 changes: 1 addition & 2 deletions ports/qtconnectivity/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "qtconnectivity",
"version": "6.7.2",
"port-version": 1,
"version": "6.7.3",
"description": "The Qt Connectivity module provides access to Bluetooth and NFC hardware.",
"homepage": "https://www.qt.io/",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion ports/qtdatavis3d/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qtdatavis3d",
"version": "6.7.2",
"version": "6.7.3",
"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,
Expand Down
14 changes: 0 additions & 14 deletions ports/qtdeclarative/7c94c7a.diff

This file was deleted.

Loading
Loading