mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 02:43:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Qt6] update to 6.2.4 (#23691)

Browse Source 
* [Qt6] update to 6.2.4

* adjust patches

* more fixes

* more CMAKE_REQUIRE_FIND_PACKAGE

* fix configure?

* cannot require cmake not config stuff.

* more REQUIRE removals

* adjust required stuff

* more modules.

* less require stuff

* disable env patch for now and silent the require maybe unused. warnings

* different approach

* fix case ?

* fix linux builds

* more stuff to not force in vcpkg

* reenable env patch

* only use env patch on windows.

* reenable qtwebengine. Maybe the ICE was fixed?

* Revert "reenable qtwebengine. Maybe the ICE was fixed?"

This reverts commit 5dc3ca88c1.

* version stuff

Co-authored-by: Alexander Neumann <you@example.com>
This commit is contained in:
Alexander Neumann 2022-03-23 20:19:54 +01:00 committed by GitHub
parent 2aa0d83ee7
commit 147027390b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
101 changed files with 442 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/qt/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qt5compat/portfile.cmake
View File

@ -10,6 +10,8 @@ FEATURES
"big-codecs" FEATURE_big_codecs
"iconv" FEATURE_iconv
"iconv" CMAKE_DISABLE_FIND_PACKAGE_ICU
#"iconv" CMAKE_REQUIRE_FIND_PACKAGE_WrapIconv
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
INVERTED_FEATURES
"iconv" CMAKE_DISABLE_FIND_PACKAGE_WrapIconv
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick

2
ports/qt5compat/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qt5compat",
"version": "6.2.3",
"version": "6.2.4",
"description": "The module contains unsupported Qt 5 APIs",
"homepage": "https://www.qt.io/",
"license": null,

1
ports/qtactiveqt/portfile.cmake
View File

@ -19,6 +19,7 @@ endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)

2
ports/qtactiveqt/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtactiveqt",
"version": "6.2.3",
"version": "6.2.4",
"description": "ActiveQt",
"homepage": "https://www.qt.io/",
"license": null,

50
ports/qtapplicationmanager/portfile.cmake
View File

@ -22,40 +22,24 @@ endif()
set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
set(build_type_backup ${VCPKG_BUILD_TYPE})
set(path_backup "$ENV{PATH}")
if(NOT VCPKG_BUILD_TYPE)
set(types release debug)
else()
set(types ${VCPKG_BUILD_TYPE})
endif()
foreach(VCPKG_BUILD_TYPE IN LISTS types)
if(VCPKG_BUILD_TYPE STREQUAL debug)
vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/debug/bin")
else()
vcpkg_add_to_path("${CURRENT_INSTALLED_DIR}/bin")
endif()
qt_cmake_configure(${_opt}
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DINPUT_libarchive=system
-DINPUT_libyaml=system
-DFEATURE_am_system_libyaml=ON
-DFEATURE_am_system_libarchive=ON
OPTIONS_DEBUG
OPTIONS_RELEASE)
if(VCPKG_TARGET_IS_WINDOWS)
set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat")
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE)
if(EXISTS "${scriptfile}")
vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin")
endif()
endif()
vcpkg_cmake_install()
set(ENV{PATH} "${path_backup}")
endforeach()
set(VCPKG_BUILD_TYPE ${build_type_backup})
qt_cmake_configure(${_opt}
OPTIONS
-DINPUT_libarchive=system
-DINPUT_libyaml=system
-DFEATURE_am_system_libyaml=ON
-DFEATURE_am_system_libarchive=ON
OPTIONS_DEBUG
OPTIONS_RELEASE)
### Need to fix one post-build.bat; Couldn't find the place where it gets generated!
if(VCPKG_TARGET_IS_WINDOWS)
set(scriptfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/tools/dumpqmltypes/CMakeFiles/appman-dumpqmltypes.dir/post-build.bat")
file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}" CURRENT_INSTALLED_DIR_NATIVE)
if(EXISTS "${scriptfile}")
vcpkg_replace_string("${scriptfile}" "${CURRENT_INSTALLED_DIR_NATIVE}\\bin" "${CURRENT_INSTALLED_DIR_NATIVE}\\debug\\bin")
endif()
endif()
vcpkg_cmake_install(ADD_BIN_TO_PATH)
qt_fixup_and_cleanup(TOOL_NAMES ${TOOL_NAMES})

3
ports/qtapplicationmanager/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "qtapplicationmanager",
"version": "6.2.3",
"port-version": 1,
"version": "6.2.4",
"description": "Qt component for application lifecycle management",
"homepage": "https://www.qt.io/",
"license": null,

7
ports/qtbase/cmake/qt_install_submodule.cmake
View File

@ -86,9 +86,14 @@ function(qt_cmake_configure)
endif()
endif()
# Disable warning for CMAKE_DISABLE_FIND_PACKAGE_<packagename>
# Disable warning for CMAKE_(REQUIRE|DISABLE)_FIND_PACKAGE_<packagename>
string(REGEX MATCHALL "CMAKE_DISABLE_FIND_PACKAGE_[^:=]+" disabled_find_package "${_qarg_OPTIONS}")
list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_find_package})
string(REGEX MATCHALL "CMAKE_REQUIRE_FIND_PACKAGE_[^:=]+(:BOOL)?=OFF" require_find_package "${_qarg_OPTIONS}")
list(TRANSFORM require_find_package REPLACE "(:BOOL)?=OFF" "")
list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${require_find_package})
# Disable unused warnings for disabled features. Qt might decide to not emit the feature variables if other features are deactivated.
string(REGEX MATCHALL "(QT_)?FEATURE_[^:=]+(:BOOL)?=OFF" disabled_features "${_qarg_OPTIONS}")
list(TRANSFORM disabled_features REPLACE "(:BOOL)?=OFF" "")

80
ports/qtbase/cmake/qt_port_details.cmake
View File

@ -1,4 +1,4 @@
set(QT_VERSION 6.2.3)
set(QT_VERSION 6.2.4)
if(PORT MATCHES "qtquickcontrols2")
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
@ -68,52 +68,52 @@ set(QT_PORTS qt
foreach(_port IN LISTS QT_PORTS)
set(${_port}_TAG ${QT_GIT_TAG})
endforeach()
set(qtbase_REF 0145fe008894c3b280649b02725e6ec5a5605006)
set(qtshadertools_REF a82d73829028a31640e317a2c8ce365ef74281a1)
set(qtdeclarative_REF 809f24b274ebfeb537c44f38445a4327d43da5e0)
set(qt5compat_REF ca0c27fb51622058e50150ab906260fb7ed11ae3)
set(qttools_REF fb3a3731946c70d573daaab232e13ed8f283fcef) # Additional refs ibelow
set(qtcoap_REF 7b4a337efc71426c84abab3b1d4bdad659ae1c63)
set(qtdoc_REF 1d8092320fedfa368e486eeeea43efec45460672)
set(qtimageformats_REF 1a8e25eb8a63968e09b944cebee5882c137b0c32)
set(qtmqtt_REF b1cfdd8b121c3d0554814c271096e3448da032bb)
set(qtnetworkauth_REF 8451dff3c65712b037ef0606c1f25d70152623f0)
set(qtopcua_REF 42a61efa01a255ab94eddd06321f1afd88653d26)
set(qtquicktimeline_REF 964efe364a37ef20da42d0a207022fe4b9414fe1)
set(qtquick3d_REF 8f4a5d3bedb548def24f2192d23a724dd05ed5a6)
set(qtsvg_REF 6c682d8f996ef5d6c8241f8550cab03cac49f440)
set(qttranslations_REF 4a1ae5b85d64411217438705da21462c5c7f9034)
set(qtwayland_REF 2bc79b7e60af737ceb3329cae076804ab84ea4d4)
set(qtbase_REF 597359f7d0736917123842dee63a7ae45522eb8e )
set(qtshadertools_REF d954aeb073375ee1edda4d6b2956c3c79b26b386 )
set(qtdeclarative_REF 614d85d460fa46e947eeb4281609ce5453a29e5c )
set(qt5compat_REF c5dab10ba77dd2701dbd2d7b69998fbee90557f2 )
set(qttools_REF a60e0e5dfb2af83ffb1adda28028b24e21fe9131 ) # Additional refs below
set(qtcoap_REF 29df645fc165087e74b603e7ad20033381006fb5 )
set(qtdoc_REF 5c70158a15f23224a76b6919ab06eefee6ed187e )
set(qtimageformats_REF 356fb7846b5bc002b2d34e23253fda1dffed7932 )
set(qtmqtt_REF 9ad6c48474c2b94c62a518dc3dc7e65d30a6309e )
set(qtnetworkauth_REF d5ffb7549dd1e6139b746021c4d40053d0f15950 )
set(qtopcua_REF 4a0dd4334d98bea48acda1e203ab2c31f207bad3 )
set(qtquicktimeline_REF 6a06bdbaa55d1c165e992732f2e3dc923846b921 )
set(qtquick3d_REF d126dea81f48386ef24e8b30e1328c40e72c4861 )
set(qtsvg_REF 77ea18adfb91c591f249f442e0ffc0079023e431 )
set(qttranslations_REF 87f95df09b1fc388ea15ce208a349d6b1deac2a4 )
set(qtwayland_REF 6bdaed8301336750dda95823ed0dfac4828ebab6 )
### New in 6.1
set(qtactiveqt_REF 8900aaf9bd44c265544b6346ab951ac8b4fa2cb3)
set(qtcharts_REF 690c97c1c0628985014c49ed69f5e9b05da3d775)
set(qtdatavis3d_REF 6e8983a92203194f5047002340ecf522e83187d1)
set(qtdeviceutilities_REF 643e82571dad2c96616d851508393a27b7ca788b)
set(qtlottie_REF 1509364fe51f432a5367d19a1a3f13566fa5e70f)
set(qtscxml_REF 98f98f87437369f6a3ed4f9f8668d0a29964372a)
set(qtvirtualkeyboard_REF 06ea4e113221c26ee5ed2edad6cffa63cde30978)
set(qtactiveqt_REF 5dd7acd1395627e6bd0d87beb148957059c1a3c6 )
set(qtcharts_REF 7184ea521d04ec13587562c3275ae698fa9a722e )
set(qtdatavis3d_REF 74c469d4926f59264c5cbc47fe301fe4713aa358 )
set(qtdeviceutilities_REF f7333510b4dcfe32eb9065a63c434704750d4fb6 )
set(qtlottie_REF fd61d8e92cfacbd3d10f31b176a7cde911525632 )
set(qtscxml_REF 63455c888e012fdc682c32fd3d0de96127721bd4 )
set(qtvirtualkeyboard_REF ffe9bba23ae45662d25ac3d90167d794e0d6c828 )
### New in 6.2
set(qtconnectivity_REF ddfa5de7af5d674ac1d0e9d18e37f70ae1ccd453)
set(qtmultimedia_REF 03c6a61266543c7634915de65cdb7752a25df6f4)
set(qtremoteobjects_REF 715bc1f6bc551aedbaddca3f44f3a5cee8710936)
set(qtserialport_REF b7f42ccd13cf0e736b65eebb7537e31584af6930)
set(qtsensors_REF e53e83d9beffc6a3ef465e91033f2b62fc8102fa)
set(qtserialbus_REF edefe743658051c6c406d3d7645031f2ac281fc0)
set(qtlocation_REF 0) # Currently empty port
set(qtwebchannel_REF adbb4c38c5af970f46000f61501ceee714364a46)
set(qtwebengine_REF 855304132f321f285986c7f1710a45bae72aec12) # Additional refs below
set(qtwebsockets_REF 84e8557281b242d3023b2cff86366343ac440fee)
set(qtwebview_REF 4c27976cd3817914a927f66153b123fd593a9fcf)
set(qtpositioning_REF 2702073aec1d87bb150bf27e8b28f0351710aaa6)
set(qtconnectivity_REF f0ac95d1685f4f0f2e72fb42800b17d7738ccefb )
set(qtmultimedia_REF 3423c7172f948f27ff0512d1d2db4ea97fc0e9c0 )
set(qtremoteobjects_REF 2d0f27e736211e2a6b9d08345f65c736a17a67eb )
set(qtserialport_REF c7dc6737a2e98af81900f55f814cf79a6d579779 )
set(qtsensors_REF 32dda47f507e74ef7ed33290545b762a0c20e532 )
set(qtserialbus_REF 1ebbf87cbc90c22817785bffc563d4bb86525abc )
set(qtlocation_REF 0 ) # Currently empty port
set(qtwebchannel_REF e1014dcf9a924d3b8fd3450a3360381a0a8fc6ab )
set(qtwebengine_REF cc7181c12d1d1605ecab6c448df4a684278d01d8 ) # Additional refs below
set(qtwebsockets_REF fd509016da201ed63122c5ec79355930f2489ee8 )
set(qtwebview_REF aade84c30fbbc85fe5a8c5e49172a02a7522623d )
set(qtpositioning_REF 3a68165bc88f9ddd165567d30887147d2d71915b )
### New in Qt 6.2.2
set(qtapplicationmanager_REF bcdd87312d8f959a8b928d9e1bc5f614fea9e4b3)
set(qtinterfaceframework_REF e0ebb6fd68e5c585ad55da8c4ca768ade6b82617)
set(qtapplicationmanager_REF 2626ae6e9ce84aebd88a163153719c07d7f65b7d )
set(qtinterfaceframework_REF 71512be8758c75b4b6b0130d6b623f564c6bf227 )
#Submodule stuff:
set(qttools_qlitehtml_REF 4931b7aa30f256c20573d283561aa432fecf8f38)
set(qttools_litehtml_REF 6236113734bb0a28467e5999e86fdd2834be8e01)
set(qttools_litehtml_HASH 38effe92aaebd7113ad3bf3b70c1b3564d6226a766aa968c80ab35fa90ae78d601486226f97d16fa5bd3abf314db19f9f0c90e31de91e87bda82cde27f0a57dc)
set(qtwebengine_chromium_REF 30c22c6ed9833c7e6e14a345752c6f13cfbaec51)
set(qtwebengine_chromium_REF b33b4266df8c333d3d273ae4665d6b322eee33c6)
if(QT_UPDATE_VERSION)
message(STATUS "Running Qt in automatic version port update mode!")
@ -123,7 +123,7 @@ if(QT_UPDATE_VERSION)
foreach(_current_qt_port IN LISTS QT_PORTS)
set(_current_control "${VCPKG_ROOT_DIR}/ports/${_current_qt_port}/vcpkg.json")
file(READ "${_current_control}" _control_contents)
string(REGEX REPLACE "\"version-(string|semver)\": [^\n]+\n" "\"version-semver\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}")
string(REGEX REPLACE "\"version(-(string|semver))?\": [^\n]+\n" "\"version\": \"${QT_VERSION}\",\n" _control_contents "${_control_contents}")
string(REGEX REPLACE "\"port-version\": [^\n]+\n" "" _control_contents "${_control_contents}")
file(WRITE "${_current_control}" "${_control_contents}")
#need to run a vcpkg format-manifest --all after update once

62
ports/qtbase/dont_force_cmakecache.patch
View File

@ -2,22 +2,16 @@ diff --git a/cmake/QtPostProcessHelpers.cmake b/cmake/QtPostProcessHelpers.cmake
index 4f8106dfa..bec5c402e 100644
--- a/cmake/QtPostProcessHelpers.cmake
+++ b/cmake/QtPostProcessHelpers.cmake
@@ -414,7 +414,7 @@ function(qt_generate_install_prefixes out_var)
@@ -472,7 +472,7 @@ function(qt_generate_install_prefixes out_var)
foreach(var ${vars})
get_property(docstring CACHE "${var}" PROPERTY HELPSTRING)
- string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" FORCE)\n")
+ string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\")\n")
+ string(APPEND content "set(${var} \"${${var}}\" CACHE STRING \"${docstring}\" )\n")
endforeach()
set(${out_var} "${content}" PARENT_SCOPE)
@@ -465,12 +465,12 @@ function(qt_generate_build_internals_extra_cmake_code)
# at the start of project configuration (with an empty value),
# so we need to force override it.
string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
- "set(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\" CACHE STRING \"Choose the type of build.\" FORCE)\n")
+ "set(CMAKE_BUILD_TYPE \"${CMAKE_BUILD_TYPE}\" CACHE STRING \"Choose the type of build.\")\n")
@@ -528,7 +528,7 @@ qt_internal_force_set_cmake_build_type_conditionally(
endif()
if(CMAKE_CONFIGURATION_TYPES)
string(APPEND multi_config_specific
@ -26,21 +20,39 @@ index 4f8106dfa..bec5c402e 100644
endif()
if(CMAKE_TRY_COMPILE_CONFIGURATION)
string(APPEND multi_config_specific
@@ -492,7 +492,7 @@ function(qt_generate_build_internals_extra_cmake_code)
if(multi_config_specific)
string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS "
if(QT_BUILD_STANDALONE_TESTS)
- set(CMAKE_BUILD_TYPE \"\${QT_MULTI_CONFIG_FIRST_CONFIG}\" CACHE STRING \"Choose the type of build.\" FORCE)
+ set(CMAKE_BUILD_TYPE \"\${QT_MULTI_CONFIG_FIRST_CONFIG}\" CACHE STRING \"Choose the type of build.\")
@@ -655,7 +655,7 @@ endif()\n")
# find_package(Qt6Core) is called in case if the feature was disabled.
string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS "
if(NOT QT_SKIP_BUILD_INTERNALS_PKG_CONFIG_FEATURE)
- set(FEATURE_pkg_config \"${FEATURE_pkg_config}\" CACHE STRING \"Using pkg-config\" FORCE)
+ set(FEATURE_pkg_config \"${FEATURE_pkg_config}\" CACHE STRING \"Using pkg-config\")
endif()\n")
endif()
@@ -583,7 +583,7 @@ endif()\n")
if(\"$\{CMAKE_STAGING_PREFIX}\" STREQUAL \"\"
AND NOT QT_BUILD_INTERNALS_NO_FORCE_SET_STAGING_PREFIX)
set(CMAKE_STAGING_PREFIX \"${CMAKE_STAGING_PREFIX}\" CACHE PATH
- \"Staging path prefix, prepended onto install directories on the host machine.\" FORCE)
+ \"Staging path prefix, prepended onto install directories on the host machine.\" )
endif()
")
endif()
# The OpenSSL root dir needs to be saved so that repos other than qtbase (like qtopcua) can
diff --git a/cmake/QtBuildInternalsExtra.cmake.in b/cmake/QtBuildInternalsExtra.cmake.in
index cadf3847c..6ec51fd63 100644
--- a/cmake/QtBuildInternalsExtra.cmake.in
+++ b/cmake/QtBuildInternalsExtra.cmake.in
@@ -41,11 +41,11 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND
AND "${CMAKE_STAGING_PREFIX}" STREQUAL ""
AND NOT QT_BUILD_INTERNALS_NO_FORCE_SET_STAGING_PREFIX)
set(CMAKE_STAGING_PREFIX "${qtbi_new_prefix}" CACHE PATH
- "Staging path prefix, prepended onto install directories on the host machine." FORCE)
+ "Staging path prefix, prepended onto install directories on the host machine." )
set(qtbi_new_prefix "${qtbi_orig_prefix}")
endif()
set(CMAKE_INSTALL_PREFIX "${qtbi_new_prefix}" CACHE PATH
- "Install path prefix, prepended onto install directories." FORCE)
+ "Install path prefix, prepended onto install directories." )
unset(qtbi_orig_prefix)
unset(qtbi_real_orig_prefix)
unset(qtbi_new_prefix)
@@ -138,7 +138,7 @@ function(qt_internal_force_set_cmake_build_type_conditionally value)
AND NOT __qt_toolchain_cmake_build_type_before_project_call
AND NOT QT_NO_FORCE_SET_CMAKE_BUILD_TYPE
AND NOT __qt_internal_extras_is_multi_config)
- set(CMAKE_BUILD_TYPE "${value}" CACHE STRING "Choose the type of build." FORCE)
+ set(CMAKE_BUILD_TYPE "${value}" CACHE STRING "Choose the type of build.")
endif()
endfunction()

16
ports/qtbase/env.patch Normal file
View File

@ -0,0 +1,16 @@
diff --git a/cmake/QtTestHelpers.cmake b/cmake/QtTestHelpers.cmake
index 279ab07dd..951fd3d36 100644
--- a/cmake/QtTestHelpers.cmake
+++ b/cmake/QtTestHelpers.cmake
@@ -653,9 +653,9 @@ function(qt_internal_collect_command_environment out_path out_plugin_path)
# The regular CMAKE_INSTALL_PREFIX can be different for example when building standalone tests.
# Any given CMAKE_INSTALL_PREFIX takes priority over qt_relocatable_install_prefix for the
# PATH environment variable.
- set(install_prefixes "${CMAKE_INSTALL_PREFIX}")
+ set(install_prefixes "${CMAKE_INSTALL_PREFIX}$<$<CONFIG:DEBUG>:/debug>")
if(QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX)
- list(APPEND install_prefixes "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}")
+ list(APPEND install_prefixes "${QT_BUILD_INTERNALS_RELOCATABLE_INSTALL_PREFIX}$<$<CONFIG:DEBUG>:/debug>")
endif()
file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" test_env_path)

27
ports/qtbase/portfile.cmake
View File

@ -19,6 +19,10 @@ set(${PORT}_PATCHES
fix_egl.patch
)
if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
list(APPEND ${PORT}_PATCHES env.patch)
endif()
if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST)
list(APPEND ${PORT}_PATCHES
)
@ -55,6 +59,7 @@ foreach(_input IN LISTS input_vars)
endforeach()
# General features:
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"appstore-compliant" FEATURE_appstore_compliant
@ -70,6 +75,8 @@ FEATURES
"widgets" FEATURE_widgets
#"xml" FEATURE_xml # Required to build moc
"testlib" FEATURE_testlib
"zstd" CMAKE_REQUIRE_FIND_PACKAGE_zstd
${require_features}
INVERTED_FEATURES
"zstd" CMAKE_DISABLE_FIND_PACKAGE_ZSTD
"dbus" CMAKE_DISABLE_FIND_PACKAGE_WrapDBus1
@ -89,10 +96,12 @@ FEATURES
"glib" FEATURE_glib
"icu" FEATURE_icu
"pcre2" FEATURE_pcre2
#"icu" CMAKE_REQUIRE_FIND_PACKAGE_ICU
"glib" CMAKE_REQUIRE_FIND_PACKAGE_GLIB2
INVERTED_FEATURES
#"doubleconversion" CMAKE_DISABLE_FIND_PACKAGE_WrapDoubleConversion # Required
"icu" CMAKE_DISABLE_FIND_PACKAGE_ICU
#"pcre2" CMAKE_DISABLE_FIND_PACKAGE_WrapSystemPCRE2 # Bug in qt cannot be deactivated
"icu" CMAKE_DISABLE_FIND_PACKAGE_ICU
"glib" CMAKE_DISABLE_FIND_PACKAGE_GLIB2
)
@ -106,6 +115,8 @@ list(APPEND FEATURE_CORE_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Libsystemd:BOOL=ON
FEATURES
"openssl" FEATURE_openssl
"brotli" FEATURE_brotli
#"brotli" CMAKE_REQUIRE_FIND_PACKAGE_WrapBrotli
#"openssl" CMAKE_REQUIRE_FIND_PACKAGE_WrapOpenSSL
INVERTED_FEATURES
"brotli" CMAKE_DISABLE_FIND_PACKAGE_WrapBrotli
"openssl" CMAKE_DISABLE_FIND_PACKAGE_WrapOpenSSL
@ -136,6 +147,18 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_GUI_OPTIONS
"xkbcommon-x11" FEATURE_xkbcommon_x11
"xrender" FEATURE_xrender # requires FEATURE_xcb_native_painting; otherwise disabled.
"xrender" FEATURE_xcb_native_painting # experimental
#"vulkan" CMAKE_REQUIRE_FIND_PACKAGE_Vulkan
#"egl" CMAKE_REQUIRE_FIND_PACKAGE_EGL
#"fontconfig" CMAKE_REQUIRE_FIND_PACKAGE_Fontconfig
#"harfbuzz" CMAKE_REQUIRE_FIND_PACKAGE_WrapSystemHarfbuzz
#"jpeg" CMAKE_REQUIRE_FIND_PACKAGE_JPEG
#"png" CMAKE_REQUIRE_FIND_PACKAGE_PNG
#"xlib" CMAKE_REQUIRE_FIND_PACKAGE_X11
#"xkb" CMAKE_REQUIRE_FIND_PACKAGE_XKB
#"xcb" CMAKE_REQUIRE_FIND_PACKAGE_XCB
#"xcb-xlib" CMAKE_REQUIRE_FIND_PACKAGE_X11_XCB
#"xkbcommon-x11" CMAKE_REQUIRE_FIND_PACKAGE_XKB_COMMON_X11
#"xrender" CMAKE_REQUIRE_FIND_PACKAGE_XRender
INVERTED_FEATURES
"vulkan" CMAKE_DISABLE_FIND_PACKAGE_Vulkan
"egl" CMAKE_DISABLE_FIND_PACKAGE_EGL
@ -178,6 +201,8 @@ list(APPEND FEATURE_GUI_OPTIONS -DCMAKE_DISABLE_FIND_PACKAGE_Tslib:BOOL=ON)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_SQLDRIVERS_OPTIONS
FEATURES
"sql-sqlite" FEATURE_system_sqlite
#"sql-psql" CMAKE_REQUIRE_FIND_PACKAGE_PostgreSQL
#"sql-sqlite" CMAKE_REQUIRE_FIND_PACKAGE_SQLite3
INVERTED_FEATURES
"sql-psql" CMAKE_DISABLE_FIND_PACKAGE_PostgreSQL
"sql-sqlite" CMAKE_DISABLE_FIND_PACKAGE_SQLite3

2
ports/qtbase/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtbase",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"license": null,

1
ports/qtcharts/portfile.cmake
View File

@ -5,6 +5,7 @@ set(${PORT}_PATCHES)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)

2
ports/qtcharts/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtcharts",
"version": "6.2.3",
"version": "6.2.4",
"description": "QtCharts module",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtcoap/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtcoap",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt CoAP client module",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtconnectivity/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtconnectivity",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Connectivity",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtdatavis3d/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtdatavis3d",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt 3D data visualization framework",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtdeclarative/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtdeclarative",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Declarative (Quick 2)",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtdeviceutilities/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtdeviceutilities",
"version": "6.2.3",
"version": "6.2.4",
"description": "Utils for Boot2Qt",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtdoc/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtdoc",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Documentation",
"homepage": "https://www.qt.io/",
"license": null,

4
ports/qtimageformats/portfile.cmake
View File

@ -5,6 +5,10 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES no_target_promotion.patch)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
#"jasper" CMAKE_REQUIRE_FIND_PACKAGE_WrapJasper
#"webp" CMAKE_REQUIRE_FIND_PACKAGE_WrapWebP
#"tiff" CMAKE_REQUIRE_FIND_PACKAGE_TIFF
INVERTED_FEATURES
"jasper" CMAKE_DISABLE_FIND_PACKAGE_WrapJasper
"webp" CMAKE_DISABLE_FIND_PACKAGE_WrapWebP

2
ports/qtimageformats/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtimageformats",
"version": "6.2.3",
"version": "6.2.4",
"description": "Additional Image Format plugins for Qt",
"homepage": "https://www.qt.io/",
"license": null,

3
ports/qtinterfaceframework/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "qtinterfaceframework",
"version": "6.2.3",
"port-version": 2,
"version": "6.2.4",
"description": "Qt Interface Framework",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtlocation/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtlocation",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Location",
"homepage": "https://www.qt.io/",
"license": null,

1
ports/qtlottie/portfile.cmake
View File

@ -6,6 +6,7 @@ set(${PORT}_PATCHES)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)

2
ports/qtlottie/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtlottie",
"version": "6.2.3",
"version": "6.2.4",
"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,

2
ports/qtmqtt/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtmqtt",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/",
"homepage": "https://www.qt.io/",
"license": null,

4
ports/qtmultimedia/portfile.cmake
View File

@ -23,6 +23,9 @@ set(${PORT}_PATCHES fix_windows_header_include.patch
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
"widgets" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Widgets
#"gstreamer" CMAKE_REQUIRE_FIND_PACKAGE_GStreamer
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
"widgets" CMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets
@ -37,6 +40,7 @@ endif()
if(VCPKG_TARGET_IS_LINUX)
list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=ON")
list(APPEND FEATURE_OPTIONS "-DCMAKE_REQUIRE_FIND_PACKAGE_ALSA=ON")
else()
list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON")
endif()

2
ports/qtmultimedia/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtmultimedia",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Multimedia",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtnetworkauth/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtnetworkauth",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Network Authenticators; QtOAuth in particular",
"homepage": "https://www.qt.io/",
"license": null,

1
ports/qtopcua/portfile.cmake
View File

@ -9,6 +9,7 @@ FEATURES
"uacpp" FEATURE_uacpp
"ns0idnames" FEATURE_ns0idnames
"ns0idgenerator" FEATURE_ns0idgenerator
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)

2
ports/qtopcua/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtopcua",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt wrapper for existing OPC UA stacks",
"homepage": "https://www.qt.io/",
"license": null,

1
ports/qtpositioning/portfile.cmake
View File

@ -3,6 +3,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake")
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)

2
ports/qtpositioning/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtpositioning",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Positioning",
"homepage": "https://www.qt.io/",
"license": null,

1
ports/qtquick3d/portfile.cmake
View File

@ -5,6 +5,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake")
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"assimp" FEATURE_quick3d_assimp
#"assimp" CMAKE_REQUIRE_FIND_PACKAGE_WrapQuick3DAssimp
INVERTED_FEATURES
"assimp" CMAKE_DISABLE_FIND_PACKAGE_WrapQuick3DAssimp
)

2
ports/qtquick3d/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtquick3d",
"version": "6.2.3",
"version": "6.2.4",
"description": "A new module and API for defining 3D content in Qt Quick.",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtquicktimeline/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtquicktimeline",
"version": "6.2.3",
"version": "6.2.4",
"description": "Module for keyframe-based timeline construction.",
"homepage": "https://www.qt.io/",
"license": null,

1
ports/qtremoteobjects/portfile.cmake
View File

@ -6,6 +6,7 @@ set(TOOL_NAMES repc)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)

2
ports/qtremoteobjects/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtremoteobjects",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt distributed object system",
"homepage": "https://www.qt.io/",
"license": null,

1
ports/qtscxml/portfile.cmake
View File

@ -7,6 +7,7 @@ set(TOOL_NAMES qscxmlc)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Qml
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Qml
)

2
ports/qtscxml/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtscxml",
"version": "6.2.3",
"version": "6.2.4",
"description": "SCXML (state machine notation) compiler and related tools",
"homepage": "https://www.qt.io/",
"license": null,

1
ports/qtsensors/portfile.cmake
View File

@ -5,6 +5,7 @@ set(${PORT}_PATCHES)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)

2
ports/qtsensors/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtsensors",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Sensors",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtserialbus/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtserialbus",
"version": "6.2.3",
"version": "6.2.4",
"description": "Support for CAN and potentially other serial buses.",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtserialport/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtserialport",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Serial Port support",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtshadertools/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtshadertools",
"version": "6.2.3",
"version": "6.2.4",
"description": "APIs and tools in this module provide the producer functionality for the shader pipeline that allows Qt Quick to operate on Vulkan, Metal, and Direct3D, in addition to OpenGL.",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtsvg/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtsvg",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt SVG",
"homepage": "https://www.qt.io/",
"license": null,

4
ports/qttools/portfile.cmake
View File

@ -37,6 +37,10 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"assistant" FEATURE_assistant
"designer" FEATURE_designer
"linguist" FEATURE_linguist
"qdoc" CMAKE_REQUIRE_FIND_PACKAGE_Clang
#"qdoc" CMAKE_REQUIRE_FIND_PACKAGE_WrapLibClang
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6QuickWidgets
INVERTED_FEATURES
"qdoc" CMAKE_DISABLE_FIND_PACKAGE_Clang
"qdoc" CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang

2
ports/qttools/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qttools",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Tools",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qttranslations/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qttranslations",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Translations",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtvirtualkeyboard/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtvirtualkeyboard",
"version": "6.2.3",
"version": "6.2.4",
"description": "SCXML (state machine notation) compiler and related tools",
"homepage": "https://www.qt.io/",
"license": null,

1
ports/qtwayland/portfile.cmake
View File

@ -12,6 +12,7 @@ set(TOOL_NAMES qtwaylandscanner)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)

2
ports/qtwayland/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtwayland",
"version": "6.2.3",
"version": "6.2.4",
"description": "A toolbox for making Qt based Wayland compositors",
"homepage": "https://www.qt.io/",
"license": null,

1
ports/qtwebchannel/portfile.cmake
View File

@ -6,6 +6,7 @@ set(${PORT}_PATCHES)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)

2
ports/qtwebchannel/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtwebchannel",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt WebChannel",
"homepage": "https://www.qt.io/",
"license": null,

2
ports/qtwebengine/portfile.cmake
View File

@ -9,6 +9,8 @@ FEATURES
"spellchecker" FEATURE_webengine_spellchecker
"geolocation" FEATURE_webengine_geolocation
"webchannel" FEATURE_webengine_webchannel
"geolocation" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Positioning
"webchannel" CMAKE_REQUIRE_FIND_PACKAGE_Qt6WebChannel
INVERTED_FEATURES
"geolocation" CMAKE_DISABLE_FIND_PACKAGE_Qt6Positioning
"webchannel" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebChannel

3
ports/qtwebengine/vcpkg.json
View File

@ -1,8 +1,7 @@
{
"$comment": "x86-windows is not within the upstream support matrix of Qt6",
"name": "qtwebengine",
"version": "6.2.3",
"port-version": 1,
"version": "6.2.4",
"description": "Qt WebEngine",
"homepage": "https://www.qt.io/",
"license": null,

1
ports/qtwebsockets/portfile.cmake
View File

@ -6,6 +6,7 @@ set(${PORT}_PATCHES)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
)

2
ports/qtwebsockets/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtwebsockets",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt WebSockets",
"homepage": "https://www.qt.io/",
"license": null,

3
ports/qtwebview/portfile.cmake
View File

@ -6,6 +6,9 @@ set(${PORT}_PATCHES)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6WebEngineQuick
"webengine" CMAKE_REQUIRE_FIND_PACKAGE_WebEngineCore
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineQuick

2
ports/qtwebview/vcpkg.json
View File

@ -1,6 +1,6 @@
{
"name": "qtwebview",
"version": "6.2.3",
"version": "6.2.4",
"description": "Qt Web View",
"homepage": "https://www.qt.io/",
"license": null,

82
versions/baseline.json
View File

@ -5629,7 +5629,7 @@
"port-version": 1
},
"qt": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qt-advanced-docking-system": {
@ -5809,7 +5809,7 @@
"port-version": 0
},
"qt5compat": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qt6betablock": {
@ -5817,52 +5817,52 @@
"port-version": 0
},
"qtactiveqt": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtapplicationmanager": {
"baseline": "6.2.3",
"port-version": 1
"baseline": "6.2.4",
"port-version": 0
},
"qtbase": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtcharts": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtcoap": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtconnectivity": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtdatavis3d": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtdeclarative": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtdeviceutilities": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtdoc": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtimageformats": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtinterfaceframework": {
"baseline": "6.2.3",
"port-version": 2
"baseline": "6.2.4",
"port-version": 0
},
"qtkeychain": {
"baseline": "0.13.2",
@ -5873,35 +5873,35 @@
"port-version": 0
},
"qtlocation": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtlottie": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtmqtt": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtmultimedia": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtnetworkauth": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtopcua": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtpositioning": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtquick3d": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtquickcontrols2": {
@ -5909,67 +5909,67 @@
"port-version": 0
},
"qtquicktimeline": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtremoteobjects": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtscxml": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtsensors": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtserialbus": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtserialport": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtshadertools": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtsvg": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qttools": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qttranslations": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtvirtualkeyboard": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtwayland": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtwebchannel": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtwebengine": {
"baseline": "6.2.3",
"port-version": 1
"baseline": "6.2.4",
"port-version": 0
},
"qtwebsockets": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"qtwebview": {
"baseline": "6.2.3",
"baseline": "6.2.4",
"port-version": 0
},
"quadtree": {

5
versions/q-/qt.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "38c269c72f98a9fd49b28d428ad29cc5f1079fac",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "174cc984a142087680da0f0f42e659b835bb17b8",
"version": "6.2.3",

5
versions/q-/qt5compat.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e9ffdd0f5186b67741f04c15121449eb62f21f45",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "d650b3405a677deca9110c6ea6861bfaa24645f2",
"version": "6.2.3",

5
versions/q-/qtactiveqt.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f58617e4fa4a6e358daffccd8d286cd9dab162ee",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "bc03ec029e90f445ee878ad27b476b60da06ee3e",
"version": "6.2.3",

5
versions/q-/qtapplicationmanager.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d51f980344bfb14ace79b30fbf510e92b4924da8",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "3c971f01c7b3ee85236a451ad93fd00fe4cc17e6",
"version": "6.2.3",

5
versions/q-/qtbase.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "35e9386f344f01e0e37df7b2d2ae991db6bbb1cc",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "bfac5075bd2dcb338153b016e27ff8789b05688b",
"version": "6.2.3",

5
versions/q-/qtcharts.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d5e059fea3a95f9b719d3b3069f09be05413ef99",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "f4676a2659098089318793815dcbff8cdb55ea9f",
"version": "6.2.3",

5
versions/q-/qtcoap.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7f05c6aaeb825647d3c802feeb1b06a0d14a83c0",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "948308d4ae9a45ee3c438fb512b2fe25c3661773",
"version": "6.2.3",

5
versions/q-/qtconnectivity.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "db0fc2cda2cc383043f8e1fc4b48849183f038b8",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "fbe8db54ab4377615f8328227d21c8bf470551d6",
"version": "6.2.3",

5
versions/q-/qtdatavis3d.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c35b1ffb8bc3d76b8537e2d5d59176545f4a02bc",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "014813f75ac07a1207692d81609b4cc6e28e5737",
"version": "6.2.3",

5
versions/q-/qtdeclarative.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ea64315431fd028d453a27e999d7e696f48923d4",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "ede6e28a20ddf3b6d4cc7b1e7ac7dc41f80e64a8",
"version": "6.2.3",

5
versions/q-/qtdeviceutilities.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a688914d635b3b8f3295bfa76e3581b2db6d3d44",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "91bd6966a66abed85eab29725a1fa838b7416c9f",
"version": "6.2.3",

5
versions/q-/qtdoc.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5e04878cf2a70ff87ae027aaefc5d40c328cffba",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "86089f5d381b17bdd89c9fd7953db2ff38dcec38",
"version": "6.2.3",

5
versions/q-/qtimageformats.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "721c778bc9a6bd4e04a2e1cfb5437ffb7e59abc0",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "fff7150f31fcb2531adcb2f8fa42b6106c2893d1",
"version": "6.2.3",

5
versions/q-/qtinterfaceframework.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e36f5d74c2e94aa38c74b0fdfec8778fb7851523",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "42968cd54d91bbbf94a3c5aaaf6f1de876b0efac",
"version": "6.2.3",

5
versions/q-/qtlocation.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ef7c3db0a80c38d01ff341d090a291f4f1a098aa",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "589d851aebfb0c2dd786a5b0a8d7c33e56083223",
"version": "6.2.3",

5
versions/q-/qtlottie.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "57035eea5acd484e3a6a51f5da16046283c58f50",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "ab8ffeb4492e7cabd51fa8c5ead514e4764f67e5",
"version": "6.2.3",

5
versions/q-/qtmqtt.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0b09100a4e32240e79258ab69386b77370d916a0",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "adfab6c76e26f420db304e6d131cab246da43200",
"version": "6.2.3",

5
versions/q-/qtmultimedia.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d0e46329a8e66cf3f95eca5d4018c955a8b54a15",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "3a6cdbf95fd19f196f2e0d7c9ed149e621690a7a",
"version": "6.2.3",

5
versions/q-/qtnetworkauth.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "edc058f97084276593fa00ebc1ad1dbf865abb57",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "205649afe146022c19e1246083c83c4ca1573959",
"version": "6.2.3",

5
versions/q-/qtopcua.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7a9e72b88e14594db1752854941cb95174565be6",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "3fef74b1cf459126f776aa964fa6900e7be903fb",
"version": "6.2.3",

5
versions/q-/qtpositioning.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "26bbae5f5512a6ca58eada26e54c94666174ec71",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "1c16604affb63067fcad166931565e516250434f",
"version": "6.2.3",

5
versions/q-/qtquick3d.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0782a581d66c7895e5fe12eb225bbd63ff6d0799",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "822ca9b71fbf3eb7ae119c25e87dc8e00f70b0a5",
"version": "6.2.3",

5
versions/q-/qtquicktimeline.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7797c7b3d33d915ba656bfc26717623fcd187109",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "d213e9348a705383181332c7448c14b94235f89e",
"version": "6.2.3",

5
versions/q-/qtremoteobjects.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c9f576479ffa0be9262702030362c0b030b1497b",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "a7a71c783e081189c9edb6a9e59707472863738f",
"version": "6.2.3",

5
versions/q-/qtscxml.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "82cfc4f68723b511524573f7492e44c0326378f7",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "e7c00e022f07f448e2c6d2509bc6986f5b75d3b8",
"version": "6.2.3",

5
versions/q-/qtsensors.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b52c1c71cc2c185f936b5e1e278ed4758bae6d6e",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "5515c06070b3f4b8ae13497824653e91d09476d7",
"version": "6.2.3",

5
versions/q-/qtserialbus.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "97a896e4a1812c908a3db8b73676fbda9280569b",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "413e942ee8da80bd4f4f64b4eb4de978740a9d65",
"version": "6.2.3",

5
versions/q-/qtserialport.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3a4f36aca9457e6a78f5b6c1f65b1d36f7666fd7",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "e500faa24ed6ecba0cfe64ce061763c47612c767",
"version": "6.2.3",

5
versions/q-/qtshadertools.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7d8e8be656c7dc865d98021272c0f716c14866ed",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "cd4279442737df6c5e8ba533f8ce52b0a03cdc08",
"version": "6.2.3",

5
versions/q-/qtsvg.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "df716d6718c7fad4a45e9eecc493c6c4cc752744",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "37349a1661b8bfda73318abcb5db080fb6fc71d6",
"version": "6.2.3",

5
versions/q-/qttools.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a00f4470b9264ccffc7dfb230684126e61fb0f2c",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "79247ffe31fa15579c9069634c3d8778672928ca",
"version": "6.2.3",

5
versions/q-/qttranslations.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d16f4613ad42d01be87aa75bf23013dc7da1845a",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "3df8c89676608f1a4a58aeef4cb6e9edfe5666fb",
"version": "6.2.3",

5
versions/q-/qtvirtualkeyboard.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fcfb5975545e28e64e2f5c71c5f5a2cbc0b22c70",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "7ec572e9663958105a8c2b89c24a93d4280f002c",
"version": "6.2.3",

5
versions/q-/qtwayland.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9930653065c44653bdf5f7285799d1a9ebb44d83",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "6eaf26953606c37b93a2e03d2162f80e4d2d4d6a",
"version": "6.2.3",

5
versions/q-/qtwebchannel.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7bc22dab6b47734c9163edde8bef8e9088a04301",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "0f4fee2471dba6631d06fcac6a9f99c38fe14649",
"version": "6.2.3",

5
versions/q-/qtwebengine.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "7972a7fa77f29d83f91787c942f4f85d50651c05",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "c09764532fe7b4367f6438db92b59f41cb3d4e52",
"version": "6.2.3",

5
versions/q-/qtwebsockets.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "78911113c7407ff6403479ace90d0f4b2656e517",
"version": "6.2.4",
"port-version": 0
},
{
"git-tree": "cc3e9ce12b12aecdb4372cee226fcb0ddc4b0f34",
"version": "6.2.3",

Some files were not shown because too many files have changed in this diff Show More