diff --git a/ports/kdstatemachineeditor/portfile.cmake b/ports/kdstatemachineeditor/portfile.cmake index fcfc30d32d..2df9a6823d 100644 --- a/ports/kdstatemachineeditor/portfile.cmake +++ b/ports/kdstatemachineeditor/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF v${VERSION} SHA512 dedd7166f434689cd5acf4ee3172169d3f77182269d3187f0a7a12966467dd5c7733e3ff64cd1fd03b0f3866c2aafa37cc3f2d7b8a3f4a5d8a7592da039de7af HEAD_REF master + PATCHES + qt6.9.patch # This is already upstream ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" VCPKG_BUILD_SHARED_LIBS) diff --git a/ports/kdstatemachineeditor/qt6.9.patch b/ports/kdstatemachineeditor/qt6.9.patch new file mode 100644 index 0000000000..95ef2f12b1 --- /dev/null +++ b/ports/kdstatemachineeditor/qt6.9.patch @@ -0,0 +1,22 @@ +diff --git a/src/view/quick/qopengl2pexvertexarray_p.h b/src/view/quick/qopengl2pexvertexarray_p.h +index f80975ed..65058333 100644 +--- a/src/view/quick/qopengl2pexvertexarray_p.h ++++ b/src/view/quick/qopengl2pexvertexarray_p.h +@@ -80,6 +80,8 @@ class QOpenGLPoint + operator QPointF() const {return QPointF(x,y);} + }; + ++Q_DECLARE_TYPEINFO(QOpenGLPoint, Q_PRIMITIVE_TYPE); ++ + struct QOpenGLRect + { + QOpenGLRect(const QRectF &r) +@@ -96,6 +98,8 @@ struct QOpenGLRect + operator QRectF() const {return QRectF(left, top, right-left, bottom-top);} + }; + ++Q_DECLARE_TYPEINFO(QOpenGLRect, Q_PRIMITIVE_TYPE); ++ + class QOpenGL2PEXVertexArray + { + public: diff --git a/ports/kdstatemachineeditor/vcpkg.json b/ports/kdstatemachineeditor/vcpkg.json index a8486d983f..6111c03a2e 100644 --- a/ports/kdstatemachineeditor/vcpkg.json +++ b/ports/kdstatemachineeditor/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kdstatemachineeditor", "version": "2.0.0", + "port-version": 1, "description": "KDStateMachineEditor is a library for visualizing and editing state charts.", "homepage": "https://github.com/KDAB/KDStateMachineEditor", "license": "LGPL-2.1-only", diff --git a/ports/open62541/android-librt.diff b/ports/open62541/android-librt.diff deleted file mode 100644 index 06bd9f084c..0000000000 --- a/ports/open62541/android-librt.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/arch/posix/CMakeLists.txt b/arch/posix/CMakeLists.txt -index a53c9f2..badf1e8 100644 ---- a/arch/posix/CMakeLists.txt -+++ b/arch/posix/CMakeLists.txt -@@ -23,7 +23,7 @@ if (${_index} GREATER -1 OR "${UA_ARCHITECTURE}" STREQUAL "posix") - if(UA_MULTITHREADING OR UA_BUILD_UNIT_TESTS) - ua_architecture_append_to_library(pthread) - endif() -- if(NOT APPLE AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")) -+ if(NOT APPLE AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND NOT ANDROID) - ua_architecture_append_to_library(rt) - endif() - endif() diff --git a/ports/open62541/android.patch b/ports/open62541/android.patch new file mode 100644 index 0000000000..3c25618688 --- /dev/null +++ b/ports/open62541/android.patch @@ -0,0 +1,17 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index acbd6b4971..1ed8cb72ab 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -495,10 +495,10 @@ set(open62541_LIBRARIES "") + set(open62541_PUBLIC_LIBRARIES "") + if("${UA_ARCHITECTURE}" STREQUAL "posix") + list(APPEND open62541_LIBRARIES "m") +- if(UA_MULTITHREADING GREATER_EQUAL 100 OR UA_BUILD_UNIT_TESTS) ++ if(UA_MULTITHREADING GREATER_EQUAL 100 OR UA_BUILD_UNIT_TESTS AND NOT ANDROID) + list(APPEND open62541_PUBLIC_LIBRARIES "pthread") + endif() +- if(NOT APPLE AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")) ++ if(NOT APPLE AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") AND NOT ANDROID) + list(APPEND open62541_LIBRARIES "rt") + endif() + elseif("${UA_ARCHITECTURE}" STREQUAL "win32") diff --git a/ports/open62541/clang-sanitizer.diff b/ports/open62541/clang-sanitizer.diff deleted file mode 100644 index c5a97e7864..0000000000 --- a/ports/open62541/clang-sanitizer.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2c1e4b1..21182cf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -759,6 +759,7 @@ if(NOT UA_FORCE_CPP AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID}" ST - - # Debug - if(BUILD_TYPE_LOWER_CASE STREQUAL "debug" AND UNIX AND NOT UA_BUILD_OSS_FUZZ AND -+ UA_ENABLE_DEBUG_SANITIZER AND - "x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang" AND NOT UA_ENABLE_UNIT_TESTS_MEMCHECK) - # Add default sanitizer settings when using clang and Debug build. - # This allows e.g. CLion to find memory locations for SegFaults diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake index c2e3963606..d69cefea8f 100644 --- a/ports/open62541/portfile.cmake +++ b/ports/open62541/portfile.cmake @@ -2,11 +2,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO open62541/open62541 REF v${VERSION} - SHA512 a6493a96e911e4b67dd017125eedf6f3d794a8c931d897e3fdd050a8e65c20dcb84e9dfad207d1fcec6d2f019ad406954d1711827a74c1665fe24cc32f3b019f + SHA512 637f662a38b4d09288bbf9fc5cce3c3c8711a90a4afe570ef85bd30437353208a2cabc0e5a8edaac453e1b7b50ff97ce4757b1376ec1be248066cceda6362257 HEAD_REF master PATCHES - android-librt.diff - clang-sanitizer.diff + android.patch ) # disable docs @@ -16,8 +15,6 @@ vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "include(linting_target)" " # do not enable LTO by default vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)" "") -vcpkg_replace_string("${SOURCE_PATH}/tools/cmake/open62541Config.cmake.in" "find_dependency(PythonInterp REQUIRED)" "") - vcpkg_check_features( OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES @@ -48,6 +45,10 @@ vcpkg_find_acquire_program(PYTHON3) get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY) vcpkg_add_to_path("${PYTHON3_DIR}") +if(VCPKG_TARGET_IS_ANDROID) + list(APPEND FEATURE_OPTIONS "-DUA_ARCHITECTURE=posix") +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS diff --git a/ports/open62541/vcpkg.json b/ports/open62541/vcpkg.json index 94bfe9f3fc..0cd1b96630 100644 --- a/ports/open62541/vcpkg.json +++ b/ports/open62541/vcpkg.json @@ -1,12 +1,18 @@ { "name": "open62541", - "version": "1.3.15", - "port-version": 3, + "version": "1.4.12", "description": "open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.", "homepage": "https://open62541.org", "license": "MPL-2.0", "supports": "!xbox", "dependencies": [ + { + "name": "open62541", + "default-features": false, + "features": [ + "methodcalls" + ] + }, { "name": "vcpkg-cmake", "host": true @@ -34,7 +40,15 @@ ] }, "discovery": { - "description": "Enable Discovery Service (LDS)" + "description": "Enable Discovery Service (LDS)", + "dependencies": [ + { + "name": "open62541", + "features": [ + "methodcalls" + ] + } + ] }, "historizing": { "description": "Enable basic support for historical access (client and server)", @@ -50,7 +64,14 @@ "mbedtls": { "description": "Enable encryption support (uses MbedTLS)", "dependencies": [ - "mbedtls" + "mbedtls", + { + "name": "open62541", + "default-features": false, + "features": [ + "methodcalls" + ] + } ] }, "methodcalls": { @@ -61,6 +82,7 @@ "dependencies": [ { "name": "open62541", + "default-features": false, "features": [ "methodcalls" ] @@ -70,6 +92,13 @@ "openssl": { "description": "Enable encryption support (uses OpenSSL)", "dependencies": [ + { + "name": "open62541", + "default-features": false, + "features": [ + "methodcalls" + ] + }, "openssl" ] }, diff --git a/ports/opencv4/0021-fix-qt-gen-def.patch b/ports/opencv4/0021-fix-qt-gen-def.patch new file mode 100644 index 0000000000..ee4124f31f --- /dev/null +++ b/ports/opencv4/0021-fix-qt-gen-def.patch @@ -0,0 +1,13 @@ +diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt +index f0a668e..6fafa33 100644 +--- a/modules/highgui/CMakeLists.txt ++++ b/modules/highgui/CMakeLists.txt +@@ -125,8 +125,6 @@ elseif(HAVE_QT) + endif() + + foreach(dt_dep ${qt_deps}) +- add_definitions(${Qt${QT_VERSION_MAJOR}${dt_dep}_DEFINITIONS}) +- include_directories(${Qt${QT_VERSION_MAJOR}${dt_dep}_INCLUDE_DIRS}) + list(APPEND HIGHGUI_LIBRARIES ${Qt${QT_VERSION_MAJOR}${dt_dep}_LIBRARIES}) + endforeach() + else() diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake index 9ad3810735..2c52a4c1aa 100644 --- a/ports/opencv4/portfile.cmake +++ b/ports/opencv4/portfile.cmake @@ -23,6 +23,7 @@ vcpkg_from_github( 0017-fix-flatbuffers.patch 0019-opencl-kernel.patch 0020-fix-narrow-filesystem.diff + 0021-fix-qt-gen-def.patch ) vcpkg_find_acquire_program(PKGCONFIG) diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json index 560b79e3d3..140f92510b 100644 --- a/ports/opencv4/vcpkg.json +++ b/ports/opencv4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "opencv4", "version": "4.11.0", - "port-version": 3, + "port-version": 4, "description": "computer vision library", "homepage": "https://github.com/opencv/opencv", "license": "Apache-2.0", @@ -165,7 +165,8 @@ ] }, "dshow": { - "description": "Enable DirectShow" + "description": "Enable DirectShow", + "supports": "windows" }, "eigen": { "description": "Eigen support for opencv", diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index 384774054e..7ec9ce2225 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qt", - "version": "6.8.3", - "port-version": 1, + "version": "6.9.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 4eaf820af6..6ec5feb458 100644 --- a/ports/qt3d/vcpkg.json +++ b/ports/qt3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt3d", - "version": "6.8.3", + "version": "6.9.0", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "license": null, @@ -96,9 +96,17 @@ "name": "qt3d", "default-features": false, "features": [ + "render", "rhi" ] }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "vulkan" + ] + }, "vulkan" ] } diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index a0ee1af528..6348094060 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version": "6.8.3", + "version": "6.9.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 d140010145..df846b4bae 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version": "6.8.3", + "version": "6.9.0", "description": "ActiveQt", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtapplicationmanager/vcpkg.json b/ports/qtapplicationmanager/vcpkg.json index 6c46454a45..40809ce617 100644 --- a/ports/qtapplicationmanager/vcpkg.json +++ b/ports/qtapplicationmanager/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtapplicationmanager", - "version": "6.8.3", + "version": "6.9.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 254593037e..91b0f0c39f 100644 --- a/ports/qtbase/cmake/qt_port_data.cmake +++ b/ports/qtbase/cmake/qt_port_data.cmake @@ -1,48 +1,48 @@ -set(qtbase_HASH "ef364f939f23b622f67d21833c2dbf1fb74531d9a1e25b6d2e94ea5d747a40f20c6c3a24abef1e9710287366b7cb54dd090350d315601317779235c20743cc81") -set(qttools_HASH "77141b310f63932678f28682c490ccc75776493994d96582d546545c17937605efac312c008c75fda991b78c369320d0a2c4b543b568a459cc90051d1ed2b9da") -set(qtdeclarative_HASH "75c9fdc8ba26ef95ae8ff0c82b18589b74d7ff3065e86e5bd8427bc36336e569eaa22fa07863f99d0592eec0c1a69c3409c7b3941eae14361ff523c058e56084") -set(qtsvg_HASH "213af7fdf92fb64c9b824dbe044f51d89e661ccc02c17cf109e65b962a7b1de84c71e1b1b58d6cad0cc9fccee80b97efe9ebcab3491b478fb9b64bcfd33986a4") -set(qt5compat_HASH "e049508efda201e5d12a2dc0e023fc096611b18810f695be213a26bfbf8cdda1ae04c353c2a8b9be0c30b014e3d4f9280921acd1e8ec3834cd309143de82f570") -set(qtshadertools_HASH "5f326bb097e09f9f9259b550ccf5fb05634d748eebf8b8c416225e3cd328c2b532c764a41b98a4d47633be446edaeaa3d4e5da1f4951b31e3da6ddc4392a47fc") -set(qtquicktimeline_HASH "3f9aef0eb8b495cda9bcab22e7f544e9dd1894e556e162654c87903406cd3c73820f54a543bc3861d49c7863d2fc8d92f79bb8e90cdcc23a99cf64bbeb816885") -set(qtquick3d_HASH "5a5c04dfd1581905fb0b40cb35ef9e7370ffaf451287d84a9d444c0871f495ecfe59c8ab15cacc8e7314af45c16598fad5e63cd9466384c5ba245ad0c28315f2") -set(qttranslations_HASH "d5df6136d3f66c93c0dd6d98c7a467c8b939d7bf5c90b5acff69262163c1e7cccc0c4f2f83b5ef06179601578b4a109f2f0c76c3897a31d3fb2567995fc55328") -set(qtwayland_HASH "2edb6d3e85c06bcf689c3acfcc38b6ff0505569dfeec8bfb5a434fad563087ff917875ea56e639405af3cca8adc98206ab9f68dfaf8e2449300d010ffbb16699") -set(qtdoc_HASH "839fbff235f67ade032f25120fbd7f394d272bf752dfe982c202cb8b6cf411a1bc949f5035b2c1062468e40632b2061ac611c771d35567dd5970b013ff2090f8") -set(qtcoap_HASH "ce51ea39b7946b85cacddd3ebfe3a92615f31b032a779b799113c1e97aecdd3906e4fdc066296b0c0a369f4a023df4c951cc18dd47d2713e173118f2bd055cff") -set(qtopcua_HASH "ac11aab0f9333a4b666c9c523f5d74140bd52e236ed14cfce3dbfc030516b1cc654761048a7fd9e4238a9f1e0e47a72c6f2f8e98173f27042c6cdbb348c8d6d9") -set(qtimageformats_HASH "174bddd49dac507b7a2c9f1e1f7b384bff9ac515891ee49fd72acfa944b503cf5bd26acf388203e7d14b1f147b07ccbc2da992f71d51b7a18151245efc53a3a2") -set(qtmqtt_HASH "1934405a8e6b7188ce710e89eaf7ae00f1e1516b803b773ec95b962368a8da3967bac29dfe2a4377a76d0f8b9bf47599f566d7130eff311f38af2041d0c40a88") -set(qtnetworkauth_HASH "8f9f25883534af6ce7029a6c96501de3e944c8c6c3021f185c3a932653b4e4c40b3a0f8bc210d3ee175b690721a99b3d42de2f6fa9d1dbd1b730abf22fc48455") -set(qt3d_HASH "8316fbe5a39bc5113da4759e195a55c57d8340021a39576939c0a4a604f47b4edb3c0206f914d4a3177ff09471d1f3475ffc4c2fa935ed8d98a166e310bc78b4") -set(qtactiveqt_HASH "d49c16f4e055bcf389c719ae0e33a6ae0ef54f2433211f14864774c3694f82361783d18db6996b6f5abd52f5ac7f791b0eab015c946ceaa3ddfb9ef6abf64f19") -set(qtdatavis3d_HASH "a5d0cf5c223a5baa69dc7fc59b131eb3b971dc3701d20e81bf7e86ccb6e8f4d20a82079e514d1269091fa014896167d52912e3940210fd546a8a55439c75509a") -set(qtdeviceutilities_HASH "b32222c52169832a30a1d6bf0b19e5adc15bc9b1c7c12e4613ea73eba73b00528969f8a87830d0a9bf61663547ff263e2e0d6e5f4bc37b8624c3f96d9cbc51b6") -set(qtlottie_HASH "c663b830210359bd738a3ab2ae84d956646c249e199acac194c1ec725b3eb1acb2392eef0a9b252e8ece0adad104932d4f7207903e49ec041287618d3a6f9894") -set(qtscxml_HASH "c0138fc338b2d12fb4bcbba2c852b44e4257c56850f22af46d452871fb9bd9465bd824d86cd7e7772ef62b8ed48515790b496e1e873aa335deae8e25789cb4d0") -set(qtvirtualkeyboard_HASH "a128c8210eec799d81c76b20e32e3c09ccb345d822b5c59b1fbf0960a1e2bec50c43140d86aaae9419a1fc514fc3e14bd283f612bf9133676db1a21e7217f528") -set(qtcharts_HASH "84b372c8b52aea580b2b9727775753345affa80b73e0be843e65f7331bb809187d7183d93fdaf543197860210bc4e006f3a707663a160cf8ae05b37871abac7e") -set(qtconnectivity_HASH "5508f3fc57679a4f986f430dcd19c5da15af663a677d27c9cc6aba81629f4a6e1954be31c5d2a44ba22366d7731ff105d2eaa3a0565b3b02baea0f498c547733") -set(qtpositioning_HASH "8899b4bf8096211fca37f7a7855ae2c6f79d770602105d76a98b580ad8e2f2f55096095bd7f935f6f9ac36e23135e7594cf3c2e5b760c979560a108d43d57784") -set(qtlocation_HASH "c7cbd76b6b8b7d09387c7da0e6630959ae66f0c8af2cd26b255e86ec36c6efeec59e4af7b34faa05f2fa035d4dd075d13a8dd0bccaefac48d391b4fa786769c0") -set(qtmultimedia_HASH "2f001888b44274583dcd5bc6f467cf18efbb1a711f29d6baf354071199772ee49d835922f2fa0e9770898d42decddf04b379d8f05d1dfd923c5f9d58e3c7fcd8") -set(qtremoteobjects_HASH "5845afc5ea4894fa788ce07a89348bd5027c0cceca65dce99a6bf437b396c71f25e8e7374401c8d10fd88be2303766c6df29b62e826f4d5ba38971a042dd7b06") -set(qtsensors_HASH "88e9277aefdc609bda881cb836dfdc04d29a32a4e09998d67e2ebe7ec6f94aff508fb39c2b624f00bcc85ddccd61bb5ed3ffcc953dd28d00ef559d50e6104ae4") -set(qtserialbus_HASH "b0ce725382c15048913204e6173dd899af6f8233ff3a098f497dea6a3d9d2cd436ad7944165398fba59f92098f7e38e7c3c5efa47a7ffeec2bf3a464ae9d4539") -set(qtserialport_HASH "343537aedd9c84dd5d6889d45babff181d7ef05927fd9cfdbb9389066f8860e2522bc059ca2c5c9af4c88bca255e0fc40b5eea84b93c970123a94afc803a638d") -set(qtwebchannel_HASH "156d3d1f7e1a0b0df8c103db010cd8e40717e6fcf27dd20c27ca22900ae377a8da8bc86a9ec1d65765defb68032469415c345a571e9a3dcbc3919603972d01d6") -set(qtwebengine_HASH "01e8988c76ff40ca5e38f76e90791d7ef708c29f2e9f8e83ca8604b6335fbecdee71473678a63633ec1edec85088256b20e56a618ca95748ccbe1e7b9673c298") -set(qtwebsockets_HASH "7453c6657e9885393d57df3ebaf9d3ad12237b5fb848ac3547cc6c6ed607562d58564667a7fd10133d4cdb94151aa5c21660e33c7f48f01a4061001a47f85b60") -set(qtwebview_HASH "af16c85d76e55e3c39c747995b3c46354efe5f5a3e111df36f9b169ab8fe3ac878cfe223ee47aef9aa8bc302c7383fc9b1f9682c63034e42def3714b28a0aabf") -set(qtinterfaceframework_REF "373322fc654e875cb56828de554dfdda96e9fb4e") -set(qtapplicationmanager_HASH "7d404ac3f98d29004009d87996779a0c5c86b976e864257cd3a9018d84db8bc07bcedc74f0b15443f90b487d2229fdb7b80d1ae082b0fc8dea30f682b58cea1a") -set(qtlanguageserver_HASH "8b55a3558de28d6c2c61bf52e8f10d1a67cc6890fdd3846db99f6c766fd22fef1793687b88b146f5a64971d60eef4357409b893c91310d1b9abec883ab35c2bc") -set(qthttpserver_HASH "4e99164e285ed4e8ae64a4af2c717fc22a7b5934ac5a78fe3adbb04e29109d1294e9917aa089b9cb9e5492bdf7fad4888c837374c2fef691ea7294bccbe7b01a") -set(qtquick3dphysics_HASH "e8948f84e337bc4c496ba67f047c809ece8d74a3d2af388227c902b765a1d2969f86be2ebaaa89f271c4b73d2cf5151a4c488ff7dc4f4a965d5f6a4de052784a") -set(qtspeech_HASH "6434ccf743604bf4ac4bc31b26c7dbc7f765ec95174f0d9047bec822292f85e6b21ace825b52ce60bd388d9c333d427b206209f78c612782701567bb7d271e6d") -set(qtgrpc_HASH "488c7e6a20cd9c267b44923c317e545e71543f68153228a4fee1fa9c0a2f6d3e212db9482962999bb80e87313a1a851b787759852089f17dca8add7040627c55") -set(qtquickeffectmaker_HASH "cdcee80a0bf7347ef9b63acc277ce6ef134128ba56f247008803d9444a9e0713e23205ed0f9ecf2b7752d82183acb471a2589c8b0ec914259a22395f94755bfa") -set(qtgraphs_HASH "c1803e68e065fc4ed7de68e65f5dc86a0b926768779c0de57a7f4af46506f019c27d47095f87eb1516011868262d6654817c478e130739477658a3dbcef2fb35") +set(qtbase_HASH "f19a331725c8a1cddb52864fda6669a8aa4a394c3d30b4f7c763b398c9a4dd86a25e6d7bd9615081c61e05f5d98ed54c35c2c58d2813019f9609a4aa53b5924e") +set(qttools_HASH "85f1a1e30ec639d5c5ac1eeea6372b2da632616e5b45911ca03846686e8329a1e00e88fe04a44621c48cb68bbabd9680e23aa52b418733166d79be393db5d6a7") +set(qtdeclarative_HASH "51f216af71019d845b19e675d7eb8e11d9ab6a8b5f254fe31db4d0f0033272ffda053e597792447045bfc4c9e111a08d19eb4b85e1b401b0242b03b0086b2755") +set(qtsvg_HASH "23c061ca4b51e4475624e38f7bb233a8732b66402445c9069ccefd7f2a14f62e8f60890facbf16de0272075eb76c4e44fe773ebeb144272bec997a8668f12d00") +set(qt5compat_HASH "73857572bbb1c464795052da4f27e33ea28d35ab006daccf08d79adb7474abe7bce8d112baabdd3a889efe4fc2dcba93c20284908d6917d285e85e784badf882") +set(qtshadertools_HASH "55337332673f8735672a95132ad5ada8546e1ef8af5f2ee390fc9b4636b2ef148dc8befaf4089709342d7cb7dcde98e7ecf3c61978b62d2fb68898c3b0ab42a6") +set(qtquicktimeline_HASH "5269253aba969adec9f6793ce14e3b590636e5676a19559c4b6ca78636156c9a6b421389da254af68ed08b1a49ff54efc444d7d5466962af191074a9a228ef1d") +set(qtquick3d_HASH "b0f45e7482d31f791dc069ae3c1facbb0ec3eda24704e2a157580e87939bbfbd269910dc4e5912ceaad40a99f96c5e6f4b5a8da1385be213a20cc68e9c86d77e") +set(qttranslations_HASH "c91d97525bea1b9052d80ae8fe114503acbc83bf9e310446cdfb69b7fa167b64150fe14027072f3981b1b3a8bc4aab67e4c47a038ba6d49aa96933296a11c46f") +set(qtwayland_HASH "a5e8af98030030b34f644bb963d8e901017c17e21f892bdd2d99ddbe9664a1798f6e216d4f56f748a143983c1565a7f40900059facc623409fa6098f34d0c1c7") +set(qtdoc_HASH "b101069db65d2e1aa97157d199adb90ba095a55cbd9daedc6663a97db8c3672c51ad2750fc0dd62d722f2c98f48123eaae58ea4cd006e995b1843c7aa7c88bc4") +set(qtcoap_HASH "85c4ebca9031767a84fa4a7e216077fecae19bf352ecdb2cbda18342eef4771ed5a37ec0c645dc80b7b7a21821012c941cdc76c5ffee74a74c007d390f495e61") +set(qtopcua_HASH "303230cb21b9e7e9f4eacd1f59ef9b11a1a8b4754e78aaf1e05e703f7d7fb501a5fb27d062dcee0f7ffa42fac40775e642eca7c4a3b84bb3e92ef565f509ea38") +set(qtimageformats_HASH "0b4d3f66974090584472f3bcc88c64d10569c8d6aa8891073b3807dd23ab910022deedc4a9488eb96bb240bde8bf87c7a8458c059557533070d619ab0b612fab") +set(qtmqtt_HASH "0aa34daca69b158ef1f67022b67eec856144b2a820eae2e04ad7e11276541dc3127232936b4f5f3d4c0a84f0f5b450a731a8247003f82435410b73fe8edb09fb") +set(qtnetworkauth_HASH "f857d0dc6805a903fdc05cd4e9993c0de1a7a9115c4813a0d9e6bbf2d97e027191b1407b2da65202355aa6a31e5f63d06ebdb86384eb54644476632c64fba184") +set(qt3d_HASH "f4e7d5d2f7615447b2283ff7dd04d9cd21110e854c48271b343e2ed196843c73b72c2649641c30b386b798b1dbab4df6494eb40f7c7b009a9eac921bc39f85ed") +set(qtactiveqt_HASH "0d50fbb50e648ad163234bd9c5354148125baec61104fe2bfa205eb289e4f0576e8777e850d3432c936c0f11bb94d4650db39612e280fb0d24ee51c15e40c757") +set(qtdatavis3d_HASH "cc07530d46e3213321f783203cfbef8ae4104087ac6b8b7072a747a4e97f7fcdcda157a6202081dc7917443519a5e53431c426761dc0e105f795dcf96cd7375b") +set(qtdeviceutilities_HASH "1f82e7fed4cb842e269d2bb492fc2c28f3a2969c66e8bc25944b47000660717fffb2b116d5ca08154d975b3519e59cbebf59f49f6bb6e3606982dd4573dd9c11") +set(qtlottie_HASH "fbaa8d9ca8937aa10ed6f7a8bd82f8a193b457220f76decd580d36cf34b50da7341121948e48813ff13590f2b58931b88cbf44f8a2e932d042f559519c41e91a") +set(qtscxml_HASH "b373ad5eba0486d075a17b47cf135c6c4ba5c3e42809dfa269d1133b9fa901a416f2d49c09bf1766fc8f2a6527c6d8d58bcba9d4bd010ec36a88138f6ae0d313") +set(qtvirtualkeyboard_HASH "f480207b0066da46fc3adca66262c74f604e14b3480c3ae26f21c419f6a9e030043c31117ca04d749cb5cbdc4452b83a42e9ae784c8ec5d8809ce8773d2d76cf") +set(qtcharts_HASH "5ef99f1f48df7c75e55a4e1b80844d7a9bf9e5c14ba496b76c1e9048230913692a1d9f64bf43d8aa87184081dc4d12fa5bccc8ab7703311b034bdda586479ee3") +set(qtconnectivity_HASH "710bb7c9d3c73d92a784e4a9d81dafd5eb0669d1ab14066c424e2075fac8e30fd4e2f0e6d7b82a8fedb14cca03412085241a9737a6adcdc88c1dced49eaecf82") +set(qtpositioning_HASH "1bcc292590a9d586695708f210eb8a10bd04670a1bfb79eb2a05ce826e1dda57059b06a4da319329bdd3bb974a3d2e4139e6948fa7168ac691e3454989cde8bd") +set(qtlocation_HASH "08a6b6af91d4c208210f8f28f7aa0f14831ac54e60bf695fce128fcf4dc9b36e403d360597fad5bdc81c729898e1678f4155d02ef788171e4f5622cbb16b25cd") +set(qtmultimedia_HASH "0fb5e1ae3286a903dce225aa81033a3036d5c6457e6704b4265cd9c3e3a47fca6c0ff8cdb004e5c563c5b2a5a91e217733299a8ed8dec951a0fb9c30a2edd52a") +set(qtremoteobjects_HASH "b8abfc7b9c37a4777e2a567a6d1e00359f5c2ea165a1d97ca9f644b0612192534f28c140a62185ec410a5cc537d729e6af955034f2008739dbc6e9fbad1fec41") +set(qtsensors_HASH "ee257c82ef8b175b3c8e0f6738d2c4e745bd5e5863ca5845921c3b67939d85beddfa0b9f9747fec93eb10cc960e9d5eb33a62bd20d637ee5f7c596801c775cdf") +set(qtserialbus_HASH "2b422b514d31ceef7741c537043db41938bdb31a2f7202b145e176db0d39b338808954966c8cd88a04e6cbea8517dee15ef562c4b64e896bf73f51c34db69c4e") +set(qtserialport_HASH "c491181a8e8b6f61bb69cfab314ba6380318907601e9c3477b324e2978eca58bd7fe75d6e68b4945efe20f81048ad230a5b78921af017150d5248ff7356b73a4") +set(qtwebchannel_HASH "37d72a0382d3a92f37dfbdf55ab1824b3ed1be313543da6f71487ec4b132cb9ee09243d1d8e09c80696c8bad147af80428232c70f496dc11e39fc0512fbacd1b") +set(qtwebengine_HASH "a02a54544250492e343e487c7a0aa53577ebe9cb54e58e8042de8fd9c79304642f8d78fde61f435475c9e41124572776b5a76c2115168450e7b146e3b6b8e051") +set(qtwebsockets_HASH "64627e7a2fd83077cd93a30f3ef68406bd3059ec8dd9a636c50f73d47d142c5d5749a1b9b335082a51ff1b3eca73a24f423382bbf29c5ba854db6ad813195bab") +set(qtwebview_HASH "14655d14877739c6103347f6f1471e2ca4f8c473ea899f4c6a14edef1147edea4b9fa21073b9d6622ed6d336644cfa4b0f4b504e55e302b6199a665dc59531fc") +set(qtinterfaceframework_REF "85e11daef39ccdf9bcf7d6eb5c28217945f3bd00") +set(qtapplicationmanager_HASH "c57365d68b1febe6a8f87dfb7dbc4f11714b6eb7f07e068d3b5195b78fa85e17cb90526764a38f32a055dd74dca88cd535acb862d7ac54c420aca876cd15607f") +set(qtlanguageserver_HASH "f487e4fff6af8e0309c27c069a405bdac7f49a947d1e29e08f7a26ffcc9655b40603f66b6aa80ac20cbf32f1752df6d396211c456dd4e5801c5e2925b386fd72") +set(qthttpserver_HASH "87679c45424dec8d860d4f21c26c7b407a1239a5f2a4479a2543b35d4f52b5edd8fd7c53b4b6f7e64f6ca5a9ae18b2e6a89d24836307f9db37856190e853dca5") +set(qtquick3dphysics_HASH "b0120027a3d59eda12c8a42dec70e28e0fc552994150771d94f007fb549059f84a53e41a7d6c8f1e918081a18b47713d25fb226a9dae47f5d9b3068538324059") +set(qtspeech_HASH "adc36b92c9add20a67b178e1ff6942953f350f388f3f99defacde470a75c87272af35f933b55e9bfb262f7ba824c082d47d144392b187b028d054749d239f281") +set(qtgrpc_HASH "8a6dd456d48dcaa8594fba6abc96dbb591c61631693ea89a2dbf6b5a7f243dc69341335917aea45a387da379fcd065351206b5231d64379d6e29dbb8780b9cff") +set(qtquickeffectmaker_HASH "4688b371a62590bdf1f88708124dc57b21ad728e177249f782635f748640c3d2f65c783a16beb28517623ebf589d849d00a1b16d16973e3783905b3ef7fa8d07") +set(qtgraphs_HASH "9e6fa902d1f0363e66caabd16ddff64dab10601d17d8f87b93ea456346c29ed99396353fb05101c4f71ce483115ce8193e65771320b84780caad9004ca192098") # Keep for beta/rc diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index e1f263d57f..a8bd94d786 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.8.3) +set(QT_VERSION 6.9.0) set(QT_DEV_BRANCH 0) set(QT_UPDATE_VERSION 0) diff --git a/ports/qtbase/fix-missing-include.patch b/ports/qtbase/fix-missing-include.patch new file mode 100644 index 0000000000..b2d977a9f9 --- /dev/null +++ b/ports/qtbase/fix-missing-include.patch @@ -0,0 +1,12 @@ +diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp +index a06dcbb87f..324ff9373f 100644 +--- a/src/corelib/compat/removed_api.cpp ++++ b/src/corelib/compat/removed_api.cpp +@@ -1296,6 +1296,7 @@ void QBasicMutex::destroyInternal(QMutexPrivate *d) + #include "qobject.h" + + #ifdef Q_COMPILER_MANGLES_RETURN_TYPE ++#include + QMetaObject *QObjectData::dynamicMetaObject() const + { + // ### keep in sync with the master version in qobject.cpp diff --git a/ports/qtbase/moltenvk.patch b/ports/qtbase/moltenvk.patch new file mode 100644 index 0000000000..64b445c8e6 --- /dev/null +++ b/ports/qtbase/moltenvk.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindWrapVulkanHeaders.cmake b/cmake/FindWrapVulkanHeaders.cmake +index 92510ae..afd931f 100644 +--- a/cmake/FindWrapVulkanHeaders.cmake ++++ b/cmake/FindWrapVulkanHeaders.cmake +@@ -29,6 +29,8 @@ if(Vulkan_INCLUDE_DIR) + + # Also propagate MoltenVK include directory on Apple platforms if found. + if(APPLE) ++ find_package(Vulkan COMPONENTS MoltenVK REQUIRED) ++ target_link_libraries(WrapVulkanHeaders::WrapVulkanHeaders INTERFACE Vulkan::MoltenVK) + # Check for the LunarG Vulkan SDK folder structure. + set(__qt_molten_vk_include_path "${Vulkan_INCLUDE_DIR}/../../MoltenVK/include") + get_filename_component( diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake index f03ed99a49..844326faaa 100644 --- a/ports/qtbase/portfile.cmake +++ b/ports/qtbase/portfile.cmake @@ -23,6 +23,8 @@ set(${PORT}_PATCHES fix_deploy_windows.patch fix-link-lib-discovery.patch macdeployqt-symlinks.patch + fix-missing-include.patch + moltenvk.patch ) if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW) diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 8306a55ae3..cf3b11e5e4 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version": "6.8.3", - "port-version": 5, + "version": "6.9.0", "description": "Qt Base (Core, Gui, Widgets, Network, ...)", "homepage": "https://www.qt.io/", "license": null, @@ -256,6 +255,13 @@ { "name": "freetype", "default-features": false + }, + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui" + ] } ] }, @@ -312,13 +318,6 @@ "name": "opengl", "platform": "!ios" }, - { - "name": "qtbase", - "default-features": false, - "features": [ - "freetype" - ] - }, { "name": "qtbase", "default-features": false, @@ -332,6 +331,7 @@ "default-features": false, "features": [ "egl", + "freetype", "gles2", "opengl" ], @@ -468,7 +468,6 @@ "sql-oci": { "description": "Enable SQL Driver Oracle OCI", "dependencies": [ - "ocilib", { "name": "qtbase", "default-features": false, diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index e4e5750f31..c195a89464 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version": "6.8.3", + "version": "6.9.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 74c002990f..fdf9f7d7a1 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version": "6.8.3", + "version": "6.9.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 547e93d68b..bccb2de2bc 100644 --- a/ports/qtconnectivity/vcpkg.json +++ b/ports/qtconnectivity/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtconnectivity", - "version": "6.8.3", + "version": "6.9.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 f03a6a4583..5183bb061a 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version": "6.8.3", + "version": "6.9.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/vcpkg.json b/ports/qtdeclarative/vcpkg.json index fe1561e83b..43c13c3587 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version": "6.8.3", + "version": "6.9.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 012d8291af..dbc827cf81 100644 --- a/ports/qtdeviceutilities/vcpkg.json +++ b/ports/qtdeviceutilities/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeviceutilities", - "version": "6.8.3", + "version": "6.9.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 45b21602b1..bcb5ed9c70 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version": "6.8.3", + "version": "6.9.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 2a262f6876..3eef43aa95 100644 --- a/ports/qtgraphs/vcpkg.json +++ b/ports/qtgraphs/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtgraphs", - "version": "6.8.3", + "version": "6.9.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 12769ab684..149c52839b 100644 --- a/ports/qtgrpc/vcpkg.json +++ b/ports/qtgrpc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtgrpc", - "version": "6.8.3", + "version": "6.9.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 74e5cb2ae4..f95b4d1e3b 100644 --- a/ports/qthttpserver/vcpkg.json +++ b/ports/qthttpserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qthttpserver", - "version": "6.8.3", + "version": "6.9.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 80fd6edff1..e5d2256a12 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version": "6.8.3", + "version": "6.9.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/vcpkg.json b/ports/qtinterfaceframework/vcpkg.json index 080f7938b7..8f325d3b05 100644 --- a/ports/qtinterfaceframework/vcpkg.json +++ b/ports/qtinterfaceframework/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtinterfaceframework", - "version": "6.8.3", - "port-version": 1, + "version": "6.9.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 376ad414c0..47383aaf76 100644 --- a/ports/qtlanguageserver/vcpkg.json +++ b/ports/qtlanguageserver/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlanguageserver", - "version": "6.8.3", + "version": "6.9.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 de5cb3b1a7..778942c166 100644 --- a/ports/qtlocation/vcpkg.json +++ b/ports/qtlocation/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlocation", - "version": "6.8.3", + "version": "6.9.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 3f99f8955c..44a8dfd759 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version": "6.8.3", + "version": "6.9.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 f93a33bc6d..dbfbc463ec 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version": "6.8.3", + "version": "6.9.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/fix_avfoundation_target.patch b/ports/qtmultimedia/fix_avfoundation_target.patch index 943bc47982..849f011fba 100644 --- a/ports/qtmultimedia/fix_avfoundation_target.patch +++ b/ports/qtmultimedia/fix_avfoundation_target.patch @@ -9,4 +9,4 @@ index a1a0cb1..242ceac 100644 + ${FWAVFoundation} ) - qt_internal_extend_target(QDarwinMediaPlugin CONDITION NOT TVOS + qt_internal_extend_target(QDarwinMediaPlugin CONDITION NOT TVOS AND NOT VISIONOS diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json index 00d093ab6d..9b867bcb43 100644 --- a/ports/qtmultimedia/vcpkg.json +++ b/ports/qtmultimedia/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmultimedia", - "version": "6.8.3", + "version": "6.9.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, @@ -48,6 +48,14 @@ { "name": "qtdeclarative", "default-features": false + }, + { + "name": "qtmultimedia", + "default-features": false, + "features": [ + "qml" + ], + "platform": "linux" } ] }, diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index 368f724973..a03b84f215 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version": "6.8.3", + "version": "6.9.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/fix-build.patch b/ports/qtopcua/fix-build.patch index 916a469307..27b6b58702 100644 --- a/ports/qtopcua/fix-build.patch +++ b/ports/qtopcua/fix-build.patch @@ -1,27 +1,3 @@ -diff --git a/cmake/FindOpen62541.cmake b/cmake/FindOpen62541.cmake -index b4fcea4..67e180f 100644 ---- a/cmake/FindOpen62541.cmake -+++ b/cmake/FindOpen62541.cmake -@@ -21,6 +21,7 @@ - # ``open62541`` - # The open62541 library - -+if(0) - find_path(Open62541_INCLUDE_DIRS - NAMES open62541.h - HINTS "${OPEN62541_INCDIR}") -@@ -46,6 +47,11 @@ if (Open62541_FOUND) - endif() - - mark_as_advanced(Open62541_INCLUDE_DIRS Open62541_LIBRARIES) -+endif() -+find_package(Open62541 NAMES open62541) -+if(Open62541_FOUND AND TARGET open62541::open62541 AND NOT TARGET open62541) -+ add_library(open62541 ALIAS open62541::open62541) -+endif() - - include(FeatureSummary) - set_package_properties(Open62541 PROPERTIES diff --git a/src/plugins/opcua/open62541/qopen62541.h b/src/plugins/opcua/open62541/qopen62541.h index a4f63df..877888b 100644 --- a/src/plugins/opcua/open62541/qopen62541.h diff --git a/ports/qtopcua/portfile.cmake b/ports/qtopcua/portfile.cmake index 6a5af13b30..0250fd57b3 100644 --- a/ports/qtopcua/portfile.cmake +++ b/ports/qtopcua/portfile.cmake @@ -16,8 +16,7 @@ INVERTED_FEATURES "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick ) if("open62541" IN_LIST FEATURES) - list(APPEND FEATURE_OPTIONS -DINPUT_open62541=system - -DHAVE_open62541=true) + list(APPEND FEATURE_OPTIONS -DINPUT_open62541=system) vcpkg_find_acquire_program(PYTHON3) else() list(APPEND FEATURE_OPTIONS -DINPUT_open62541=no) diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index 02b59f03e4..2ef58d2704 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtopcua", - "version": "6.8.3", - "port-version": 1, + "version": "6.9.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, diff --git a/ports/qtpositioning/vcpkg.json b/ports/qtpositioning/vcpkg.json index 6634396a51..066303b5ea 100644 --- a/ports/qtpositioning/vcpkg.json +++ b/ports/qtpositioning/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtpositioning", - "version": "6.8.3", + "version": "6.9.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 e668baa010..7d707ebabb 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtquick3d", - "version": "6.8.3", - "port-version": 1, + "version": "6.9.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 3271ac8759..dce0c56193 100644 --- a/ports/qtquick3dphysics/vcpkg.json +++ b/ports/qtquick3dphysics/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3dphysics", - "version": "6.8.3", + "version": "6.9.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 8a3403680d..bd1e896598 100644 --- a/ports/qtquickeffectmaker/vcpkg.json +++ b/ports/qtquickeffectmaker/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquickeffectmaker", - "version": "6.8.3", + "version": "6.9.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 5d37ddf810..924caca250 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version": "6.8.3", + "version": "6.9.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 56b3642e86..71536a0f09 100644 --- a/ports/qtremoteobjects/vcpkg.json +++ b/ports/qtremoteobjects/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtremoteobjects", - "version": "6.8.3", + "version": "6.9.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 68066e051b..ef9e294f76 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version": "6.8.3", + "version": "6.9.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 e84a8fbf7b..364d13119c 100644 --- a/ports/qtsensors/vcpkg.json +++ b/ports/qtsensors/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsensors", - "version": "6.8.3", + "version": "6.9.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 33d56eca29..cf5116565b 100644 --- a/ports/qtserialbus/vcpkg.json +++ b/ports/qtserialbus/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialbus", - "version": "6.8.3", + "version": "6.9.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 86be677c8a..5f8d25c138 100644 --- a/ports/qtserialport/vcpkg.json +++ b/ports/qtserialport/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtserialport", - "version": "6.8.3", + "version": "6.9.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 1b3c1568e3..7fdeba0e6c 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version": "6.8.3", + "version": "6.9.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 f0324cfac7..693dbd4661 100644 --- a/ports/qtspeech/vcpkg.json +++ b/ports/qtspeech/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtspeech", - "version": "6.8.3", + "version": "6.9.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 93b87b0ad0..3815896edc 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version": "6.8.3", + "version": "6.9.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/vcpkg.json b/ports/qttools/vcpkg.json index eb763e50eb..e753ac789d 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version": "6.8.3", + "version": "6.9.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, @@ -87,6 +87,7 @@ }, "qdoc": { "description": "Build QDoc", + "supports": "!android", "dependencies": [ { "name": "llvm", diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index 22d2bdc6ae..b196ab0e91 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version": "6.8.3", + "version": "6.9.0", "description": "Qt translations.", "homepage": "https://www.qt.io/", "license": null, diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index 83144a4e0b..1ff57db72d 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version": "6.8.3", + "version": "6.9.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 cf68902414..47464c3a4c 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version": "6.8.3", + "version": "6.9.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 9db3296bd7..5553d6ff25 100644 --- a/ports/qtwebchannel/vcpkg.json +++ b/ports/qtwebchannel/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebchannel", - "version": "6.8.3", + "version": "6.9.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/blink-include-fixes.patch b/ports/qtwebengine/blink-include-fixes.patch deleted file mode 100644 index 3e9895d06a..0000000000 --- a/ports/qtwebengine/blink-include-fixes.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/credentialmanagement/navigator_login.h b/src/3rdparty/chromium/third_party/blink/renderer/modules/credentialmanagement/navigator_login.h -index 4629e5d..0096117 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/modules/credentialmanagement/navigator_login.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/credentialmanagement/navigator_login.h -@@ -9,10 +9,11 @@ - #include "third_party/blink/renderer/modules/modules_export.h" - #include "third_party/blink/renderer/platform/bindings/script_wrappable.h" - #include "third_party/blink/renderer/platform/supplementable.h" -+#include "third_party/blink/renderer/core/execution_context/navigator_base.h" -+#include "third_party/blink/renderer/core/frame/navigator.h" - - namespace blink { - --class Navigator; - class V8LoginStatus; - - // Methods to let websites tell the browser about their login status. -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/locked_mode/locked_mode.h b/src/3rdparty/chromium/third_party/blink/renderer/modules/locked_mode/locked_mode.h -index fa227f6..9b84783 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/modules/locked_mode/locked_mode.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/locked_mode/locked_mode.h -@@ -9,10 +9,10 @@ - #include "third_party/blink/renderer/platform/bindings/script_wrappable.h" - #include "third_party/blink/renderer/platform/heap/visitor.h" - #include "third_party/blink/renderer/platform/supplementable.h" -+#include "third_party/blink/renderer/core/execution_context/navigator_base.h" - --namespace blink { - --class NavigatorBase; -+namespace blink { - - class MODULES_EXPORT LockedMode final : public ScriptWrappable, - public Supplement { -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/printing/web_printing_manager.h b/src/3rdparty/chromium/third_party/blink/renderer/modules/printing/web_printing_manager.h -index c316642..d58a4e8 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/modules/printing/web_printing_manager.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/printing/web_printing_manager.h -@@ -10,11 +10,11 @@ - #include "third_party/blink/renderer/platform/bindings/script_wrappable.h" - #include "third_party/blink/renderer/platform/mojo/heap_mojo_remote.h" - #include "third_party/blink/renderer/platform/supplementable.h" -+#include "third_party/blink/renderer/core/execution_context/navigator_base.h" - - namespace blink { - - class ExceptionState; --class NavigatorBase; - class ScriptPromise; - class ScriptPromiseResolver; - diff --git a/ports/qtwebengine/cross-build.diff b/ports/qtwebengine/cross-build.diff index 8743282b74..26e7436c75 100644 --- a/ports/qtwebengine/cross-build.diff +++ b/ports/qtwebengine/cross-build.diff @@ -2,16 +2,16 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 789f15bc6..be3ea630d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -167,7 +167,7 @@ endif() +@@ -114,7 +114,7 @@ endif() # HOST PROJECT ## --if(CMAKE_CROSSCOMPILING AND NOT IOS AND NOT MACOS) +-if(CMAKE_CROSSCOMPILING AND NOT IOS AND NOT MACOS AND NOT WIN32) +if(0) if(NOT Gn_FOUND) message(FATAL_ERROR "\nHost gn not found - cross compilation not possible") -@@ -198,7 +198,7 @@ if(CMAKE_CROSSCOMPILING AND NOT IOS AND NOT MACOS) +@@ -148,7 +148,7 @@ if(CMAKE_CROSSCOMPILING AND NOT IOS AND NOT MACOS) endif() # install gn for cross build diff --git a/ports/qtwebengine/osx-sdk-info.diff b/ports/qtwebengine/osx-sdk-info.diff index 38fdd7efb1..464daf72ac 100644 --- a/ports/qtwebengine/osx-sdk-info.diff +++ b/ports/qtwebengine/osx-sdk-info.diff @@ -59,7 +59,7 @@ index 00588459e..48b4a0102 100644 --- a/src/3rdparty/chromium/build/config/mac/mac_sdk.gni +++ b/src/3rdparty/chromium/build/config/mac/mac_sdk.gni @@ -15,6 +15,8 @@ assert( - (current_os == "ios" && current_toolchain == "${default_toolchain}_blink")) + assert(current_os == "mac" || current_os == "android" || current_toolchain == default_toolchain) declare_args() { + apple_sdk_version = "" diff --git a/ports/qtwebengine/portfile.cmake b/ports/qtwebengine/portfile.cmake index c04a7dd40a..53552378eb 100644 --- a/ports/qtwebengine/portfile.cmake +++ b/ports/qtwebengine/portfile.cmake @@ -6,7 +6,6 @@ set(${PORT}_PATCHES "cross-build.diff" "disable-host-pkgconfig.diff" "fix-error2275-2672.patch" - "blink-include-fixes.patch" "nested-name-fix.patch" "osx-sdk-info.diff" "pdf-system-libjpeg.diff" diff --git a/ports/qtwebengine/vcpkg.json b/ports/qtwebengine/vcpkg.json index 893291850e..a1b28242b4 100644 --- a/ports/qtwebengine/vcpkg.json +++ b/ports/qtwebengine/vcpkg.json @@ -1,9 +1,8 @@ { "$comment": "x86-windows is not within the upstream support matrix of Qt6", "name": "qtwebengine", - "version": "6.8.3", - "port-version": 2, - "description": "Qt modules for rendering web and PDF content.", + "version": "6.9.0", + "description": "Qt WebEngine provides functionality for rendering regions of dynamic web content.", "homepage": "https://www.qt.io/", "license": null, "dependencies": [ diff --git a/ports/qtwebsockets/vcpkg.json b/ports/qtwebsockets/vcpkg.json index b22b362c0c..59afc57c97 100644 --- a/ports/qtwebsockets/vcpkg.json +++ b/ports/qtwebsockets/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebsockets", - "version": "6.8.3", + "version": "6.9.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 0423cfbd07..498b0cc4ed 100644 --- a/ports/qtwebview/vcpkg.json +++ b/ports/qtwebview/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwebview", - "version": "6.8.3", + "version": "6.9.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, @@ -24,7 +24,10 @@ "dependencies": [ { "name": "qtwebengine", - "default-features": false + "default-features": false, + "features": [ + "webengine" + ] } ] } diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 5e3fad4042..bedc1cc687 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -832,6 +832,9 @@ qt5-x11extras:arm64-osx=skip qt5-x11extras:x64-osx=skip qtmultimedia:arm64-android=fail qtmultimedia:x64-android=fail +qtopcua:arm-neon-android=fail +qtopcua:arm64-android=fail +qtopcua:x64-android=fail qtwayland:arm-neon-android=fail qtwayland:arm64-android=fail qtwayland:x64-android=fail diff --git a/scripts/ci.feature.baseline.txt b/scripts/ci.feature.baseline.txt index ce30d64a2d..4203318e99 100644 --- a/scripts/ci.feature.baseline.txt +++ b/scripts/ci.feature.baseline.txt @@ -352,7 +352,6 @@ ode:x64-uwp=fail offscale-libetcd-cpp:arm-uwp=fail offscale-libetcd-cpp:x64-uwp=fail ogre-next(android)=fail -open62541:x64-windows-static-md=fail opencc:arm64-windows=fail # opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected opencc:x64-android=fail opencc(uwp)=fail # opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP. @@ -423,7 +422,6 @@ qt5-wayland:x64-osx=fail # Missing system libraries qt5-webengine(!(arm & windows) & !uwp) = fail # Missing prerequisites for CI success qt5-x11extras(osx)=fail # Missing system libraries qt5-x11extras(windows)=fail # Missing libraries -qtmultimedia(android)=fail qtvirtualkeyboard[t9write] = skip # depends on the port 't9write' that does not exists qtwayland(android | osx)=fail # Missing system libraries qwt-qt6:x64-osx=fail @@ -1495,8 +1493,12 @@ omplapp:arm64-uwp = cascade omplapp:x64-uwp = cascade onnx-optimizer:arm64-uwp = cascade onnx-optimizer:x64-uwp = cascade -open62541[mbedtls]:arm64-uwp = cascade -open62541[mbedtls]:x64-uwp = cascade + +onnx-optimizer[pybind11]:arm64-windows = cascade +onnx-optimizer[pybind11]:x64-linux = cascade +onnx-optimizer[pybind11]:x64-windows-static = cascade +onnx-optimizer[pybind11]:x64-windows-static-md = cascade +onnx-optimizer[pybind11]:x86-windows = cascade openal-soft[pipewire](!linux) = cascade openal-soft[pulseaudio](!linux) = cascade opencascade[vtk,freeimage](uwp) = cascade @@ -1528,12 +1530,15 @@ opencv4[aravis](uwp | xbox) = cascade opencv4[cuda](!((windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64))) = cascade opencv4[cuda,cudnn](osx) = cascade opencv4[cuda,cudnn,dc1394,dnn-cuda]:x86-windows = cascade +opencv4[dnn,halide](osx) = combination-fails + opencv4[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,openexr,opengl,ovis,python,qt,sfm,tbb,vtk]:arm64-uwp = cascade opencv4[cuda,cudnn,dc1394,dnn-cuda,freetype,gdcm,gstreamer,openexr,ovis,python,qt,sfm,tbb,vtk]:x64-uwp = cascade opencv4[cuda,cudnn,dc1394,dnn-cuda,vtk]:arm64-windows = cascade opencv4[cudnn](!((windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)) | !((windows & x64 & !uwp) | (linux & x64) | (linux & arm64))) = cascade opencv4[dc1394](windows) = cascade opencv4[dnn-cuda](!((windows & x64 & !uwp & !xbox) | (linux & x64) | (linux & arm64)) | !((windows & x64 & !uwp) | (linux & x64) | (linux & arm64))) = cascade + opencv4[dnn-cuda](osx) = cascade opencv4[freetype](uwp) = cascade opencv4[gdcm](uwp) = cascade @@ -1668,7 +1673,6 @@ qscintilla:x64-uwp = cascade qt-advanced-docking-system:arm64-uwp = cascade qt-advanced-docking-system:x64-uwp = cascade qt(uwp) = cascade -qt3d[vulkan] = cascade # no vulkan sdk installed qt3d(uwp) = cascade qt5:arm64-uwp = cascade qt5:arm64-windows = cascade @@ -1754,7 +1758,6 @@ qt5compat:x64-uwp = cascade qt5compat[iconv]:x64-uwp = cascade qtactiveqt:arm64-uwp = cascade qtactiveqt:x64-uwp = cascade -qtapplicationmanager:arm64-osx = cascade qtapplicationmanager:arm64-uwp = cascade qtapplicationmanager:x64-uwp = cascade qtbase[dbus](android) = cascade @@ -1796,11 +1799,12 @@ qtmqtt:arm64-uwp = cascade qtmqtt:x64-uwp = cascade qtmultimedia:arm64-uwp = cascade qtmultimedia:x64-uwp = cascade +qtmultimedia[gstreamer]:x64-linux=options qtnetworkauth:arm64-uwp = cascade qtnetworkauth:x64-uwp = cascade qtopcua:arm64-uwp = cascade qtopcua:x64-uwp = cascade -qtopcua[open62541]:x64-windows-static-md = cascade +qtopcua[open62541](android)=feature-fails qtpositioning:arm64-uwp = cascade qtpositioning:x64-uwp = cascade qtquick3d:arm64-uwp = cascade @@ -1839,7 +1843,6 @@ qtwebsockets:arm64-uwp = cascade qtwebsockets:x64-uwp = cascade qtwebview:arm64-uwp = cascade qtwebview:x64-uwp = cascade -qtwebview[webengine]:x64-windows = cascade qtwebview[webengine]:x86-windows = cascade quazip:arm64-uwp = cascade quazip:x64-uwp = cascade @@ -2211,9 +2214,11 @@ qt5-base[vulkan](osx) = feature-fails # needs MolkenVK qt5compat[iconv](!uwp) = feature-fails # requires qtbase without icu qtbase[cups](linux) = feature-fails # requires CUPS system libs qtbase[gles3](android) = feature-fails -qtbase[sql-oci](!(arm & windows)) = feature-fails # see https://github.com/microsoft/vcpkg/issues/32052 +qtbase[sql-oci] = feature-fails # see https://github.com/microsoft/vcpkg/issues/32052 +qtmultimedia[core,ffmpeg](linux) = combination-fails # If QT_FEATURE_eglfs is detect it automatically links Qt::Quick; no way to control it externally qtmultimedia[core,ffmpeg,gstreamer,qml,widgets](osx) = combination-fails # Error: Qt will by default autolink both plugin backends in static builds leading to symbol collisions and a build failure in dependent ports! As such in static builds only one backend is allowed by default. -qtopcua[uacpp](!uwp) = feature-fails # Unified Automation C++ SDK is not installed +qtmultimedia[core,ffmpeg,qml,widgets](android)=combination-fails +qtmultimedia[gstreamer]:x64-linux=no-separate-feature-test realsense2:arm64-windows = fail # fw-update-device.h(1): warning C4828: The file contains a character starting at offset 0x4c3 that is illegal in the current source character set (codepage 65001). See https://github.com/microsoft/vcpkg/issues/35628 rtabmap[openmp](osx) = feature-fails # No openmp on default osx toolchain rubberband[cli](linux) = feature-fails # See https://github.com/microsoft/vcpkg/issues/32360 @@ -2274,6 +2279,9 @@ itk(arm & windows & !uwp) = skip # try_run libhdfs3 = skip # never worked https://github.com/microsoft/vcpkg/pull/10021#issuecomment-1595343157 magnum[anyshaderconverter,shadertools,shaderconverter,vk-info] = skip # only available in head build magnum-plugins[cgltfimporter,glslangshaderconverter,ktximageconverter,ktximporter,openexrimageconverter,openexrimporter,spirvtoolsshaderconverter,stbdxtimageconverter] = skip # only available in head build +opencv4[dshow]:x64-uwp=feature-fails +opencv4[halide]=no-separate-feature-test # error C2039: 'attachHalide': is not a member of 'cv::dnn::GeluFunctor' +opencv4[opengl]=no-separate-feature-test # needs Win32UI, Qt or GTK to enable HAVE_OPENGL openjpeg[tools] = skip # fails and is deprecated pango[introspection]:arm64-windows = skip # needs arm64 host qt5-base(android) = skip # port doesn't support cross builds diff --git a/versions/baseline.json b/versions/baseline.json index 514ebb17a8..e7408e5e6d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4138,7 +4138,7 @@ }, "kdstatemachineeditor": { "baseline": "2.0.0", - "port-version": 0 + "port-version": 1 }, "kealib": { "baseline": "1.6.2", @@ -6945,8 +6945,8 @@ "port-version": 0 }, "open62541": { - "baseline": "1.3.15", - "port-version": 3 + "baseline": "1.4.12", + "port-version": 0 }, "open62541pp": { "baseline": "0.19.0", @@ -7002,7 +7002,7 @@ }, "opencv4": { "baseline": "4.11.0", - "port-version": 3 + "port-version": 4 }, "opendnp3": { "baseline": "3.1.1", @@ -7741,15 +7741,15 @@ "port-version": 1 }, "qt": { - "baseline": "6.8.3", - "port-version": 1 + "baseline": "6.9.0", + "port-version": 0 }, "qt-advanced-docking-system": { "baseline": "4.4.0", "port-version": 1 }, "qt3d": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qt5": { @@ -7933,68 +7933,68 @@ "port-version": 0 }, "qt5compat": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtactiveqt": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtapplicationmanager": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtbase": { - "baseline": "6.8.3", - "port-version": 5 + "baseline": "6.9.0", + "port-version": 0 }, "qtcharts": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtcoap": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtconnectivity": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtdeviceutilities": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtdoc": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtgraphs": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtgrpc": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qthttpserver": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtimageformats": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtinterfaceframework": { - "baseline": "6.8.3", - "port-version": 1 + "baseline": "6.9.0", + "port-version": 0 }, "qtkeychain": { "baseline": "0.14.3", @@ -8005,43 +8005,43 @@ "port-version": 0 }, "qtlanguageserver": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtlocation": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtlottie": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtmqtt": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtmultimedia": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtopcua": { - "baseline": "6.8.3", - "port-version": 1 + "baseline": "6.9.0", + "port-version": 0 }, "qtpositioning": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtquick3d": { - "baseline": "6.8.3", - "port-version": 1 + "baseline": "6.9.0", + "port-version": 0 }, "qtquick3dphysics": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtquickcontrols2": { @@ -8049,75 +8049,75 @@ "port-version": 1 }, "qtquickeffectmaker": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtremoteobjects": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtscxml": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtsensors": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtserialbus": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtserialport": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtshadertools": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtspeech": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtsvg": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qttools": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qttranslations": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtwayland": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtwebchannel": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtwebengine": { - "baseline": "6.8.3", - "port-version": 2 + "baseline": "6.9.0", + "port-version": 0 }, "qtwebsockets": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "qtwebview": { - "baseline": "6.8.3", + "baseline": "6.9.0", "port-version": 0 }, "quadtree": { diff --git a/versions/k-/kdstatemachineeditor.json b/versions/k-/kdstatemachineeditor.json index 2419bde32b..addbe47363 100644 --- a/versions/k-/kdstatemachineeditor.json +++ b/versions/k-/kdstatemachineeditor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5f01d067ef13e6e7ba3d7a2fb99c9b45391a24c1", + "version": "2.0.0", + "port-version": 1 + }, { "git-tree": "698e2dfa9c5950117cc66ad7a800d692d8c9a99e", "version": "2.0.0", diff --git a/versions/o-/open62541.json b/versions/o-/open62541.json index caeae88631..d4bb3fbe4e 100644 --- a/versions/o-/open62541.json +++ b/versions/o-/open62541.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0849b056c93b75725fbfa8c77b79e14deb5d3068", + "version": "1.4.12", + "port-version": 0 + }, { "git-tree": "e7ed2cdee853c7b51d70e02cbf56b76d06b60652", "version": "1.3.15", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index 89cdecb667..443d720364 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f96663c0d36e2aed2c1519d4138f712055014208", + "version": "4.11.0", + "port-version": 4 + }, { "git-tree": "cf1bf47c5fe2de53cc195e861fd428e7afe08807", "version": "4.11.0", diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 00c6fde5b5..3a0d05b15d 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7447dd975c3dd289ba8bd0f89f497f76a2b4c77", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "c039fb14ea583d1dbd94f3dd733965b2c3450693", "version": "6.8.3", diff --git a/versions/q-/qt3d.json b/versions/q-/qt3d.json index 40546132d1..ae579b1262 100644 --- a/versions/q-/qt3d.json +++ b/versions/q-/qt3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7ecb652ee0e2aa1df9378b18a17e91e58c76dc55", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "3fccd9be457d08e48497f25828ade9976f1d9c4e", "version": "6.8.3", diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 7a10c13856..b60f8b4e46 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1c6aa378832a7f4b0cd686cfe6a04c75abc534d1", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "c9be4f75e2a9230f72e0e30bc72780c1dcfff199", "version": "6.8.3", diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index 4423a5796c..9ac01f7fec 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "023f012dd0787b031994ea7f2e7956734564454b", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "02ff4146c13840cc57b9559efb216d99c2b1c452", "version": "6.8.3", diff --git a/versions/q-/qtapplicationmanager.json b/versions/q-/qtapplicationmanager.json index 757a11b843..c0363b4787 100644 --- a/versions/q-/qtapplicationmanager.json +++ b/versions/q-/qtapplicationmanager.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff6223ced647aa69b5b3a877d88d10cd72c58294", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "9e22b963595e964983bd64c3d8369b9aebcbabdb", "version": "6.8.3", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index cd54e19a7f..cbdc8ee27a 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "55f337cd03bf76ccfa3d2b33bed50865410f204d", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "6b4979a2ec153d1ef597c255a57b3ac687d1c95e", "version": "6.8.3", diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index b1e1d80513..00cb516609 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e3c8f9e7967fd1f595ea2fd30676939b1ffd0cdb", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "a16d989d3e8c3d63cabb3dbd3cfd12f12a75b38c", "version": "6.8.3", diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 7bafc5e5f7..7710da4e92 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f416d8721436a4cea24d01939ce03600e466c4ef", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "e2266bf4b6ce143a3b3323f22d11916034983d64", "version": "6.8.3", diff --git a/versions/q-/qtconnectivity.json b/versions/q-/qtconnectivity.json index be710f0430..9689fd302e 100644 --- a/versions/q-/qtconnectivity.json +++ b/versions/q-/qtconnectivity.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "989273cc6e29488568c411942357414bd942fcad", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "6bee63bcbeb60907a87226042862bf15f910b9da", "version": "6.8.3", diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index c5d4fffdfb..1976e690d0 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1f292318107e9743a3c65940aaa8808b1fe71247", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "b6507df9f2d907a874c1e5b8eb70e46b374e5a1a", "version": "6.8.3", diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index 9c4cdc9261..7e485b4366 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "df075ffa70ddc69ac069c2a5d7d741908d060c2f", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "3c506bbe4a2b22ce696ae8fad1e488c8349338e4", "version": "6.8.3", diff --git a/versions/q-/qtdeviceutilities.json b/versions/q-/qtdeviceutilities.json index 45e072761b..ae17621b65 100644 --- a/versions/q-/qtdeviceutilities.json +++ b/versions/q-/qtdeviceutilities.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8206a2e79423801c1a628c617b687fa2842af17a", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "17de04d97818f311721b1e8520eb6160f12ea4d1", "version": "6.8.3", diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index e807632038..b829764d84 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4692f5d607cef22192f8d7509e3229f45d4d39c1", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "ea2716ab35783e959d46d1fdc34b9348ed23e2ca", "version": "6.8.3", diff --git a/versions/q-/qtgraphs.json b/versions/q-/qtgraphs.json index 17987999cb..524031b242 100644 --- a/versions/q-/qtgraphs.json +++ b/versions/q-/qtgraphs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2de3a8a395eb7cb96060bdda7f278d479385017a", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "e65abc65d29fa0df1446e3d10abf9a1dfdd6c9f9", "version": "6.8.3", diff --git a/versions/q-/qtgrpc.json b/versions/q-/qtgrpc.json index dbec63478e..0f820ba9d3 100644 --- a/versions/q-/qtgrpc.json +++ b/versions/q-/qtgrpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1006456acd36af68f861c049e6f12e6795355aec", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "9ed3951045e6d9f312f5b0420497055401c72422", "version": "6.8.3", diff --git a/versions/q-/qthttpserver.json b/versions/q-/qthttpserver.json index 1d49c6d746..11aebf04e8 100644 --- a/versions/q-/qthttpserver.json +++ b/versions/q-/qthttpserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9eaaf02de592993ecb2ccfd68038a959723ab332", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "245c0c905eee6aad8bf3d4bc7b170a9e5171c72c", "version": "6.8.3", diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index d50bf3e20b..87b5dcb4e5 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cb1484e501251386cd9c9db033cc0d46d63e8b51", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "a74aa82979787876f322a6a9331abf31a73f5222", "version": "6.8.3", diff --git a/versions/q-/qtinterfaceframework.json b/versions/q-/qtinterfaceframework.json index 9a8ac0bd07..9f1385c6b6 100644 --- a/versions/q-/qtinterfaceframework.json +++ b/versions/q-/qtinterfaceframework.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c73daae322546f280d91ac8bb57336239d606c99", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "3d8474e5a0e9fb076b51459bd20f6be85a31cc4f", "version": "6.8.3", diff --git a/versions/q-/qtlanguageserver.json b/versions/q-/qtlanguageserver.json index 70c8d0384c..697305ab47 100644 --- a/versions/q-/qtlanguageserver.json +++ b/versions/q-/qtlanguageserver.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "90af64b09c78ec527a38941b8fad294dad8d1d6c", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "2b0e310d9c3975ca8254518fc0006f9b2bca38c6", "version": "6.8.3", diff --git a/versions/q-/qtlocation.json b/versions/q-/qtlocation.json index eb4514eee2..dde2455d6b 100644 --- a/versions/q-/qtlocation.json +++ b/versions/q-/qtlocation.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4b72a7366389c6cf0c9988cda2a2ab7d9c7b1173", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "dde39400613ce150040d80899b96120b1aacff21", "version": "6.8.3", diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 91b2b8df22..a80b482253 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b4c437c1099c64d758ce28af4ee387d2806661b4", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "0eb83790bf4d882045d524fbcfec8e985b7cca82", "version": "6.8.3", diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index d93266513d..d22bb897e3 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd06c5cdb81bfcbbc6766ef07ecce4a47966f8a4", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "eeb28577b528e4fe211ef382a8149cc2f36d2b37", "version": "6.8.3", diff --git a/versions/q-/qtmultimedia.json b/versions/q-/qtmultimedia.json index 74da761a76..cad829f0c8 100644 --- a/versions/q-/qtmultimedia.json +++ b/versions/q-/qtmultimedia.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b454531c56b26616a03808e41d2760f7a8d9ee6d", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "e0c5a0a1c22ed96b86905548ec52d501e4ee2122", "version": "6.8.3", diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 241a1f4ecc..86362d9e92 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3711e699df832239c683bf644204e4cdae07d210", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "d90d1ce8c4d532ecdf794e37decfe59e9eb16f37", "version": "6.8.3", diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 5592cdc952..29a6c27084 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3b1af646fd739623b8232d08e5e69eed49c138c8", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "53f0e3d81d4a77abd47a4a1bf90458015c257cdc", "version": "6.8.3", diff --git a/versions/q-/qtpositioning.json b/versions/q-/qtpositioning.json index 046d14283d..eb8b6433e5 100644 --- a/versions/q-/qtpositioning.json +++ b/versions/q-/qtpositioning.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dc4c14a5838c780088f65d68b8772a8cf7358e0", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "dfbb989a647b96551fe594de2b6d80c74e6614fd", "version": "6.8.3", diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index 6e16e25697..6d16987c1f 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31268c00723ae8a346e6152b4dc1315f7a86133f", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "ec9f37be62615a932d10fd6cf5fc512282f35b07", "version": "6.8.3", diff --git a/versions/q-/qtquick3dphysics.json b/versions/q-/qtquick3dphysics.json index 5f669d79fc..62338632ac 100644 --- a/versions/q-/qtquick3dphysics.json +++ b/versions/q-/qtquick3dphysics.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "391b252e2d6a995a2e987dfe457aefd6a12cac34", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "fab968117859815649c5a537e74cc0e81cb65b6c", "version": "6.8.3", diff --git a/versions/q-/qtquickeffectmaker.json b/versions/q-/qtquickeffectmaker.json index 68b8fb13ea..7b4d2ba699 100644 --- a/versions/q-/qtquickeffectmaker.json +++ b/versions/q-/qtquickeffectmaker.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "31644af96361d374923d1b65a522e82d3d03c6b9", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "67c490bc67aca81549686fcf8b753c518b02bf7f", "version": "6.8.3", diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index 242ba6424b..d7dfd1ea3f 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3ee075b7310fc46f35098f4ee36233f9c0a0f84b", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "3b6624e02d21456c6ede5670986f604eee72e05c", "version": "6.8.3", diff --git a/versions/q-/qtremoteobjects.json b/versions/q-/qtremoteobjects.json index d7cdc129bd..75c3151b0c 100644 --- a/versions/q-/qtremoteobjects.json +++ b/versions/q-/qtremoteobjects.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f3eb4271dad7c7e0895897408bcc4c3d7384e48d", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "2a7f5d92d335791145b4c731ad2a2c89210bb98b", "version": "6.8.3", diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 13611b578f..bb5009c859 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "57d86b7832cc70464cc5306726f56c48243a6ea0", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "a46fd0e4abee32c5f9b9a599de7387ac12ae4315", "version": "6.8.3", diff --git a/versions/q-/qtsensors.json b/versions/q-/qtsensors.json index 9aac4cdbcf..e6d8558358 100644 --- a/versions/q-/qtsensors.json +++ b/versions/q-/qtsensors.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9581327c86440ef43567c1fd9aeff041757c1cc3", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "8448728543223dd74c6cb10e8c6a61b6f115b4e2", "version": "6.8.3", diff --git a/versions/q-/qtserialbus.json b/versions/q-/qtserialbus.json index 0a7ca8bb5b..45fb686173 100644 --- a/versions/q-/qtserialbus.json +++ b/versions/q-/qtserialbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "716c01f3a8adb032b8a75547a26c9eba41cdbcea", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "6f1f0e06a64ade452ec085bbb95bc9c2fc220d4a", "version": "6.8.3", diff --git a/versions/q-/qtserialport.json b/versions/q-/qtserialport.json index b5f5dbf418..e00b1dde7a 100644 --- a/versions/q-/qtserialport.json +++ b/versions/q-/qtserialport.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4c9a5d42118e02b20d9518f60d2cd6cbf9015508", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "90bff35b01095daeeb3ee427eb978665f272b013", "version": "6.8.3", diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index a29ee797dd..d14aadcf20 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c48352797b331ab8a7567d812807b02c57223e5e", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "889f250590e4f4c8bc8e8f6bdbe374348cffae3c", "version": "6.8.3", diff --git a/versions/q-/qtspeech.json b/versions/q-/qtspeech.json index 7df44fffd7..c1accf98c4 100644 --- a/versions/q-/qtspeech.json +++ b/versions/q-/qtspeech.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4498a77ef5a5fa94706789808d7366c175bbcc05", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "1100845ffb550561997073159d334eb2a3353ec8", "version": "6.8.3", diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index 4257e50ab5..e93acfd2a1 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ab42e0f3242b90cce0ce6a42bfed3a5bf2866df6", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "a7b6f1e2abe628e0e9ec485477d9e015b2ebd6ac", "version": "6.8.3", diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index c2a3703c03..ad9248b8f0 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d03e49f255ffdefc2086154a598cdda2e779edc3", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "a69b07b4f407709a9ea01c94d1228362542afe1a", "version": "6.8.3", diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index ad0ef83cbb..f3bc7cb25e 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4bbb2f72032f51ce3763c8aa140f236cc62ca927", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "9c0e87ddbced1142a71122c949965baeb917ee83", "version": "6.8.3", diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index f3b69f5eda..04546874f6 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e988557e50aedc8cf0567c9e4e512c9a5f50f3e5", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "6eead5d8b04943cee9c34f1d87248ae7cca6edbb", "version": "6.8.3", diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index 3c51054f55..cbd0e3581f 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "56858e04a5b7a5f40710f2157a2a9e1d5ab839d7", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "a80ddcdf94339ed35ca8d4b4c144f7bc2febee60", "version": "6.8.3", diff --git a/versions/q-/qtwebchannel.json b/versions/q-/qtwebchannel.json index 85b0f5f3d0..a47e981dc3 100644 --- a/versions/q-/qtwebchannel.json +++ b/versions/q-/qtwebchannel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e909720f9ca60e20b9d181912004bf05920dc577", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "02db4cf1309c298127f30102d24f049273fad8e6", "version": "6.8.3", diff --git a/versions/q-/qtwebengine.json b/versions/q-/qtwebengine.json index 3cec57d529..dd9ebe2359 100644 --- a/versions/q-/qtwebengine.json +++ b/versions/q-/qtwebengine.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "44c2fae683976c9977cea9bbd0d25d69b61ac021", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "d6ba2c93ca1df0a2b8d4025aa97e9539ba99bfa1", "version": "6.8.3", diff --git a/versions/q-/qtwebsockets.json b/versions/q-/qtwebsockets.json index 1475bf8454..8140a356e9 100644 --- a/versions/q-/qtwebsockets.json +++ b/versions/q-/qtwebsockets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff0e7542b081682fb15cc3423295400d403e1d1b", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "67015c5e80b44160aff841665e381b247d674537", "version": "6.8.3", diff --git a/versions/q-/qtwebview.json b/versions/q-/qtwebview.json index 416d35fcdc..31f70df410 100644 --- a/versions/q-/qtwebview.json +++ b/versions/q-/qtwebview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14f654e1ff497d42f38fd25378de76c768dc719c", + "version": "6.9.0", + "port-version": 0 + }, { "git-tree": "b9d235032701bb82751796b37823558af9c9c664", "version": "6.8.3",