[Qt6] update to 6.3.0 (#23015)

* [Qt6] Latest feature to 6.3.0

* move failing patch to !latest

* remove debug/include

* more fixes

* more fixes

* more fixes

* give me the binary names making it fail.

* add new binary

* fix qtimageformats

* fix regressions?

* retry qtopcua

* fix regressions

* correctly guard python

* more fixes

* add vcpkg-get-python-packages

* hack webengine build to see if it will work.

* move hack to a different position

* noramlize path

* update refs to 6.3 release

* fix details

* qtwebengine back to fail on baseline

* comment long path stuff out since qtwebengine cannot be build with VS 2022 any way

* update version to 6.3.0 in manifest files

* version stuff

Co-authored-by: Alexander Neumann <you@example.com>
This commit is contained in:
Alexander Neumann 2022-04-21 20:42:59 +02:00 committed by GitHub
parent ad58083681
commit 9db088e2b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
86 changed files with 416 additions and 130 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -57,7 +57,7 @@ function(qt_cmake_configure)
vcpkg_find_acquire_program(PERL) # Perl is probably required by all qt ports for syncqt
get_filename_component(PERL_PATH ${PERL} DIRECTORY)
vcpkg_add_to_path(${PERL_PATH})
if(NOT PORT STREQUAL "qtwebengine") # qtwebengine requires python2
if(NOT PORT STREQUAL "qtwebengine" OR QT_IS_LATEST) # qtwebengine requires python2; since 6.3 python3
vcpkg_find_acquire_program(PYTHON3) # Python is required by some qt ports
get_filename_component(PYTHON3_PATH ${PYTHON3} DIRECTORY)
vcpkg_add_to_path(${PYTHON3_PATH})
@ -99,6 +99,14 @@ function(qt_cmake_configure)
list(TRANSFORM disabled_features REPLACE "(:BOOL)?=OFF" "")
list(APPEND _qarg_OPTIONS_MAYBE_UNUSED ${disabled_features})
if(QT_IS_LATEST)
list(APPEND _qarg_OPTIONS "-DQT_NO_FORCE_SET_CMAKE_BUILD_TYPE:BOOL=ON")
endif()
if(NOT PORT MATCHES "qtbase")
list(APPEND _qarg_OPTIONS "-DQT_MKSPECS_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share/Qt6/mkspecs")
endif()
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
${ninja_option}
@ -144,6 +152,7 @@ function(qt_cmake_configure)
INSTALL_INCLUDEDIR
HOST_PERL
QT_SYNCQT
QT_NO_FORCE_SET_CMAKE_BUILD_TYPE
${_qarg_OPTIONS_MAYBE_UNUSED}
)
set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE)
@ -256,12 +265,14 @@ function(qt_fixup_and_cleanup)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/cmake/"
"${CURRENT_PACKAGES_DIR}/debug/share"
"${CURRENT_PACKAGES_DIR}/lib/cmake/"
"${CURRENT_PACKAGES_DIR}/debug/include"
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(GLOB_RECURSE _bin_files "${CURRENT_PACKAGES_DIR}/bin/*")
debug_message("Files in bin: '${_bin_files}'")
if(NOT _bin_files) # Only clean if empty otherwise let vcpkg throw and error.
if(NOT _bin_files STREQUAL "")
message(STATUS "Remaining files in bin: '${_bin_files}'")
else() # Only clean if empty otherwise let vcpkg throw and error.
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/" "${CURRENT_PACKAGES_DIR}/debug/bin/")
endif()
endif()

View File

@ -1,18 +1,29 @@
set(QT_VERSION 6.2.0)
set(QT_VERSION 6.3.0)
if(PORT MATCHES "qtquickcontrols2")
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
message(STATUS "qtquickcontrols2 is integrated in qtdeclarative since Qt 6.2. Please remove your dependency on it!")
return()
endif()
set(QT_GIT_TAG v${QT_VERSION})
### Setting up the git tag.
set(QT_FETCH_REF "")
set(QT_GIT_TAG "v${QT_VERSION}")
if(PORT MATCHES "qtdeviceutilities")
set(QT_FETCH_REF FETCH_REF "6.3.0")
set(QT_GIT_TAG "6.3.0")
endif()
if(PORT MATCHES "qtlocation")
set(QT_FETCH_REF FETCH_REF "${QT_VERSION}")
set(QT_GIT_TAG "${QT_VERSION}")
endif()
set(QT_IS_LATEST TRUE)
#set(QT_UPDATE_VERSION TRUE)
if(QT_UPDATE_VERSION)
function(vcpkg_extract_source_archive)
endfunction()
endif()
set(QT_IS_LATEST 1)
set(QT_PORTS qt
qtbase
@ -35,13 +46,14 @@ set(QT_PORTS qt
## New in 6.1
qtactiveqt
qtdatavis3d
#qtdeviceutils
qtdeviceutilities
qtlottie
qtscxml
qtvirtualkeyboard
qtcharts
## New in 6.2
qtconnectivity
qtpositioning
qtlocation
qtmultimedia
qtremoteobjects
@ -52,48 +64,60 @@ set(QT_PORTS qt
qtwebengine
qtwebsockets
qtwebview
## New in 6.2.2
qtinterfaceframework
qtapplicationmanager
)
foreach(_port IN LISTS QT_PORTS)
set(${_port}_TAG ${QT_GIT_TAG})
endforeach()
set(qtbase_REF 0c2d00de3488116db9f9d657fe18bcb972a83792)
set(qtshadertools_REF 119cd6e9c9e89f93b74db28f261382a2fcfe504e)
set(qtdeclarative_REF 37da36c97d9d557945abca3cea5c68d9985a06e3)
set(qt5compat_REF 291993c7813ec706e54069c7de339edfdd385c0d)
set(qttools_REF 00efbf90f978afefdcece314d19b79459eee2211) # Additional refs in portfile due to submodule
set(qtcoap_REF be7822dc920a3e3eb252d5693a7153aa606d3dc1)
set(qtdoc_REF 48a1fbab30a9f57f011fdea8ec2b47048dce4069)
set(qtimageformats_REF 7bb9dc839c0dd0806445fd475b027a82c961f686)
set(qtmqtt_REF 4fd647e23d95c522c45d86be584d18578f894823)
set(qtnetworkauth_REF aa23db40ca552d60383dea17d703b1cc0cbeace4)
set(qtopcua_REF cfb3767b2a6785e0437b99c015cb6aef7f40189c)
set(qtquicktimeline_REF e9578a6949f6192440df1cb261ed9de98a9de7d7)
set(qtquick3d_REF eaf9c60073b95b03c006279f08d4947699c32a4b)
set(qtsvg_REF cceecea040ca1247db0212217d07ec2c331004ba)
set(qttranslations_REF 03a146236e69ee41c0405a8b5707104b4ac0c6e8)
set(qtwayland_REF 8c4900dda393752faab14e39e60aec6b545c8a0f)
# set(qtquickcontrols2_REF 0) # Moved into qtdeclarative since Qt 6.2
set(qtbase_REF 0668a36d2804b300010d874f5ff4073c25c2784c)
set(qtshadertools_REF e526e8ca88197d82996818db1f00e8a3e07bf584)
set(qtdeclarative_REF cbe89ee41aa219ce7e90143e3cf54283e580f7c1)
set(qt5compat_REF 32db676ab6854633512181b2c40950c98525c5ba)
set(qttools_REF a0a9cf1d1338b3e7f868bc0840e1e9a096c86dfa) # Additional refs below
set(qtcoap_REF 4453575b94836cf1cd52642eceb1d6f5d16b26a9)
set(qtdoc_REF d0da4d47f152dc50fb672bc5011b61a5bbb36f43)
set(qtimageformats_REF 45cfb044698df541ced53e3523799232599712a6)
set(qtmqtt_REF 3174dc30d2b37c74ea685d27ab0030c7392032c0)
set(qtnetworkauth_REF 507214965cbcebbbd563904d615cf7ebc464cc48)
set(qtopcua_REF 2c7051d85f640e9afe6c3f8f718bb2152305467c)
set(qtquicktimeline_REF 16bc2eb9f5e84923dc04c3941f5347cbc1b0e5b0)
set(qtquick3d_REF bf912a678898dcde61f139f63b49e1e42717fa8d)
set(qtsvg_REF cf900932886ebdd3de6c3a4a7e63cf363663eb87)
set(qttranslations_REF 19701f38b9dc10d925c6974833d693b5038e1589)
set(qtwayland_REF 840673bf1849595869873bad15c52a312e849ffb)
### New in 6.1
set(qtactiveqt_REF 94c924a8501dba7487bf2648bdf06aefc33e726d)
set(qtcharts_REF d56b9f3de193cbf561f4b1ec332d8598dbdaaaca)
set(qtdatavis3d_REF 5c90e6642882b3b7440608f71b96ce28908f0ee8)
#set(qtdeviceutils_REF 0) #missing tag
set(qtlottie_REF 48df4f1067514a3ae8b895b5f78fca09029d9288)
set(qtscxml_REF 68ac6986b9a9b3acfcab1e445edc7c198bbf7344)
set(qtvirtualkeyboard_REF 0e49e057777cd6c3f93d123e59a9399a2cf0040f)
set(qtactiveqt_REF 747fdd27c413ea42fb730230331984f388d3826b)
set(qtcharts_REF 03929b43d8e2a5c9b1487fdc6b8a2b067ada16f8)
set(qtdatavis3d_REF 137ebda0932e6faf0fbd61b0beb3cfb4dac8efbd)
set(qtdeviceutilities_REF 0520d7fd121f7773d04a7d3318553ff7fed1b3a9) #
set(qtlottie_REF e68bf89fefd941a930c83e2c29b629fcfea03eb3)
set(qtscxml_REF 4f52a1b6e4f25f3473f42ce249c4c183c5910183)
set(qtvirtualkeyboard_REF 92aee38dab196e8b5ca436f9f20c0fc66d8155d5)
### New in 6.2
set(qtconnectivity_REF 78e7ffbe16469a19fa34cad711e0898d91bd2f30)
set(qtlocation_REF 47a945b0d054539eab3ba1cf3a1d7bf5977051d6)
set(qtmultimedia_REF d7d0e676abd4b280feb0d5105846378b64782487)
set(qtremoteobjects_REF 58932ba10420faa1cc989ed5bf101ff06475a4fc)
set(qtsensors_REF 192ca0fd252066101eb0456b957fdb51618fa7db)
set(qtserialbus_REF ce089bef29ca55d7fe46508d92d3e498eb5bb847)
set(qtserialport_REF 14dc155f3640af94c6ecff2de1489e14cd5b0047)
set(qtwebchannel_REF 09315a8d626e106953723ce68e68d6b4b97c2c52)
set(qtwebengine_REF 261d72c8afc72faf23d169a64749db216db68859) # Additional refs in portfile due to submodule
set(qtwebsockets_REF a01c2d6638fad700db23863258b7fc4a1ecdd542)
set(qtwebview_REF ca0053b6a5320046508e9ba205df775a62c1a211)
set(qtconnectivity_REF f62954bad729f7853c9fbe2ea0b3235cfae2701a)
set(qtmultimedia_REF 3d2dafab1eb60c17a30cf03213cd2f6f71185137)
set(qtremoteobjects_REF 2c53bf0e9262a24f8fc8553e5004e7d00bc7e556)
set(qtserialport_REF 7e44935b14b783add342a25f426fcdf299279024)
set(qtsensors_REF 3222894c246076c6e7bd151e638ce3eb4ce5c16b)
set(qtserialbus_REF 3ee1694d2a8fb0b755adce4b59001b784e9c301e)
set(qtlocation_REF 0) # Currently empty port
set(qtwebchannel_REF a85e05069a2b17ceb5b6332671a2eef261ec783f)
set(qtwebengine_REF 9158e7652f24800b2b7dbe59b7834687bc1baf13) # Additional refs below
set(qtwebsockets_REF 487116c9a85d8f5a920f47045dfce0b0defd5139)
set(qtwebview_REF d7498a108c67b21c39d8ba775330cc122ce21c1a)
set(qtpositioning_REF f61d2f336892b85cdcd5d508bb4a0db7f768d439)
### New in Qt 6.2.2
set(qtapplicationmanager_REF 68464eb2b3fa89c69cfc5fc4f19450af61116dd2) #
set(qtinterfaceframework_REF 7ddeb99d6215a4b63102d6a5bc73e50d77ddb3d7) #
#Submodule stuff:
set(qttools_qlitehtml_REF 4931b7aa30f256c20573d283561aa432fecf8f38)
set(qttools_litehtml_REF 6236113734bb0a28467e5999e86fdd2834be8e01)
set(qttools_litehtml_HASH 38effe92aaebd7113ad3bf3b70c1b3564d6226a766aa968c80ab35fa90ae78d601486226f97d16fa5bd3abf314db19f9f0c90e31de91e87bda82cde27f0a57dc)
set(qtwebengine_chromium_REF 2c9916de251f15369fa0f0c6bd3f45f5cf1a6f06)
if(QT_UPDATE_VERSION)
message(STATUS "Running Qt in automatic version port update mode!")

View File

@ -0,0 +1,13 @@
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)
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")
endforeach()
set(${out_var} "${content}" PARENT_SCOPE)

View File

@ -3,8 +3,10 @@
# Always check the toplevel CMakeLists.txt for the find_package call and search for linkage against the Qt:: targets
# Often enough certain (bigger) dependencies are only used to build examples and/or tests.
# As such getting the correct dependency information relevant for vcpkg requires a manual search/check
#set(QT_IS_LATEST ON)
set(QT_IS_LATEST ON)
if("latest" IN_LIST FEATURES)
set(QT_IS_LATEST ON)
endif()
## All above goes into the qt_port_hashes in the future
include("${CMAKE_CURRENT_LIST_DIR}/cmake/qt_install_submodule.cmake")
@ -13,7 +15,6 @@ set(${PORT}_PATCHES
allow_outside_prefix.patch
clang-cl_source_location.patch
config_install.patch
dont_force_cmakecache.patch
fix_cmake_build.patch
harfbuzz.patch
fix_egl.patch
@ -24,7 +25,12 @@ if(VCPKG_TARGET_IS_WINDOWS AND NOT VCPKG_TARGET_IS_MINGW)
endif()
if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST)
list(APPEND ${PORT}_PATCHES
list(APPEND ${PORT}_PATCHES
dont_force_cmakecache.patch
)
else()
list(APPEND ${PORT}_PATCHES
dont_force_cmakecache_latest.patch
)
endif()
@ -246,6 +252,8 @@ set(TOOL_NAMES
uic
qtpaths
qtpaths6
windeployqt
macdeployqt
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -16,6 +16,7 @@ include("${SCRIPT_PATH}/qt_install_submodule.cmake")
qmltime
qmltyperegistrar
qmldom
qmltc
)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}

View File

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

View File

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

View File

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

View File

@ -0,0 +1,21 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7fdd7ddbd..f189c472c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,15 @@ project(QtImageFormats # special case
HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C
)
-
+find_package(Threads)
+set_property(TARGET Threads::Threads PROPERTY _qt_no_promote_global TRUE)
+find_package(ZLIB)
+if(TARGET ZLIB::ZLIB)
+ set_property(TARGET ZLIB::ZLIB PROPERTY _qt_no_promote_global TRUE)
+endif()
+find_package(JPEG)
+if(TARGET JPEG::JPEG)
+ set_property(TARGET JPEG::JPEG PROPERTY _qt_no_promote_global TRUE)
+endif()
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals Core) # special case
find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui) # special case

View File

@ -2,7 +2,11 @@ set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) # Only plugins
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES no_target_promotion.patch)
if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST)
set(${PORT}_PATCHES no_target_promotion.patch)
else()
set(${PORT}_PATCHES no_target_promotion_latest.patch)
endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,6 +1,6 @@
{
"name": "qtopcua",
"version": "6.2.4",
"version": "6.3.0",
"description": "Qt wrapper for existing OPC UA stacks",
"homepage": "https://www.qt.io/",
"license": null,
@ -40,6 +40,7 @@
"default-features": false,
"features": [
"amalgamation",
"historizing",
"openssl"
]
}

View File

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

View File

@ -16,7 +16,7 @@ else()
list(APPEND FEATURE_OPTIONS -DINPUT_quick3d_assimp=no)
endif()
set(TOOL_NAMES balsam balsamui meshdebug shadergen instancer)
set(TOOL_NAMES balsam balsamui meshdebug shadergen instancer materialeditor shapegen)
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
TOOL_NAMES ${TOOL_NAMES}

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -45,7 +45,6 @@ endif()
vcpkg_find_acquire_program(FLEX)
vcpkg_find_acquire_program(BISON)
vcpkg_find_acquire_program(GPERF)
vcpkg_find_acquire_program(PYTHON2)
#vcpkg_find_acquire_program(GN) # Qt builds its own internal version
@ -63,8 +62,16 @@ get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY )
vcpkg_add_to_path(PREPEND "${FLEX_DIR}")
get_filename_component(BISON_DIR "${BISON}" DIRECTORY )
vcpkg_add_to_path(PREPEND "${BISON_DIR}")
get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY )
vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}")
if(NOT QT_IS_LATEST)
vcpkg_find_acquire_program(PYTHON2)
get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY )
vcpkg_add_to_path(PREPEND "${PYTHON2_DIR}")
list(APPEND FEATURE_OPTIONS "-DPython2_EXECUTABLE=${PYTHON2}")
else()
vcpkg_find_acquire_program(PYTHON3)
x_vcpkg_get_python_packages(PYTHON_EXECUTABLE "${PYTHON3}" PACKAGES html5lib)
endif()
if(WIN32) # WIN32 HOST probably has win_flex and win_bison!
if(NOT EXISTS "${FLEX_DIR}/flex${VCPKG_HOST_EXECUTABLE_SUFFIX}")
@ -75,6 +82,10 @@ if(WIN32) # WIN32 HOST probably has win_flex and win_bison!
endif()
endif()
#set(CURRENT_BUILDTREES_DIR "${CURRENT_BUILDTREES_DIR}/../tmp") # avoid long path issues in CI.
#cmake_path(NORMAL_PATH CURRENT_BUILDTREES_DIR)
#file(MAKE_DIRECTORY "${CURRENT_BUILDTREES_DIR}")
### Download third_party modules
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE
@ -103,7 +114,6 @@ qt_cmake_configure( DISABLE_PARALLEL_CONFIGURE # due to in source changes.
-DBISON_EXECUTABLE=${BISON}
-DFLEX_EXECUTABLE=${FLEX}
#-DGn_EXECUTABLE=${GN}
-DPython2_EXECUTABLE=${PYTHON2}
-DNodejs_EXECUTABLE=${NODEJS}
OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG}
OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE})

View File

@ -1,7 +1,7 @@
{
"$comment": "x86-windows is not within the upstream support matrix of Qt6",
"name": "qtwebengine",
"version": "6.2.4",
"version": "6.3.0",
"description": "Qt WebEngine",
"homepage": "https://www.qt.io/",
"license": null,
@ -103,6 +103,10 @@
"name": "snappy",
"platform": "!windows"
},
{
"name": "vcpkg-get-python-packages",
"host": true
},
{
"name": "vcpkg-tool-nodejs",
"host": true

View File

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

View File

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

View File

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

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8b4a7a1d86d93bd16d897b76cdf85abeac8e67d3",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "38c269c72f98a9fd49b28d428ad29cc5f1079fac",
"version": "6.2.4",

View File

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

View File

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

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "31b3d7a098e8f98ad1ee4d897c164236bfef040c",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "d51f980344bfb14ace79b30fbf510e92b4924da8",
"version": "6.2.4",

View File

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

View File

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

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9d43d6c903f6d72b54187e9f6657a346929ab515",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "7f05c6aaeb825647d3c802feeb1b06a0d14a83c0",
"version": "6.2.4",

View File

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

View File

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

View File

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

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4945df086d916c7aa24e9ed44ac983b1ef65c84b",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "a688914d635b3b8f3295bfa76e3581b2db6d3d44",
"version": "6.2.4",

View File

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

View File

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

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "fdc3b41d77a6ee6160cfc442ddacf03aa91d0481",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "b54a54283fd7e3a5929b1d67721675ee1c8d5234",
"version": "6.2.4",

View File

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

View File

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

View File

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

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "21bab604cd34ebe659fdc7b12249d1e69359d939",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "d0e46329a8e66cf3f95eca5d4018c955a8b54a15",
"version": "6.2.4",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2449ff55a2b817d0f651aa00b2cadc914c0b68ae",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "edc058f97084276593fa00ebc1ad1dbf865abb57",
"version": "6.2.4",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8083780556aa4e951599cc798aa4a64a3ccf7341",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "7a9e72b88e14594db1752854941cb95174565be6",
"version": "6.2.4",

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8eefc49c6f1c874ba871cbb811e13b54a0fdf7ff",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "b52c1c71cc2c185f936b5e1e278ed4758bae6d6e",
"version": "6.2.4",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8df6a16221d7abc2af7d76a7c809901e5ae45484",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "97a896e4a1812c908a3db8b73676fbda9280569b",
"version": "6.2.4",

View File

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

View File

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

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3bc8989c9c61cc741186f5dc7fc4eda94f20f6a4",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "df716d6718c7fad4a45e9eecc493c6c4cc752744",
"version": "6.2.4",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "002b7b9432d4c1f49de7a486f70a673285cd98a8",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "a00f4470b9264ccffc7dfb230684126e61fb0f2c",
"version": "6.2.4",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "09befbf6b2bd7001465003cbdd49ae138b754316",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "d16f4613ad42d01be87aa75bf23013dc7da1845a",
"version": "6.2.4",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5804d29790d75c7a40c1fe9c4f54c3cfd03a5eaa",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "fcfb5975545e28e64e2f5c71c5f5a2cbc0b22c70",
"version": "6.2.4",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "9e7c6ecb71e8b4c3b8277f97f461d6f8b017ef1c",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "9930653065c44653bdf5f7285799d1a9ebb44d83",
"version": "6.2.4",

View File

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

View File

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

View File

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

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "248b7ff0cd48d36410f9fde1119d2624260a4c6a",
"version": "6.3.0",
"port-version": 0
},
{
"git-tree": "8a8cb6fb5af80519ad2f3d0e9f80a027f1d16165",
"version": "6.2.4",