diff --git a/ports/libqglviewer/glu.patch b/ports/libqglviewer/glu.patch new file mode 100644 index 0000000000..7e38874b32 --- /dev/null +++ b/ports/libqglviewer/glu.patch @@ -0,0 +1,14 @@ +diff --git a/QGLViewer/config.h b/QGLViewer/config.h +index 25f0e95ef4..010c54168f 100644 +--- a/QGLViewer/config.h ++++ b/QGLViewer/config.h +@@ -53,6 +53,9 @@ Error : libQGLViewer requires a minimum Qt version of 5.4 Error + #ifdef Q_OS_MAC + # include + #else ++#if defined(Q_OS_WIN) ++# include ++#endif + # include + #endif + diff --git a/ports/libqglviewer/portfile.cmake b/ports/libqglviewer/portfile.cmake index d8c64a1fd5..b556610fa0 100644 --- a/ports/libqglviewer/portfile.cmake +++ b/ports/libqglviewer/portfile.cmake @@ -6,6 +6,7 @@ vcpkg_from_github( PATCHES Add-compile-definitions.patch Fix-error-c2039.patch #https://github.com/GillesDebunne/libQGLViewer/pull/80 + glu.patch ) vcpkg_cmake_configure( diff --git a/ports/libqglviewer/vcpkg.json b/ports/libqglviewer/vcpkg.json index 11cbb9890a..fffe694442 100644 --- a/ports/libqglviewer/vcpkg.json +++ b/ports/libqglviewer/vcpkg.json @@ -1,15 +1,21 @@ { "name": "libqglviewer", "version": "2.9.1", - "port-version": 2, + "port-version": 3, "description": "libQGLViewer is an open source C++ library based on Qt that eases the creation of OpenGL 3D viewers.", "homepage": "http://libqglviewer.com/", "license": "GPL-2.0-or-later", "supports": "!xbox", "dependencies": [ + "opengl", { "name": "qtbase", - "default-features": false + "default-features": false, + "features": [ + "gui", + "opengl", + "widgets" + ] }, { "name": "vcpkg-cmake", diff --git a/ports/litehtml/fix-relative-includes.patch b/ports/litehtml/fix-relative-includes.patch index c9b42e9575..e86cb5e0ef 100644 --- a/ports/litehtml/fix-relative-includes.patch +++ b/ports/litehtml/fix-relative-includes.patch @@ -1,17 +1,8 @@ -From 42cf79c0292d655eec41c486710bf610063bdfd8 Mon Sep 17 00:00:00 2001 -From: Sean Farrell -Date: Thu, 23 Feb 2023 14:17:52 +0100 -Subject: [PATCH] Fix relative includes. - ---- - include/litehtml.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - diff --git a/include/litehtml.h b/include/litehtml.h index 98a24e0..d20addd 100644 --- a/include/litehtml.h +++ b/include/litehtml.h -@@ -1,10 +1,10 @@ +@@ -1,11 +1,11 @@ #ifndef LITEHTML_H #define LITEHTML_H @@ -20,13 +11,12 @@ index 98a24e0..d20addd 100644 -#include -#include -#include +-#include +#include "html.h" +#include "document.h" +#include "html_tag.h" +#include "stylesheet.h" +#include "element.h" ++#include "utf8_strings.h" #endif // LITEHTML_H --- -2.33.0.windows.2 - diff --git a/ports/litehtml/portfile.cmake b/ports/litehtml/portfile.cmake index 679c8d46ba..bad41e7bf0 100644 --- a/ports/litehtml/portfile.cmake +++ b/ports/litehtml/portfile.cmake @@ -1,9 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO litehtml/litehtml - REF v0.6 - SHA512 b774ed96e53780865e789875f571f96ebce1cd2ff0c05a06ae68a67aec44375cc282c07f77fc87131d422aceddba32bbf3e8e498c870883d8e042adb30834c39 - PATCHES + REF v0.9 + SHA512 2a156671b770a6a20ab00184d9869af779248dd1fb898930b3b479ee88d8b7d84f51fdbd689ae4124530ab70c8697b6641cf06b220631ce4fec4622e63845ea3 + PATCHES use-vcpkg-gumbo.patch fix-relative-includes.patch ) @@ -15,8 +15,7 @@ endif() vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DBUILD_TESTING=OFF - -DLITEHTML_UTF8=ON + -DLITEHTML_BUILD_TESTING=OFF ) vcpkg_cmake_install() diff --git a/ports/litehtml/use-vcpkg-gumbo.patch b/ports/litehtml/use-vcpkg-gumbo.patch index c7796fb000..b387df617d 100644 --- a/ports/litehtml/use-vcpkg-gumbo.patch +++ b/ports/litehtml/use-vcpkg-gumbo.patch @@ -1,14 +1,3 @@ -From 4ca6d9846bfc39c4aa98d6a41f298078b4bebf8d Mon Sep 17 00:00:00 2001 -From: Sean Farrell -Date: Thu, 23 Feb 2023 08:15:37 +0100 -Subject: [PATCH] Use vcpkg's gumbo - ---- - CMakeLists.txt | 8 ++------ - cmake/litehtmlConfig.cmake | 2 +- - src/document.cpp | 2 +- - 3 files changed, 4 insertions(+), 8 deletions(-) - diff --git a/CMakeLists.txt b/CMakeLists.txt index fe71729..21e77c8 100644 --- a/CMakeLists.txt @@ -25,9 +14,9 @@ index fe71729..21e77c8 100644 +find_package(unofficial-gumbo CONFIG REQUIRED) set(SOURCE_LITEHTML - src/background.cpp + src/codepoint.cpp @@ -153,7 +149,7 @@ if (LITEHTML_UTF8) - endif() + target_include_directories(${PROJECT_NAME} PRIVATE include/${PROJECT_NAME}) # Gumbo -target_link_libraries(${PROJECT_NAME} PUBLIC gumbo) @@ -49,14 +38,11 @@ index 8bd1ea8..51a9d42 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -26,7 +26,7 @@ + #include #include #include - #include -#include "gumbo.h" +#include #include "utf8_strings.h" - - litehtml::document::document(litehtml::document_container* objContainer, litehtml::context* ctx) --- -2.33.0.windows.2 - + #include "render_item.h" + #include "render_table.h" diff --git a/ports/litehtml/vcpkg.json b/ports/litehtml/vcpkg.json index da8c92718a..721de0dfb8 100644 --- a/ports/litehtml/vcpkg.json +++ b/ports/litehtml/vcpkg.json @@ -1,7 +1,6 @@ { "name": "litehtml", - "version": "0.6.0", - "port-version": 2, + "version": "0.9.0", "description": "litehtml is the lightweight HTML rendering engine with CSS2/CSS3 support.", "homepage": "https://github.com/litehtml/litehtml", "license": "BSD-3-Clause", diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index a24ede1174..9afc371546 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version": "6.6.3", + "version": "6.7.0", "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 5c2e5de035..12e724e062 100644 --- a/ports/qt3d/vcpkg.json +++ b/ports/qt3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt3d", - "version": "6.6.3", + "version": "6.7.0", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 9210c4ac32..45d9b10db7 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.6.3", + "version": "6.7.0", "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 336d187fc7..b6d9ad7c71 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.6.3", + "version": "6.7.0", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/portfile.cmake b/ports/qtapplicationmanager/portfile.cmake index 68686b02f3..da4b7ecdff 100644 --- a/ports/qtapplicationmanager/portfile.cmake +++ b/ports/qtapplicationmanager/portfile.cmake @@ -25,11 +25,14 @@ set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml) qt_cmake_configure(${_opt} OPTIONS -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON - -DINPUT_libarchive=system - -DINPUT_libyaml=system + -DINPUT_libarchive='system' + -DINPUT_libyaml='system' -DFEATURE_am_system_libyaml=ON + -DINPUT_libyaml='system' -DFEATURE_am_system_libarchive=ON - --trace-expand + -DINPUT_libarchive='system' + -DINPUT_libdbus='no' + -DINPUT_libbacktrace='no' OPTIONS_DEBUG OPTIONS_RELEASE) diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 86c3958031..7e4b15a5fe 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.6.3", + "version": "6.7.0", "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 12ff990b0b..6898361a2c 100644 --- a/ports/qtbase/cmake/qt_port_data.cmake +++ b/ports/qtbase/cmake/qt_port_data.cmake @@ -1,49 +1,48 @@ -set(qtbase_HASH "cd96903a3947a1f5cf6a3ff21ab0b3209ed421d2a8c45acb34ae5aa7ad0501cb79e26cfa81bc02141d5731ebfa662442f37806e97994332077d963c9e70a5f54") -set(qttools_HASH "621277c1f8ea7b0742ce2679bc938d8c5611f712b06f6ec7afa8231e9d8ae3184870f0d9d9358076bdeac220072798e236745bf68c33eaf23dc7896a1a478235") -set(qtdeclarative_HASH "78b19353ddc447dc2b850987ee1e9fe5c898c641190fdc45001369d3d08487d62b3a20f22532c9bd9a365d3e2fcb910091001c7766142c4c6c510ac61c6a6fca") -set(qtsvg_HASH "78d588ebc60d90b86f8d639b49081a616abe0adedbd32381dd7853693065ee2e41b40ee4221d4c13c04c71a7f9780b35f3c472f5b9b5fa96af6835d711eb4937") -set(qt5compat_HASH "11a1e03216c434c07ff984fc7f225072067bd17f1d469513e84d610d067953ad8f0e492973cfab3afbaaadffd5b1d0db3e84cc96f1abfad4fced0ee852729330") -set(qtshadertools_HASH "7c6aefb6fe18e7febaa45ef84853d9400d57dfa424c7fc847dee50d155a95a54e27dafdd9a0186a8ce9476dec8b3715ad8d5b9fe6053ab777f6acb9213ab0519") -set(qtquicktimeline_HASH "1e0976a34496f3961f958a38296b1aebf5bb0be7e077b70a91d93ff4e2c652b09ba5cdf94e26c748988ce489d025328a0bd9feca77bc2ddfb360815682055e47") -set(qtquick3d_HASH "49c9a5e336a011c592c2273420044d4cdea45a11db9c684fe7289b9e552d1f8c3e2cb690350a53ddad739f5334d045e213cc225c451c9e0f2a481afb9b1e255b") -set(qttranslations_HASH "b764161def8d9e7f1f7e6417dc37e166cde402642234f8a3b55f93a56ef2f46c68799d4e80c283fe76f9790b3d84274e6be680189bc04cc09fa8ca2ea68397e7") -set(qtwayland_HASH "6829c9aef2b7fc37a6a94c0093d478c13742d8c2b3d2b9444b7a1dbe022bfce1f6a5665d16bebe221e93bddd964b726451b2949352877b25d65654df17a58eb1") -set(qtdoc_HASH "3d508ef311718aa72cb5e3ede55b6237e2e15d632261c320751dd3245c6a93978c0e0513bffea64a81f7cdff80f61675a21bc79cebd4bdc4923e5a36a699a5bb") -set(qtcoap_HASH "1aff7d048beab105b380b468bf3e893084a95bb05edae06981cf71a32d5d4b8323e0009cca9b7150a08a2f84f2c71e8ce268e13a47870e8c2e89585b2268469b") -set(qtopcua_HASH "7cd67a49d010b631ce99128f8cf0a632fdb9144e81f073b6f813f01e476f53cebc155920f2f57410d736a010fe8980544c8e8652034dcf1822c00a8fdf6b7633") -set(qtimageformats_HASH "4fe56a787742f4af5e3e5c41c8c7850190bacea6a6d13ccde4ce299dbd15d2a1ab8b1825353ad324ca159333c0adc5dede823e79e217de3ab5910c5803b96d6d") -set(qtmqtt_HASH "a4564279f486b6e0ee5d5f398c2598e9d8f2493ec6b4d5a94d2369eac4c5dac873debfd23174a8ad5a3318c2927729634a1975d9475fbba2fc0cb3f890bc6ee4") -set(qtnetworkauth_HASH "c9976ab38f8a28a5944a70c6312490df9d3823d2125fe7a23aa8752a2d5dc9c2a7bc5f256f7e95acd475806cb64fcb703ae1f633311d8f03f690e87b2de49f8e") -set(qt3d_HASH "de47d1131fb4219481cb59d3b61f9f06b3785ac429d267da197d637fde1c72b6f8a0633bf1b6e4469dd22c95f2f2fd70f5eadc3b7d7e6324fad764271f741b71") -set(qtactiveqt_HASH "8b627209bd3089b20af1c93dce408315a05f39c947f3e4a4abe30af5ffc5078ede6e9af6bf20ae1273c99e1466bdb149f9859fdc78926a6fa6d996c5f390d494") -set(qtdatavis3d_HASH "a81fb36da432d2b5ec6b79263c8ceaeb81f413d793e7af77fad27a1c094e842debfe08174d26ea511cfe28127deecaad9e2ec88125e603225230ebf31e26751b") -set(qtdeviceutilities_HASH "04da4ca56e1481e93d4ce9c77f7785a8a9e9b061acc1198aa8776fc3f4647480cbbc58245eabf6bd0d7d5bab6e6d97ead4bdb0094c83f0cf327c453c49fdeda2") -set(qtlottie_HASH "4ea0c56d5c2d12bda1d3ee0e5d820000f8ebef36ca957d69de9f40180cb07dab4f2301b4e3b06a01e33339da4b326a26d7d43de8566e6c42a42b322aeaf32a4b") -set(qtscxml_HASH "626efd53f5f54d1742b86e95c8eb240354a88492601fc650bde0229670a1c75a009320ebf50b135634a3deaddb111ddffd878e392b806f723f8b0e965dacb270") -set(qtvirtualkeyboard_HASH "badfb9145315bb60a2a3a7b858e23af25a99e4209356f94ba098fc7a9f903d4ca7c995c3d0185b8c6492394846959136479c9b2e1c94d88a41f0c68d88d2fe36") -set(qtcharts_HASH "86f201d22104789d1e0de5c7cb8241301ab4cb138cc2e82dace9509e96afcbfbd05e1d7990a8d1939567f6086dfb4acccf954c1cd558fcf2a12332f279be4e61") -set(qtconnectivity_HASH "e75eea3d9c95532dafd3e2c765b1109f066e4b583d00205d18655e39f43f7373122e4d014d405d655d12b2246470083f1ac5dada0698bc1b0fb1d115a9fca6ea") -set(qtpositioning_HASH "6ae48b27851a18c44fa3167fa05d7da9b885a85e8b99c2efc750092d1bc0bc2c438b10e085486fce143b4f961189be843fd1a58581d31bd212e79596ce52a686") -set(qtlocation_HASH "3a014f498158151ad3932d9bed40622d54e75c2cc64660f12ea02645b93777eaad67b743c073d561f1b48a3558b3b66a5cd65a6f8bcb25a57ffc20d6f7371825") -set(qtmultimedia_HASH "4cad4a7c248adba709f5fda91780151a1136bd7ebb3a249602e401c2e3ae5aceb57a3ddc3825079bfbdb0200af403ad5cf3aa252b2090102f5ab22122445dc02") -set(qtremoteobjects_HASH "4cf25b3b6d8574ebd0028b605a96c74737f35895ffe267b8986e2145c180f383e4c21002a18fa45ded11610f6f54775893f7af8ac22d0006a5f127e7e93e85ae") -set(qtsensors_HASH "2a0b56bab4eebb09236ef2e0fb6dc54a719bef955833c24ba8c28eedee0abe4a06fb3f7d804c3189b4f8ffe6d0b93bceb9c53ed6fdf23d914402ace81f219b4c") -set(qtserialbus_HASH "22e3ba8a454abb46ac776ea33b3ff7f9e83573451226cb3801ad6e3a09d4d8089e5ba33263c7a43058cf44057f1be189ff06e7d394dca12c6f74660597642fd0") -set(qtserialport_HASH "b5a92452889f6fdcf05bd9395b803557ade0df60b49c698d7131df611cde1980d0b957127034aa6aae23f24dec6e97dff129c60e5d0291f057ba6d9fb51dcfca") -set(qtwebchannel_HASH "81b264aa661460b7872bfdf49b4404f090382346997ee288afc8c00a92c52a72d963cba9667ef99e02b8bd696456ee34e811e5885ed5d400076cdcc1e6cf72fa") -set(qtwebengine_HASH "cb026f2dd389d83fbeff3eedc3fa77fc22ff5cf6d444ec163b0dc4649abdf2d16683e9d31f46324f7b3546bb1ec80e40d35854537aa3c09959457fa3c79fa96d") -set(qtwebsockets_HASH "d9d6ab3380dfd0f74dc5c37d9aedcbd3349535d97f732e1fd6adef9a8d7ca3eb5a99b0cf94d0b7dafccd910689b82c0e2fcb631b3befe89e04778f92612d0190") -set(qtwebview_HASH "ea35725f666930fa7e5d83457ad7eb30c635cd2aa469111592850307b62888140077ed7e6c659ff1523c1d048fb1c90c506694133a5048d0daa189f9b01fb356") -set(qtinterfaceframework_REF "0455bf81a5777bf19894a2dc917b20df98d2ed0c") -set(qtapplicationmanager_HASH "dbc43da631ee0d76981f3667507e3daad566ef660f909da915890a92bea8bae7b8c047bf338cf3b5c66ab3f8fbdfcdc648c3c1e478fe225204599467a4f1d927") -set(qtlanguageserver_HASH "13d4fff90e45332337b822cdb77f1b6844d1e2754846788bf8a88b1d7b526dc820b9c3d570c26371ae318020de5417133e98a75d8309b596f4973130c4c842a5") -set(qthttpserver_HASH "a1a792beedef9c4e492ecae46d20c683773db690ac6d879b557a9223b64cedc6b7260668ee8fa781db16f478b2e98a0fd3ecd81fa9620766c9ee308a49d1bda1") -set(qtquick3dphysics_HASH "b6831732fa063df7303709d06ebb831e643a3b0a3a23e9e1101c3e7c1268e75f444d3e9ffd1b21c5ae403af317b588700dba5a07fef2481fdf8dbc4ce7e19a43") -set(qtspeech_HASH "4a43e1895ae477f6b6890a36ba2da365420e7778dece26535642ead39aab39c0c10d3be1c78a5b823eaddc646bdb60c5bd16bf3ac02f279832bc9724cfedc5d2") -set(qtgrpc_HASH "2633d1693d28343b58a1a69ecc88f27a34899d0a0a1a2e3010158944323330aeb166dd02fe4e981fb88a279d333670f4be205db686057912e51e68b7b7d1606d") -set(qtquickeffectmaker_HASH "8431c06a918530d93db54cb05528c84eaf39c0e68b7c769a09e5ffd896a2a5f4a774bcf8cc153d814b64728f3841a1c897297d775bec0129f69d1436e4c31cfd") -set(qtgraphs_HASH "2bb24700d486e3dc866521e680f772e9ddf2e9d07869d4f2a11c9a5853d830f28f3624e0f547a534fcf6ab7eb1d95fe3ebca69ee389a1dee0489bf936826bd74") - +set(qtbase_HASH "72896cc5a677361779f49d60dbdfc33a21d77bd479e0586b0beb03eee2016d613aee56e798143a489431a07a5e7a7db4c7c046105a11b63dd178768f3a7f195a") +set(qttools_HASH "8d478568d8e7ffc40af8099e95f2b37913c05490cc127d559c13ed3cba75bf8cca06ad3afce65649186a3e52442f8e0f820a2ac6b655ec0e2b808e6df834d560") +set(qtdeclarative_HASH "b189f3fc4ae9ad3e5c26aa56696b97cb2f1894cb23110928a31e5a62fb779578b492bec2f4dda5b31958a33eb2571ec4e1085ae6864442507be3ae0da83c96ee") +set(qtsvg_HASH "b68e4e235f1a6b0ddbb130fbc06aa7ac06f074c5d33f588dd7049b5986ae070e1e4e976f22fba2bef81adc3beac8c4564a01c818b3594e06ab36d9939ce0e7b3") +set(qt5compat_HASH "92115ca88b839171cf69360e0c3add64bb84305fdc28b9459da5eb69df79bfc2884616991ada898242e3614ac4f188dd76aa17889b5fb7fa72316a11efd61c85") +set(qtshadertools_HASH "30f737093fcdba6b247425c21f15d5682454255fdcf04cbe9f822e5b549dcdbb6fa519bfbcd0f2ba8acfa775cec7c30a630b61d50e00afa8c017ae9a16a73497") +set(qtquicktimeline_HASH "605fe39fc1b31b9281f291348ef73059bfd338531ab1d58d526307b775d34a65e3edcd6c4296824db3f99b4440ec0f7dbbe61a84a852eb5601b377b7f3597208") +set(qtquick3d_HASH "1262fccbbf7bd31aa122837998f3a903c191e70a270a2a678842e6f8209336b39f5523582e7b4ab88f0db98e357993c34f857ae2a34c7e7ac29597377459576b") +set(qttranslations_HASH "12efb8591a066c8adf9c460e85553924ea99337dc80052745a8f46b6cc7c7d7ce3804477867f977db80628dd14b65d31d911805fed4c30c468c52fe439ee8f2a") +set(qtwayland_HASH "cda0e0736f85656d05b2399970413ffc5082af4256c8b3087c3f1d06cad5ef5ad7cb8838513723569193df02cd3c3df3d5478d99464606c62c42629ef75c225f") +set(qtdoc_HASH "505d155f0de8a216f476533573e2dd045c52badcc2daa55fec05d61c238608cac18639296628a40ed8eb5795ef560e6f4ac47913d5b36f8bdb873a4a6f450e84") +set(qtcoap_HASH "f1978d9cb766b612d3d33ae8f16cec52a93d1ba56e34a5bb903cd98575209d8f96ca70880108a1ae35ce4c12485de58c8c33d91e795492a573024023e1f4a8a5") +set(qtopcua_HASH "c0ec500410e9f8bf9b6bc596d518911391bbc07f322c206fcfb79c2d43550883a1a654991eb7a6faaa6e35b16db0bba769d84d8e5bf6b1248bf48f4c8b5dd2f1") +set(qtimageformats_HASH "0e30021b028a4e6754c300d343aa72f93ab855cba043ddb2d24855989823c82c78ea67871399d78105dbc092abe2666e0a92caa50aa780ca4e267bf6f05bd914") +set(qtmqtt_HASH "ac79d24a3b9edc4ae2e8f97459044da700f64251686e3369b5c621a9f89dc3f584faa757af96e066c7e783993c2b20c604e7f9cf5f02010a9d221f363d435292") +set(qtnetworkauth_HASH "1a92cd2f129260cacad51cf2d6dbb86f9b9e1b14df695117b1734d32897279b0a6f30a2c8e410fb105e13b45d7109c58c36fc73acf75c4e7ccf5be07913cec55") +set(qt3d_HASH "538027077f9729b91ecc3a4de4a14be212236d0bc4b1f4533a558753b6cb7aa23e1c169c921fa71d61d5f9cffbb85a0535000bf677ca09962ca62cbfcc60e70d") +set(qtactiveqt_HASH "90dc91c2d6f781ffd9248fd931751791920b0d7c19e7156c5b24fe85d118acba8ec05762a732181156aec6685edbc88ff7176191e2c8a45ce8dcd18f41b11f77") +set(qtdatavis3d_HASH "9fe8c1680fa31b4ac88c5296696dc8a00f4f70548827de08e82937f054292830ab073f6188934afaad9eb99fd8bff2d088ba6d8690fa193becb08b13eaf961cf") +set(qtdeviceutilities_HASH "766b0da095d48d51a0afcee4e38e18c8ca6fb802b319879b7187abe8758a4bf108ff22d99ff93b34a2c5945a127a6b682ffb79f8e0efb50d42d7f2cf4b6a2a54") +set(qtlottie_HASH "6258824f5a77b2fc24cf9be1d9b39f27d1531348b3ddcc4408968d859e4e4fba162dc31b08807d1d6cd3155889a491704d53f0d3ab07ec1ec129f46360d00f28") +set(qtscxml_HASH "d732e9c70c11334614efdfe527334a12da683b918bd9c6c49809f4cd2f6d6d06436c64b8d46e3bf014b9a3f092b0c3a752ad7e94844b2f82bf9384380aec60c7") +set(qtvirtualkeyboard_HASH "0e33a9d962eed6a75bceb25ba666adff2ee0e3eea229540415777000fd60de290c4b56a07870239943e96da626d71e4e4770d46198b8bfe1fb5e03bee64740e9") +set(qtcharts_HASH "4cdabacd053630e0783850d8a2204e717e2508ef749eb3d5f365494bc8cda31db066bb0bcba91bccf379f4667ca6825b8c7bc59e87e918c7e2e126b4c52655a6") +set(qtconnectivity_HASH "bbdb6798a9cca5ec523d0f06aa3e1ea0024e4c7bd5cba765ad87b7b2f40ec59bd2a557bb45224bb3490c818292ccf04283f7c5d47723d95d83f2edf85c214b78") +set(qtpositioning_HASH "ba0bce58321d967ddb3fcbe4b978212f660e48afd788ba36a0068ca7c6804e7febd74d6a15bc541f6cf9ebeef72aeeceb3e2779f53bdaa432391fb64781e68a1") +set(qtlocation_HASH "51e3777cdee6c27bf5770dfa4f21509ab4699161b5b49d99696aa09018ee5a355c921a85f8f1a732a80b19730ac30d40795d20cd73e4aefc1a4d4a989d41bc3d") +set(qtmultimedia_HASH "4e5fa8fff408b8abf761a12d9637c425fe9bfbf6475b44a69c8489fd61bf6cbcca95940a22d1b24aec59634a458888d2b34cb883c8e38d542f2f1cb36046e4c1") +set(qtremoteobjects_HASH "5fc065fd50b3b547883ce920957ae9ca64e7c46b65d5c9ef02a526e3d14255bc8ca8750cb75da13e13671b85d37d6ef240a1f149795a53143183840611e48f8b") +set(qtsensors_HASH "d51c1f0b1348336688cd2d640987684c0be40fc702bf18bc7a6089a341fb094f8e0f6d80e1c8cbcaf28f0b8ee095679f10a0253ea8ad4054651b7cd2b2529e54") +set(qtserialbus_HASH "33c4fd04da0904c43e937fe94724c4318280e45a2f18b727379beb04ddae0285338486ea82be47950a5f4fa28cc0ac1f2c03d6ff8a45730e6be8d5ab84c50892") +set(qtserialport_HASH "2dd424a82786aec48550f89c5f3c104fa630de742f97014a5ab8fb324a7be02ff35f974fa88ff2af8a8eb262b1e8fd653fe8fa83c3fc9c7bb9b19d44b5eb70f0") +set(qtwebchannel_HASH "b32291c8051fc8917134a9804365c378cc41c25a64add9b1e055100b32cecb7c3a008a8bf7bb825ce9db68b8d9790a25620bf4e126feef47bfb8c07f45f0ae47") +set(qtwebengine_HASH "92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64") +set(qtwebsockets_HASH "a233700dbecc3c266e432e4d0b239891457dd96125fe0e115e16904e7bd038fd2f1ba74b05fa23b7b3752d5023a8af502436a80c430c1b974acb182487275641") +set(qtwebview_HASH "d4559e2bd77a05c43271346236f3642b4f082beabe415f6a459cc3d3aee9b5750b4da2ae6e5c3ec1b571304918f5f39bea98cc46f96d606dd3acc53aa42c88a2") +set(qtinterfaceframework_REF "d87c6f81a84f910c1edd1cdb93f70b736042e4d2") +set(qtapplicationmanager_HASH "81a2f8dc84cf915f55311a1b6d435211036b0af27b1bb3005beaa52f7e203b54522b787c642da2db6580ca012932fc8ffab6fd9e467231c11cf279566fc15158") +set(qtlanguageserver_HASH "b3ebfd6e3093e6105dfda173cb8e8f7686e139621a882373f9a27ff7c3b7f7e4b10ccdbc1f71cab474ae6eddca4e68733a053b0045111575ff1f49741ecfe02f") +set(qthttpserver_HASH "e63c87b9a8b0a2aff5fbbb012582045cd9fbd6bbbc81089707ef5d71ad078c8a9a52d443213b3e9c137c2349bb107641a267ed71d562e64b55a18abca4bea8ce") +set(qtquick3dphysics_HASH "6a391f8664e668b1d4d8965b4e89db93fb85706bbccda8d56b553650d3c4e3fbc49d995fcd54a0e0ecd07a1ca3edb0186c2d2cfc11a122fb4f7350357ba573f7") +set(qtspeech_HASH "10d086633da8cc478619023baa4d2495bb394aa30e7ba7141b0e698ade5a4a723f5643a5df64e9920b90251e89722598b7d5b720d7b8d3a04449e94fd5984f82") +set(qtgrpc_HASH "66728836e486c2a06d54b23bd0001da52da11a4e01c55054a711b2a5901ae2e1d542485b92aedee7363c97237db7da89edf6a0578f24fab80f52ebe8059d33e4") +set(qtquickeffectmaker_HASH "ab9420790554d6ee78b2dc21ab01222be34303ce4bfb1b24875faeb1ef6c2537b2873a7cc81d57ee176e3d1ff77ff065eae01b750f77ba80f9585b96f5ae69c3") +set(qtgraphs_HASH "012fbc5e746d795983378284be971a52824261170655f267ddcddc76e74e29a7d9f17e8dec86a0daa1a721b3d7f5eff8a4ad288e6ea1d3cb12c1b5febb65fbd6") # Keep for beta/rc #set(qttools_qlitehtml_REF bd70f93ce41443a6a90a269531393f575685283e) diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index 574442394a..9e58f4f750 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.6.3) +set(QT_VERSION 6.7.0) set(QT_DEV_BRANCH 0) set(QT_UPDATE_VERSION 0) diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index a20c49c79b..9fee9d76ad 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -497,3 +497,26 @@ if(NOT VCPKG_TARGET_IS_WINDOWS) endif() endforeach() endif() + +if(VCPKG_TARGET_IS_WINDOWS) + # dlls owned but not automatically installed by qtbase + # this is required to avoid ownership troubles in downstream qt modules + set(qtbase_owned_dlls + double-conversion.dll + icudt74.dll + icuin74.dll + icuuc74.dll + libcrypto-3-${VCPKG_TARGET_ARCHITECTURE}.dll + libcrypto-3.dll # for x86 + pcre2-16.dll + zlib1.dll + zstd.dll + ) + list(TRANSFORM qtbase_owned_dlls PREPEND "${CURRENT_INSTALLED_DIR}/bin/") + foreach(dll IN LISTS qtbase_owned_dlls) + if(NOT EXISTS "${dll}") # Need to remove non-existant dlls since dependencies could have been build statically + list(REMOVE_ITEM qtbase_owned_dlls "${dll}") + endif() + endforeach() + file(COPY ${qtbase_owned_dlls} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin") +endif() diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 1cdc56e5a6..b6fb831ff4 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtbase", - "version": "6.6.3", + "version": "6.7.0", "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 0665dc084b..be39c66cd0 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.6.3", + "version": "6.7.0", "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 35a34fe660..760488d90e 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.6.3", + "version": "6.7.0", "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 9efb88cca8..e73cbd6d1d 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.6.3", + "version": "6.7.0", "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 93dc4a6432..4d725ece57 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.6.3", + "version": "6.7.0", "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/cb6b62f.diff b/ports/qtdeclarative/cb6b62f.diff new file mode 100644 index 0000000000..f54bae991f --- /dev/null +++ b/ports/qtdeclarative/cb6b62f.diff @@ -0,0 +1,22 @@ +diff --git a/src/qmlcompiler/qqmljscodegenerator.cpp b/src/qmlcompiler/qqmljscodegenerator.cpp +index 7e8ba71..0ccd3c7 100644 +--- a/src/qmlcompiler/qqmljscodegenerator.cpp ++++ b/src/qmlcompiler/qqmljscodegenerator.cpp +@@ -2562,7 +2562,7 @@ + } + + for (int i = classSize; i < argc; i += 3) { +- const int nameArg = argc + i + 1; ++ const int nameArg = args + i + 1; + m_body += u"{ "_s + + conversion( + registerType(nameArg), +@@ -2570,7 +2570,7 @@ + consumedRegisterVariable(nameArg)) + + u", "_s; + +- const int valueArg = argc + i + 2; ++ const int valueArg = args + i + 2; + m_body += convertStored( + registerType(valueArg).storedType(), + propType, diff --git a/ports/qtdeclarative/portfile.cmake b/ports/qtdeclarative/portfile.cmake index 3c9525d667..5d428ff647 100644 --- a/ports/qtdeclarative/portfile.cmake +++ b/ports/qtdeclarative/portfile.cmake @@ -3,6 +3,10 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake") vcpkg_buildpath_length_warning(44) +set(${PORT}_PATCHES + cb6b62f.diff +) + set(TOOL_NAMES qml qmlcachegen @@ -20,6 +24,7 @@ vcpkg_buildpath_length_warning(44) qmldom qmltc qmlls + qmljsrootgen ) qt_install_submodule(PATCHES ${${PORT}_PATCHES} diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index 1db1201f9a..112fe50f99 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.6.3", + "version": "6.7.0", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtdeviceutilities/vcpkg.json b/ports/qtdeviceutilities/vcpkg.json index ce3f558354..be0198cf63 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.6.3", + "version": "6.7.0", "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 5cbd71d8d2..9c1a3f639d 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.6.3", + "version": "6.7.0", "description": "The Qt documentation.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtgraphs/vcpkg.json b/ports/qtgraphs/vcpkg.json index 25fd11c310..ec0c69a056 100644 --- a/ports/qtgraphs/vcpkg.json +++ b/ports/qtgraphs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtgraphs", - "version": "6.6.3", + "version": "6.7.0", "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 34de631fa5..711f4b2cd2 100644 --- a/ports/qtgrpc/vcpkg.json +++ b/ports/qtgrpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtgrpc", - "version": "6.6.3", + "version": "6.7.0", "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 e8b359a643..37b4a27c51 100644 --- a/ports/qthttpserver/vcpkg.json +++ b/ports/qthttpserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qthttpserver", - "version": "6.6.3", + "version": "6.7.0", "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 bdb1cd412c..9e57822c15 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtimageformats", - "version": "6.6.3", - "port-version": 1, + "version": "6.7.0", "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/fix-taglib-search.patch b/ports/qtinterfaceframework/fix-taglib-search.patch deleted file mode 100644 index b8027bdf6a..0000000000 --- a/ports/qtinterfaceframework/fix-taglib-search.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/FindWrapSystemTagLib.cmake b/cmake/FindWrapSystemTagLib.cmake -index e82d2c1a9..14463c791 100644 ---- a/cmake/FindWrapSystemTagLib.cmake -+++ b/cmake/FindWrapSystemTagLib.cmake -@@ -4,7 +4,7 @@ if(TARGET WrapSystemTagLib::WrapSystemTagLib) - set(WrapSystemTagLib_FOUND ON) - return() - endif() -- -+unset(PKG_CONFIG_EXECUTABLE CACHE) - find_package(PkgConfig) - - pkg_check_modules(TagLib taglib IMPORTED_TARGET) diff --git a/ports/qtinterfaceframework/portfile.cmake b/ports/qtinterfaceframework/portfile.cmake index e93aa878ce..4530e5c034 100644 --- a/ports/qtinterfaceframework/portfile.cmake +++ b/ports/qtinterfaceframework/portfile.cmake @@ -1,11 +1,7 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") -set(${PORT}_PATCHES fix-taglib-search.patch # Strictly this is only required if qt does not use pkg-config since it forces it to off. - ) -set(TOOL_NAMES - ifmedia-simulation-server - ifvehiclefunctions-simulation-server +set(TOOL_NAMES ) qt_download_submodule(PATCHES ${${PORT}_PATCHES}) @@ -44,6 +40,7 @@ qt_install_copyright("${SOURCE_PATH}") if(NOT VCPKG_CROSSCOMPILING) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/ifcodegen") + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/ifcodegen" "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin/ifcodegen") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") diff --git a/ports/qtinterfaceframework/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index fe349f592f..ddad1bf8ab 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.6.3", + "version": "6.7.0", "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 92caac3717..47a8e0e571 100644 --- a/ports/qtlanguageserver/vcpkg.json +++ b/ports/qtlanguageserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlanguageserver", - "version": "6.6.3", + "version": "6.7.0", "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 636038402f..46f0d1d085 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.6.3", + "version": "6.7.0", "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 16794b0b3c..de2c92c62c 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.6.3", + "version": "6.7.0", "description": "Lottie is a family of player software for a certain json-based file format for describing 2d vector graphics animations. These files are created/exported directly from After Effects by a plugin called Bodymovin.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index cfc25585c1..cf4dd77d10 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.6.3", + "version": "6.7.0", "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/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 1a57e1eaff..43fe48310f 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmultimedia", - "version": "6.6.3", + "version": "6.7.0", "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 3273c47a6b..3c48bc0b5a 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.6.3", + "version": "6.7.0", "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/portfile.cmake b/ports/qtopcua/portfile.cmake index 0f2c0ed593..7597146196 100644 --- a/ports/qtopcua/portfile.cmake +++ b/ports/qtopcua/portfile.cmake @@ -27,7 +27,12 @@ if("uacpp" IN_LIST FEATURES) message(WARNING "\nPlease note that you have to install the Unified Automation C++ SDK yourself.\n") endif() + +set(TOOL_NAMES + qopcuaxmldatatypes2cpp +) qt_install_submodule(PATCHES ${${PORT}_PATCHES} + TOOL_NAMES ${TOOL_NAMES} CONFIGURE_OPTIONS ${FEATURE_OPTIONS} "-DPYTHON_EXECUTABLE=${PYTHON3}" diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 66d174b697..a1cbb17ad6 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version": "6.6.3", + "version": "6.7.0", "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, @@ -11,6 +11,11 @@ "features": [ "network" ] + }, + { + "name": "qtopcua", + "host": true, + "default-features": false } ], "default-features": [ diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index 6dfcc05ee3..2474b755a4 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.6.3", + "version": "6.7.0", "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/vcpkg.json b/ports/qtquick3d/vcpkg.json index ba54fc5934..1d834397db 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version": "6.6.3", + "version": "6.7.0", "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 09660422e5..0df25fb136 100644 --- a/ports/qtquick3dphysics/vcpkg.json +++ b/ports/qtquick3dphysics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3dphysics", - "version": "6.6.3", + "version": "6.7.0", "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 b0a3ec6755..0316ad69a4 100644 --- a/ports/qtquickeffectmaker/vcpkg.json +++ b/ports/qtquickeffectmaker/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquickeffectmaker", - "version": "6.6.3", + "version": "6.7.0", "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 7605251ede..32b497a55d 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.6.3", + "version": "6.7.0", "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 a3ee1746de..97a2692312 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.6.3", + "version": "6.7.0", "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 bb0bbef248..cffd8c2b4c 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.6.3", + "version": "6.7.0", "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 560e518fad..8e4cbc6c87 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.6.3", + "version": "6.7.0", "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 d8717c2d78..ef6c1a1c33 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.6.3", + "version": "6.7.0", "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 d541894783..9345d075e6 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.6.3", + "version": "6.7.0", "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 48f1103224..39cb83ea0d 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.6.3", + "version": "6.7.0", "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 13cb2c4f1a..13ba1ffc37 100644 --- a/ports/qtspeech/vcpkg.json +++ b/ports/qtspeech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtspeech", - "version": "6.6.3", + "version": "6.7.0", "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 6fd5281f9f..f5c582ad33 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.6.3", + "version": "6.7.0", "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/devendor-litehtml.patch b/ports/qttools/devendor-litehtml.patch index ed3b43a152..7830391dd2 100644 --- a/ports/qttools/devendor-litehtml.patch +++ b/ports/qttools/devendor-litehtml.patch @@ -1,59 +1,3 @@ ---- a/src/assistant/qlitehtml/src/CMakeLists.txt -+++ b/src/assistant/qlitehtml/src/CMakeLists.txt -@@ -15,45 +15,11 @@ - set(QLITEHTML_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) - set(QLITEHTML_VERSION_COMPAT ${QLITEHTML_VERSION} CACHE STRING "qlitehtml compat version number.") - --find_package(litehtml QUIET) --if(NOT TARGET litehtml AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/litehtml/CMakeLists.txt) -- set(ORIG_FPIC ${CMAKE_POSITION_INDEPENDENT_CODE}) -- set(ORIG_BUILD_SHARED_LIBS ${BUILD_SHARED_LIBS}) -- if (WIN32) -- set(LITEHTML_UTF8 ON CACHE BOOL "") -- endif() -- set(CMAKE_POSITION_INDEPENDENT_CODE ON) -- set(BUILD_SHARED_LIBS OFF) -- -- add_subdirectory(3rdparty/litehtml EXCLUDE_FROM_ALL) -- -- # suppress compiler warnings from litehtml -- set_target_properties( -- litehtml -- PROPERTIES -- QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON -- ) -- set_target_properties( -- gumbo -- PROPERTIES -- QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON -- ) -- -- set(CMAKE_POSITION_INDEPENDENT_CODE "${ORIG_FPIC}") -- set(BUILD_SHARED_LIBS ${ORIG_BUILD_SHARED_LIBS}) -- # force optimized litehtml even in debug -- if (CMAKE_BUILD_TYPE STREQUAL "Debug") -- # except for windows -- if (NOT WIN32) -- target_compile_options(gumbo PRIVATE -O2) -- target_compile_options(litehtml PRIVATE -O2) -- endif() -- endif() --endif() -+find_package(litehtml CONFIG REQUIRED) - - # TODO error if litehtml was not found? - --if(TARGET litehtml) -+ - set(PUBLIC_HEADERS - container_qpainter.h - container_qpainter_p.h -@@ -155,5 +121,3 @@ - ${_DEVEL_COMPONENT} - OPTIONAL) - endif() -- --endif() diff --git a/src/assistant/CMakeLists.txt b/src/assistant/CMakeLists.txt index 5d2bf2b67c..abd9b513d3 100644 --- a/src/assistant/CMakeLists.txt diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index bb46599a62..10697e5399 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -2,7 +2,8 @@ set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") include("${SCRIPT_PATH}/qt_install_submodule.cmake") set(${PORT}_PATCHES - devendor-litehtml.patch) + devendor-litehtml.patch + ) #TODO check features and setup: (means force features!) @@ -87,6 +88,8 @@ qt_install_submodule(PATCHES ${${PORT}_PATCHES} CONFIGURE_OPTIONS ${FEATURE_OPTIONS} -DCMAKE_DISABLE_FIND_PACKAGE_Qt6AxContainer=ON + -DQLITEHTML_USE_SYSTEM_LITEHTML:BOOL=ON + -DCMAKE_REQUIRE_FIND_PACKAGE_litehtml:BOOL=ON CONFIGURE_OPTIONS_RELEASE CONFIGURE_OPTIONS_DEBUG ) diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index e0d17fb77f..f7ee7f5790 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version": "6.6.3", + "version": "6.7.0", "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 7ebf406755..3b4358546f 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.6.3", + "version": "6.7.0", "description": "Qt translations.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index e387ddef9c..10e0818699 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.6.3", + "version": "6.7.0", "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 476862e900..82f6c4b79d 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.6.3", + "version": "6.7.0", "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtwebchannel/vcpkg.json b/ports/qtwebchannel/vcpkg.json index c9cd04d6ea..8c7ae0ac3e 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.6.3", + "version": "6.7.0", "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/portfile.cmake b/ports/qtwebengine/portfile.cmake index 332e17c990..c1c8d7c54d 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -5,7 +5,7 @@ set(${PORT}_PATCHES "clang-cl.patch" ) -set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict) +set(TOOL_NAMES gn QtWebEngineProcess qwebengine_convert_dict webenginedriver) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index e0dcafa20f..b15d8c2c89 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.6.3", + "version": "6.7.0", "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 c56c62754f..35f25f94a5 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.6.3", + "version": "6.7.0", "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 5fd904d123..69b420a4a9 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.6.3", + "version": "6.7.0", "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 4e34434860..092ff284e1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4846,7 +4846,7 @@ }, "libqglviewer": { "baseline": "2.9.1", - "port-version": 2 + "port-version": 3 }, "libqrencode": { "baseline": "4.1.1", @@ -5361,8 +5361,8 @@ "port-version": 0 }, "litehtml": { - "baseline": "0.6.0", - "port-version": 2 + "baseline": "0.9.0", + "port-version": 0 }, "live555": { "baseline": "2023-11-30", @@ -7113,7 +7113,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qt-advanced-docking-system": { @@ -7121,7 +7121,7 @@ "port-version": 0 }, "qt3d": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qt5": { @@ -7297,67 +7297,67 @@ "port-version": 1 }, "qt5compat": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtactiveqt": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtbase": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtcharts": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtcoap": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtdoc": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtgraphs": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtgrpc": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qthttpserver": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtimageformats": { - "baseline": "6.6.3", - "port-version": 1 + "baseline": "6.7.0", + "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtkeychain": { @@ -7369,43 +7369,43 @@ "port-version": 1 }, "qtlanguageserver": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtlocation": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtlottie": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtmqtt": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtopcua": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtpositioning": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtquick3d": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtquick3dphysics": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtquickcontrols2": { @@ -7413,75 +7413,75 @@ "port-version": 1 }, "qtquickeffectmaker": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtscxml": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtsensors": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtserialbus": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtserialport": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtshadertools": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtspeech": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtsvg": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qttools": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qttranslations": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtwayland": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtwebengine": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtwebsockets": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "qtwebview": { - "baseline": "6.6.3", + "baseline": "6.7.0", "port-version": 0 }, "quadtree": { diff --git a/versions/l-/libqglviewer.json b/versions/l-/libqglviewer.json index 5a7e5585ee..226bf5051b 100644 --- a/versions/l-/libqglviewer.json +++ b/versions/l-/libqglviewer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e394ba82a89f2e5faa8207b21df07c9cba84645a", + "version": "2.9.1", + "port-version": 3 + }, { "git-tree": "bfaae9deb95ec0d71a5d9ba8342fd3c83c8871fa", "version": "2.9.1", diff --git a/versions/l-/litehtml.json b/versions/l-/litehtml.json index c95428e300..781195bb19 100644 --- a/versions/l-/litehtml.json +++ b/versions/l-/litehtml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "435f32b554a57ebd07186814b3d3cbb59106f6b3", + "version": "0.9.0", + "port-version": 0 + }, { "git-tree": "fbbd4d593d570ec75f5a02fea10a236aecc810d4", "version": "0.6.0", diff --git a/versions/q-/qt.json b/versions/q-/qt.json index feec86aefd..59689000dd 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b43b9441f148fedaf603d7f8a7b76912b94e098e", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "d64908d47d87b22739a8b4c144afdda8867013d9", "version": "6.6.3", diff --git a/versions/q-/qt3d.json b/versions/q-/qt3d.json index 863fea9c95..50690d2f11 100644 --- a/versions/q-/qt3d.json +++ b/versions/q-/qt3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7c8531931f5eec48995ff96ddfc254c327ea2432", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "f5cc10c2c4accb751941096cd256f8141949e092", "version": "6.6.3", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 3fb776eabd..e6575f35eb 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d44957feee30c5249b904fd1d0c03477be1ba2e9", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "d47a6e9e32f6ebbeb50ea3f696555cbcd1e9df62", "version": "6.6.3", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 64d2dc1675..89bb512d37 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06b8bf07f2430bcd6c5048eced238bac26b5d010", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "87a03a34a460fee87902a1d4f6b916028ff9dc2b", "version": "6.6.3", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 0c8a988abe..630d6a0292 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1fcf4c410373cf2d043515dc8a5163b7f5e56efa", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "988980caa40ca9abe564790f8e3b8a0e0098b35c", "version": "6.6.3", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 8e7290e50b..407c0f3b3f 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2143fc719b61ad45e2f017348969a393b243e1d7", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "7bf27086b12127afb7d280a92caa347ccb8267d2", "version": "6.6.3", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index b6fbd57c05..fea126b162 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "fbef96eaf13bdfbb0c4b787b6a76f9da2014385e", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "c9960d35216fb5615f1adb2dd6651e5f995eeaaa", "version": "6.6.3", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index cc23252c39..514a6d3606 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5534a6aeb5a5fd0cb5c84657546400a9c2a72fb2", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "96ab547ee8876c2cd2580199cb13480f81d4905f", "version": "6.6.3", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index 844cfe7f3b..1ef735b742 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a758c0ed77b654e3803dbafa3abb4597642addf", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "cc690a31803ffc300177918ac5e44450f4902f03", "version": "6.6.3", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 3913788dec..deb06ec4f6 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e05eefa831261dd71a45ef0cea2c2d3ab19d02fe", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "dc468c66aa7da560f6bdfe93afa3e6accee3a2a4", "version": "6.6.3", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index a79d024513..439e2f9d57 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c7735c31022b2d41f5e0af9e727fc73cd4146a52", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "92eee91274967994c7fae0b2373d75000fa724aa", "version": "6.6.3", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index 99f174d06f..c7ab77a6fd 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "066ff3fa9d072a8471de75a9c7711746f86f38f8", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "e685cfa8114d0d04881b563395f9b1f8752d1419", "version": "6.6.3", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 55f797462b..764742c384 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a6347a56a9c0e1fb4544e47f2a288441f1662f59", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "b5df73db4bf154ef6617aaebcd0124cb2b6587b5", "version": "6.6.3", diff --git a/versions/q-/qtgraphs.json b/versions/q-/qtgraphs.json index dde9acda7e..c99f7c4ed5 100644 --- a/versions/q-/qtgraphs.json +++ b/versions/q-/qtgraphs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4ba6a7e04f99787dc5b9d5103042660cb315df9b", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "f8d214ef5b933177b004415b57665d1cbfdfd436", "version": "6.6.3", diff --git a/versions/q-/qtgrpc.json b/versions/q-/qtgrpc.json index 08154c1280..138c602f5b 100644 --- a/versions/q-/qtgrpc.json +++ b/versions/q-/qtgrpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf3f735ecbdb3d211b1a52d67878a520c94d0403", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "2e78f6a950d9e7fd3f77b05e5e9c217a1d57a1c0", "version": "6.6.3", diff --git a/versions/q-/qthttpserver.json b/versions/q-/qthttpserver.json index b4a33c4c26..7d78197f9f 100644 --- a/versions/q-/qthttpserver.json +++ b/versions/q-/qthttpserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c87d262931a261de01ff88aa103a1e043bdf5a70", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "43aec59b916d6d6413b9dd518ccbbc14b2f739e4", "version": "6.6.3", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index 203d3d81fb..28bc7dbe0d 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9abe1d0a6b86b45eb8c0732fc62b78b8973b9b51", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "dcb85f48b2b168f16018e98351c0b60b785c63a7", "version": "6.6.3", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index c71e638d9f..970877e379 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f42b78256d78f322fb0a0a053c7704b9cd9702ab", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "905edd3e5b8e6003f183657e07b0c54e067d0dfc", "version": "6.6.3", diff --git a/versions/q-/qtlanguageserver.json b/versions/q-/qtlanguageserver.json index b1c7d33010..a0be7f3601 100644 --- a/versions/q-/qtlanguageserver.json +++ b/versions/q-/qtlanguageserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "005e513608d94c53c277371e5603573ad5ac761f", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "481338250ac514847b73d501c1f6976f063909ba", "version": "6.6.3", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index c1e1155a63..2ec0c4b90a 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e6a04402f28300dd168bcbe060c36ee9f8c3b809", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "c4e965f1a56f4eda3aa70bf6aeef009bec3d58bf", "version": "6.6.3", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 31dc03eccb..48c52858df 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7fae04dfb5b4dbd6515059e5cb4d3c49e68ce03", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "55406afa21292d11c495e44b498f44b8a11752f4", "version": "6.6.3", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index ad9a52aa72..13141e4661 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2da6398d1756c14c3469d088434168a2117a99d4", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "7b93336243e5c877a78d038bfb3abc78442f1937", "version": "6.6.3", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 525378d8bf..14a098d451 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "36765211a0ab3857e4d483a72a0d8a19027286cf", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "ea0cf05f959059e2b7a88758b8c45a532b640816", "version": "6.6.3", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 6b8fd2246e..c956d1f50d 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d236629382d95c0e6916d99d736676624b7590fa", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "ab5674a39287b919b82d8170d2eda61eb57b7258", "version": "6.6.3", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 9910f408ba..c70d634a0f 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6ccc54814fa0de5f91425e29f2258c96e42e48cb", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "40a769271c4ab9a812546083a73bfc752361474e", "version": "6.6.3", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index 10d846b0f4..7c48d01fb8 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "51005f6846a15b618957bd166832cbb7136ea966", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "bab54dd1f7a3a62a3301c014fdb429f2a74ca962", "version": "6.6.3", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index d442c99fa5..de0a99449b 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "147c5f1ed97c1e49e4613896c87cbaa46ee072dd", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "d632771b2f8dba669e9387e000ac6f04b6c48ba6", "version": "6.6.3", diff --git a/versions/q-/qtquick3dphysics.json b/versions/q-/qtquick3dphysics.json index f839b25149..80a8da4a05 100644 --- a/versions/q-/qtquick3dphysics.json +++ b/versions/q-/qtquick3dphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0dac3440b94cd294030abe5ed8bad54d3424e282", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "4a72ed3f8b0f600afc2c30a5f0e94b03150a3ea5", "version": "6.6.3", diff --git a/versions/q-/qtquickeffectmaker.json b/versions/q-/qtquickeffectmaker.json index 0ba3fb0728..e65ac6214f 100644 --- a/versions/q-/qtquickeffectmaker.json +++ b/versions/q-/qtquickeffectmaker.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "baf37c060ae3957c4341cf27cf89fce5f99770a2", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "d9fe3a80ad4ed31bf0e40b10c243182d5dd1378d", "version": "6.6.3", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index b94881f7b9..a5dd53259c 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71e2abff296b873154d58545db18f2a0de441a8f", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "9f6b2ca815ddfd294d71477615935a4d59cb24af", "version": "6.6.3", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index b74f48eab3..307357370c 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57ccb94acf0107e957028aeee1050b58f0d4f590", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "702763deba82ce4e079b30ab3d5b0114f24d73ee", "version": "6.6.3", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 2dc50638d3..b00c535357 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "02bc794d25e33f277c7593addc1523f216630491", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "7dc2d939fb9a7b606646b4d8d17fee763be5e7dc", "version": "6.6.3", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index eac1e39c97..c6c64e7b06 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c5e35b91c7054b6432bd37137e4b2a05dba1ca13", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "dc0bf9f0f3db4e86a81fc0cbf52deae4857796ef", "version": "6.6.3", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index 403ca48bb5..28459f9435 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc7a8d6eb48940b5165aac93bf981c2971370ee5", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "98fdac4e26d4a958aaad0dc7454a78f491769a60", "version": "6.6.3", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index 5b3228cdab..b3f5c9146f 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96a632c2073454232bdc68f415d8a8d0145af9ff", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "0529003d90927ba4744788bf374dd7e67f48d0b8", "version": "6.6.3", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index 4ea8247287..117b738fb3 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e24ecbe5c79d5146cf9c87fb444e6e16fdf435c8", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "1a011695b22cea90365b2699610b37da653c284c", "version": "6.6.3", diff --git a/versions/q-/qtspeech.json b/versions/q-/qtspeech.json index 1628bdfbec..fb532f2395 100644 --- a/versions/q-/qtspeech.json +++ b/versions/q-/qtspeech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec196949a1f05c2fc567426a298954e26543ef3b", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "fc48952cf4ad0b5f6ae4bd0855c76a7cd57e73e8", "version": "6.6.3", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index 12178093de..a2623b99b1 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3e700d8443cc4dff407ac2d39c9f0a8b9ad1a73d", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "369512ededdab226c2f1011bf92282c6749b86d8", "version": "6.6.3", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 0f7618a085..cecd9c6f8c 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db60b03c6a66d957671dbf1ca32f996ccf80633d", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "10ad98aeb63f7e702be20eada46f84ee357759ef", "version": "6.6.3", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index cadd711c4d..fc744ba8c2 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7cbc96fb9f79ad3be6a1e072daf10eb1670791a6", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "513a9a9d2261ab27983847d17c342a878f5ee3d2", "version": "6.6.3", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index b135146cd9..67f95f6966 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "587f852a33aae5bc30d1f0add8b74671469d36a5", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "80193312ec25a6d60fcec32e030db473f8408a02", "version": "6.6.3", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 3d0fdc8cb6..dcfa0c5e4a 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd707e68a11ac8c4dbfa7b154e665cdc5dea69b9", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "80da6ef128756631519d2d40895ee6b124bf0964", "version": "6.6.3", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 54ca315e52..143c7e8f82 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5ef675d7bb6f920135408059a4410d1eef62d911", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "9da1b60d118f8edd8f269b97975c8149844cd79c", "version": "6.6.3", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 2ed93f5b1e..3bc509f7e7 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "100603c883257132007e43ace417903c75e99d94", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "7955fe453030ad4695afab8a16453942d3eaefd1", "version": "6.6.3", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 87b5d42acb..02e4aecc8e 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09b4dcf0f7ca43aa0d204d1d01fd714bf4faf12d", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "5b113382b41894bc2e7cbbb1a70cd3435f8cfea7", "version": "6.6.3", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index b0ab8e3209..c07dd78876 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "744b3381bfe8505c8a61b91fc54fb77fcdc77ba6", + "version": "6.7.0", + "port-version": 0 + }, { "git-tree": "f794aa180866f54f516edf5845049c47db72a436", "version": "6.6.3",