diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-09-14 00:18:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-13 15:18:29 -0700 |
| commit | d13e1a1be11272189059e34b35585ca9cd01b452 (patch) | |
| tree | c9352b23a60057f2dddba5759794ac21926917ba | |
| parent | 5b66fdd4421fccf29615e2dba4673980e8ca316f (diff) | |
| download | vcpkg-d13e1a1be11272189059e34b35585ca9cd01b452.tar.gz vcpkg-d13e1a1be11272189059e34b35585ca9cd01b452.zip | |
[Qt] update to 6.1.3 (#19918)
* [skip actions] update to 6.1.3
* remove wrong -D prefix from variables in qttools
* change to https
* version stuff
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
52 files changed, 276 insertions, 113 deletions
diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json index ffe756fdd..a0baa9d18 100644 --- a/ports/qt/vcpkg.json +++ b/ports/qt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json index 5397492fd..0bb1654fb 100644 --- a/ports/qt5compat/vcpkg.json +++ b/ports/qt5compat/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qt5compat", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "The module contains unsupported Qt 5 APIs", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtactiveqt/vcpkg.json b/ports/qtactiveqt/vcpkg.json index ac68a5c1e..bd8bcf93b 100644 --- a/ports/qtactiveqt/vcpkg.json +++ b/ports/qtactiveqt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtactiveqt", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "ActiveQt", "homepage": "https://www.qt.io/", "supports": "windows", diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index 41f82d169..ed497a13e 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -18,65 +18,73 @@ macro(qt_stop_on_update) endif()
endmacro()
-function(qt_install_submodule)
- cmake_parse_arguments(PARSE_ARGV 0 "_qis" "DISABLE_NINJA"
- ""
- "PATCHES;TOOL_NAMES;CONFIGURE_OPTIONS;CONFIGURE_OPTIONS_DEBUG;CONFIGURE_OPTIONS_RELEASE")
-
- 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})
- 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})
+function(qt_download_submodule)
+ cmake_parse_arguments(PARSE_ARGV 0 "_qarg" ""
+ ""
+ "PATCHES")
if(QT_UPDATE_VERSION)
+ set(VCPKG_USE_HEAD_VERSION ON)
set(UPDATE_PORT_GIT_OPTIONS
- X_OUT_REF NEW_REF)
+ HEAD_REF "${QT_GIT_TAG}")
endif()
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
- URL https://code.qt.io/qt/${PORT}.git
- TAG ${${PORT}_TAG}
- REF ${${PORT}_REF}
+ URL "https://code.qt.io/qt/${PORT}.git"
+ #TAG ${${PORT}_TAG}
+ REF "${${PORT}_REF}"
${UPDATE_PORT_GIT_OPTIONS}
- PATCHES ${_qis_PATCHES}
+ PATCHES ${_qarg_PATCHES}
)
if(QT_UPDATE_VERSION)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled CACHE INTERNAL "")
- file(APPEND "${VCPKG_ROOT_DIR}/ports/qtbase/cmake/qt_new_refs.cmake" "set(${PORT}_REF ${NEW_REF})\n")
- return()
+ message(STATUS "VCPKG_HEAD_VERSION:${VCPKG_HEAD_VERSION}")
+ file(APPEND "${VCPKG_ROOT_DIR}/ports/qtbase/cmake/qt_new_refs.cmake" "set(${PORT}_REF ${VCPKG_HEAD_VERSION})\n")
+ endif()
+ set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE)
+endfunction()
+
+
+function(qt_cmake_configure)
+ cmake_parse_arguments(PARSE_ARGV 0 "_qarg" "DISABLE_NINJA"
+ ""
+ "TOOL_NAMES;OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE")
+
+ 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
+ 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})
endif()
- if(VCPKG_TARGET_IS_WINDOWS)
+ if(CMAKE_HOST_WIN32)
if(NOT ${PORT} MATCHES "qtbase")
- list(APPEND _qis_CONFIGURE_OPTIONS -DQT_SYNCQT:PATH="${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl")
+ list(APPEND _qarg_OPTIONS -DQT_SYNCQT:PATH="${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl")
endif()
set(PERL_OPTION -DHOST_PERL:PATH="${PERL}")
else()
if(NOT ${PORT} MATCHES "qtbase")
- list(APPEND _qis_CONFIGURE_OPTIONS -DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl)
+ list(APPEND _qarg_OPTIONS -DQT_SYNCQT:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/Qt6/bin/syncqt.pl)
endif()
set(PERL_OPTION -DHOST_PERL:PATH=${PERL})
endif()
- if(NOT _qis_DISABLE_NINJA)
+ if(NOT _qarg_DISABLE_NINJA)
set(NINJA_OPTION PREFER_NINJA)
endif()
if(VCPKG_CROSSCOMPILING)
- list(APPEND _qis_CONFIGURE_OPTIONS -DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR})
- list(APPEND _qis_CONFIGURE_OPTIONS -DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share)
+ list(APPEND _qarg_OPTIONS -DQT_HOST_PATH=${CURRENT_HOST_INSTALLED_DIR})
+ list(APPEND _qarg_OPTIONS -DQT_HOST_PATH_CMAKE_DIR:PATH=${CURRENT_HOST_INSTALLED_DIR}/share)
if(VCPKG_TARGET_ARCHITECTURE STREQUAL arm64 AND VCPKG_TARGET_IS_WINDOWS) # Remove if PR #16111 is merged
- list(APPEND _qis_CONFIGURE_OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows)
+ list(APPEND _qarg_OPTIONS -DCMAKE_CROSSCOMPILING=ON -DCMAKE_SYSTEM_PROCESSOR:STRING=ARM64 -DCMAKE_SYSTEM_NAME:STRING=Windows)
endif()
endif()
- set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
- set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
-
vcpkg_configure_cmake(
SOURCE_PATH "${SOURCE_PATH}"
${NINJA_OPTION}
@@ -92,9 +100,9 @@ function(qt_install_submodule) -DINSTALL_LIBEXECDIR:STRING=bin
-DINSTALL_PLUGINSDIR:STRING=${qt_plugindir}
-DINSTALL_QMLDIR:STRING=${qt_qmldir}
- ${_qis_CONFIGURE_OPTIONS}
+ ${_qarg_OPTIONS}
OPTIONS_RELEASE
- ${_qis_CONFIGURE_OPTIONS_RELEASE}
+ ${_qarg_OPTIONS_RELEASE}
-DINSTALL_DOCDIR:STRING=doc/${QT6_DIRECTORY_PREFIX}
-DINSTALL_INCLUDEDIR:STRING=include/${QT6_DIRECTORY_PREFIX}
-DINSTALL_DESCRIPTIONSDIR:STRING=share/Qt6/modules
@@ -109,7 +117,13 @@ function(qt_install_submodule) -DINSTALL_MKSPECSDIR:STRING=../share/Qt6/mkspecs
${_qis_CONFIGURE_OPTIONS_DEBUG}
)
- vcpkg_install_cmake(ADD_BIN_TO_PATH)
+ set(Z_VCPKG_CMAKE_GENERATOR "${Z_VCPKG_CMAKE_GENERATOR}" PARENT_SCOPE)
+endfunction()
+
+function(qt_fixup_and_cleanup)
+ cmake_parse_arguments(PARSE_ARGV 0 "_qarg" ""
+ ""
+ "TOOL_NAMES")
vcpkg_copy_pdbs()
## Handle CMake files.
@@ -153,14 +167,14 @@ function(qt_install_submodule) set(qt_tooldest "${CURRENT_PACKAGES_DIR}/tools/Qt6/bin")
set(qt_searchdir "${CURRENT_PACKAGES_DIR}/bin")
## Handle Tools
- foreach(_tool IN LISTS _qis_TOOL_NAMES)
+ foreach(_tool IN LISTS _qarg_TOOL_NAMES)
if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_tool}${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
debug_message("Removed '${_tool}' from copy tools list since it was not found!")
- list(REMOVE_ITEM _qis_TOOL_NAMES ${_tool})
+ list(REMOVE_ITEM _qarg_TOOL_NAMES ${_tool})
endif()
endforeach()
- if(_qis_TOOL_NAMES)
- set(tool_names ${_qis_TOOL_NAMES})
+ if(_qarg_TOOL_NAMES)
+ set(tool_names ${_qarg_TOOL_NAMES})
vcpkg_copy_tools(TOOL_NAMES ${tool_names} SEARCH_DIR "${qt_searchdir}" DESTINATION "${qt_tooldest}" AUTO_CLEAN)
if(EXISTS "${CURRENT_PACKAGES_DIR}/${qt_plugindir}")
file(COPY "${CURRENT_PACKAGES_DIR}/${qt_plugindir}/" DESTINATION "${qt_tooldest}")
@@ -202,6 +216,33 @@ function(qt_install_submodule) endif()
endif()
+endfunction()
+
+function(qt_install_submodule)
+ cmake_parse_arguments(PARSE_ARGV 0 "_qis" "DISABLE_NINJA"
+ ""
+ "PATCHES;TOOL_NAMES;CONFIGURE_OPTIONS;CONFIGURE_OPTIONS_DEBUG;CONFIGURE_OPTIONS_RELEASE")
+
+ set(qt_plugindir ${QT6_DIRECTORY_PREFIX}plugins)
+ set(qt_qmldir ${QT6_DIRECTORY_PREFIX}qml)
+
+ qt_download_submodule(PATCHES ${_qis_PATCHES})
+ if(QT_UPDATE_VERSION)
+ return()
+ endif()
+
+ if(_qis_DISABLE_NINJA)
+ set(_opt DISABLE_NINJA)
+ endif()
+ qt_cmake_configure(${_opt}
+ OPTIONS ${_qis_CONFIGURE_OPTIONS}
+ OPTIONS_DEBUG ${_qis_CONFIGURE_OPTIONS_DEBUG}
+ OPTIONS_RELEASE ${_qis_CONFIGURE_OPTIONS_RELEASE})
+
+ vcpkg_install_cmake(ADD_BIN_TO_PATH)
+
+ qt_fixup_and_cleanup(TOOL_NAMES ${_qis_TOOL_NAMES})
+
qt_install_copyright("${SOURCE_PATH}")
set(SOURCE_PATH "${SOURCE_PATH}" PARENT_SCOPE)
-endfunction()
+endfunction()
\ No newline at end of file diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake index ac9fab8f4..7d44bf87e 100644 --- a/ports/qtbase/cmake/qt_port_details.cmake +++ b/ports/qtbase/cmake/qt_port_details.cmake @@ -1,7 +1,10 @@ -set(QT_VERSION 6.1.2)
+set(QT_VERSION 6.1.3)
set(QT_GIT_TAG v${QT_VERSION})
#set(QT_UPDATE_VERSION TRUE)
-
+if(QT_UPDATE_VERSION)
+ function(vcpkg_extract_source_archive)
+ endfunction()
+endif()
# List of added an removed modules https://doc-snapshots.qt.io/qt6-dev/whatsnew60.html#changes-to-supported-modules
#https://wiki.qt.io/Get_the_Source
#TODO:qtknx?
@@ -37,30 +40,30 @@ foreach(_port IN LISTS QT_PORTS) set(${_port}_TAG ${QT_GIT_TAG})
endforeach()
-set(qtbase_REF c7c05ab0610ca521a7fcbfdd8d063358d62531b0)
-set(qttools_REF 304bae0d5acdee4313405c25dcd259db92dff23d)
-set(qtdeclarative_REF bfe2822fb615fb9264c19cebc07994c7a719d159)
-set(qtsvg_REF e4950cbb5810fb9e0fd1c42ba888e6d77c21d4b6)
-set(qt5compat_REF ff070674ce05e580f023634d5c0fb33c27bb95fd)
-set(qtshadertools_REF 2e4aae72dad87eb6d32aa505d6fdcc51b7be057a)
-set(qtquicktimeline_REF 72f2f03964068d7a66f878949e739fa933d12246)
-set(qtquick3d_REF 261ad084def2fb0147a9def96a55d9ca2c469268)
-set(qttranslations_REF caa1100446f659ab992585aecd647612df1d0755)
-set(qtwayland_REF 549e6892a0932b76ff7f4004057644980445df36)
-set(qtdoc_REF 5a1cc893a66e84155924a94d538ab9401aa02976)
-set(qtimageformats_REF 99a0ff33dc46582235363f5ca64a01ce3c1b9fe3)
-set(qtmqtt_REF cef4c58c9b60248ab4fb0ae60815efb906a20f2a)
-set(qtquickcontrols2_REF 2d2e99d44337867585fa0dba8de5bd7ecd7ad6e7)
-set(qtnetworkauth_REF b3e45d0dad36a0ec402bb6e3e85459546378ed22)
-set(qtcoap_REF aa40b3cd7d699c926c8527fe7708436cc47eeced)
-set(qtopcua_REF 615ea73989fa5b2a7f560a292d3054af5d0663ed)
-set(qtactiveqt_REF 020d8da4e22be449846eefcfaa805cd8309cac20)
-set(qtdatavis3d_REF a4ea8afeba164d2dc8229e693c541d364e99f3de)
+set(qtbase_REF 3ff48409ed14c7a63010b14e053a7201a61391c5)
+set(qttools_REF a69e290e25fd145a8b02223130192555f7962ea2)
+set(qtdeclarative_REF 38845e18ef11ac2f1a1db82377b30f1649fdc499)
+set(qtsvg_REF 24d635154689be46aaaf2ba0e3538d2f8fafeb3d)
+set(qt5compat_REF fcacd7f544b496420db485187aa55d76898ce73d)
+set(qtshadertools_REF 06fc3c49b7b8cba80e6b6ff31ac5d703e3a2abcb)
+set(qtquicktimeline_REF be6321dc5164657072ff7069a7132d44222a503c)
+set(qtquick3d_REF ccd45eb39ec1fb88d62438c9dd0007e26c0ccc18)
+set(qttranslations_REF 2d30ad16d90abfc0806d28e3504348df84b1e62b)
+set(qtwayland_REF 501c287f34a66ec89e3e49da218feb4bc69c9c5e)
+set(qtdoc_REF 13fa00e32307bae90884a608880a542f6ed90646)
+set(qtimageformats_REF 8d6e8efc1afbd5e9cf793fbf0507e1d332c45d1f)
+set(qtmqtt_REF a6213a104f65dccb13508b58b0f07a249d9922c8)
+set(qtquickcontrols2_REF 6d62c0677d60e42a19bb72d641129933770f7723)
+set(qtnetworkauth_REF 7ce9e47b469141f9bace9661d07999dcc120e7f6)
+set(qtcoap_REF 83b5b7e8e2c6afa9d5ab69123c40993c48b30970)
+set(qtopcua_REF bda48fd7729fb65a7504a1bada496489ee15d245)
+set(qtactiveqt_REF 32cad4a02f78205e85490f6b8cbde82ecb1b5f2f)
+set(qtdatavis3d_REF 8d6c15fa8daa68a4d48368b8ceb8c517e973eac7)
#set(qtdeviceutils_REF 0) #missing tag
-set(qtlottie_REF 35e46e52d8849caf84269f92701a5b342824582c)
-set(qtscxml_REF d92013adb0a4ad0a80e94a265ec13b5c1730ee05)
-set(qtvirtualkeyboard_REF 4e71c9ae1ef8bfe1d9193cd14d11a4e1cf9ea7bc)
-set(qtcharts_REF 68a5725a5c97adad88a9d7a6318b06547f7bf1a3)
+set(qtlottie_REF 266531117ba6646893d3806566144aff19d5e309)
+set(qtscxml_REF aa27d28e302f3529940172ab2782c2d7e28fb532)
+set(qtvirtualkeyboard_REF eb26e2af30e6cbb2c4b9224d8e9f489f198c82f0)
+set(qtcharts_REF 3e0d6ffa572efe8a09774ac6c6263b6df5eaf718)
if(QT_UPDATE_VERSION)
message(STATUS "Running Qt in automatic version port update mode!")
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 55401d71a..72b43da68 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,6 @@ { "name": "qtbase", - "version-semver": "6.1.2", - "port-version": 1, + "version-semver": "6.1.3", "description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcharts/vcpkg.json b/ports/qtcharts/vcpkg.json index f95150d16..75ba14445 100644 --- a/ports/qtcharts/vcpkg.json +++ b/ports/qtcharts/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcharts", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "QtCharts module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json index b35622815..011cf9ea6 100644 --- a/ports/qtcoap/vcpkg.json +++ b/ports/qtcoap/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtcoap", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt CoAP client module", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json index 9f31e8fb5..f998b145b 100644 --- a/ports/qtdatavis3d/vcpkg.json +++ b/ports/qtdatavis3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdatavis3d", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt 3D data visualization framework", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdeclarative/vcpkg.json b/ports/qtdeclarative/vcpkg.json index 63ef07935..b8249ab25 100644 --- a/ports/qtdeclarative/vcpkg.json +++ b/ports/qtdeclarative/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdeclarative", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Declarative (Quick 2)", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json index 12196eae8..7391fc2d8 100644 --- a/ports/qtdoc/vcpkg.json +++ b/ports/qtdoc/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtdoc", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Documentation", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json index ef42be64d..998de3faa 100644 --- a/ports/qtimageformats/vcpkg.json +++ b/ports/qtimageformats/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtimageformats", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Additional Image Format plugins for Qt", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtlottie/vcpkg.json b/ports/qtlottie/vcpkg.json index d0e796484..1f8731f93 100644 --- a/ports/qtlottie/vcpkg.json +++ b/ports/qtlottie/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtlottie", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "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/", "dependencies": [ diff --git a/ports/qtmqtt/vcpkg.json b/ports/qtmqtt/vcpkg.json index e54eb9bba..cd0f253cd 100644 --- a/ports/qtmqtt/vcpkg.json +++ b/ports/qtmqtt/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtmqtt", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Module to implement MQTT protocol version 3.1 and 3.1.1 http://mqtt.org/", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtnetworkauth/vcpkg.json b/ports/qtnetworkauth/vcpkg.json index bbfb1d0d9..43565da8a 100644 --- a/ports/qtnetworkauth/vcpkg.json +++ b/ports/qtnetworkauth/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtnetworkauth", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Network Authenticators; QtOAuth in particular", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtopcua/vcpkg.json b/ports/qtopcua/vcpkg.json index dc096d20e..89b264c53 100644 --- a/ports/qtopcua/vcpkg.json +++ b/ports/qtopcua/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtopcua", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt wrapper for existing OPC UA stacks", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquick3d/vcpkg.json b/ports/qtquick3d/vcpkg.json index 980faf475..cc432867a 100644 --- a/ports/qtquick3d/vcpkg.json +++ b/ports/qtquick3d/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquick3d", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "A new module and API for defining 3D content in Qt Quick.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquickcontrols2/vcpkg.json b/ports/qtquickcontrols2/vcpkg.json index 139b2a828..8de3a63c5 100644 --- a/ports/qtquickcontrols2/vcpkg.json +++ b/ports/qtquickcontrols2/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquickcontrols2", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Quick Controls 2", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json index aec0718bd..9ca9a3020 100644 --- a/ports/qtquicktimeline/vcpkg.json +++ b/ports/qtquicktimeline/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtquicktimeline", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Module for keyframe-based timeline construction.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtscxml/vcpkg.json b/ports/qtscxml/vcpkg.json index c6d3ac8a8..72af5b012 100644 --- a/ports/qtscxml/vcpkg.json +++ b/ports/qtscxml/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtscxml", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtshadertools/vcpkg.json b/ports/qtshadertools/vcpkg.json index 5810e64f7..534162d74 100644 --- a/ports/qtshadertools/vcpkg.json +++ b/ports/qtshadertools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtshadertools", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "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/", "dependencies": [ diff --git a/ports/qtsvg/vcpkg.json b/ports/qtsvg/vcpkg.json index 9b1a0bd7d..97ab747c9 100644 --- a/ports/qtsvg/vcpkg.json +++ b/ports/qtsvg/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtsvg", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt SVG", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake index c621e0c93..77b2787d6 100644 --- a/ports/qttools/portfile.cmake +++ b/ports/qttools/portfile.cmake @@ -34,8 +34,8 @@ set(${PORT}_PATCHES )#fix_static_build.patch) # General features: vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES - "qdoc" -DCMAKE_DISABLE_FIND_PACKAGE_Clang - "qdoc" -DCMAKE_DISABLE_FIND_PACKAGE_WrapLibClang + "qdoc" CMAKE_DISABLE_FIND_PACKAGE_Clang + "qdoc" CMAKE_DISABLE_FIND_PACKAGE_WrapLibClang ) set(TOOL_NAMES diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json index 2ec5a91ed..e9bd7dd30 100644 --- a/ports/qttools/vcpkg.json +++ b/ports/qttools/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttools", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json index d4fb9d8c4..fec110b00 100644 --- a/ports/qttranslations/vcpkg.json +++ b/ports/qttranslations/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qttranslations", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "Qt Translations", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json index fca230939..533af68a1 100644 --- a/ports/qtvirtualkeyboard/vcpkg.json +++ b/ports/qtvirtualkeyboard/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtvirtualkeyboard", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "description": "SCXML (state machine notation) compiler and related tools", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/ports/qtwayland/vcpkg.json b/ports/qtwayland/vcpkg.json index ae2d9d17b..cfe7d278f 100644 --- a/ports/qtwayland/vcpkg.json +++ b/ports/qtwayland/vcpkg.json @@ -1,6 +1,6 @@ { "name": "qtwayland", - "version-semver": "6.1.2", + "version-semver": "6.1.3", "port-version": 2, "description": "A toolbox for making Qt based Wayland compositors", "homepage": "https://www.qt.io/", diff --git a/versions/baseline.json b/versions/baseline.json index deb8ee639..b5c4af3b9 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5241,7 +5241,7 @@ "port-version": 1 }, "qt": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qt-advanced-docking-system": { @@ -5421,7 +5421,7 @@ "port-version": 1 }, "qt5compat": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qt6betablock": { @@ -5429,35 +5429,35 @@ "port-version": 0 }, "qtactiveqt": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtbase": { - "baseline": "6.1.2", - "port-version": 1 + "baseline": "6.1.3", + "port-version": 0 }, "qtcharts": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtcoap": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtdatavis3d": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtdeclarative": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtdoc": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtimageformats": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtkeychain": { @@ -5465,59 +5465,59 @@ "port-version": 1 }, "qtlottie": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtmqtt": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtnetworkauth": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtopcua": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtquick3d": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtquickcontrols2": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtquicktimeline": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtscxml": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtshadertools": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtsvg": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qttools": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qttranslations": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtvirtualkeyboard": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 0 }, "qtwayland": { - "baseline": "6.1.2", + "baseline": "6.1.3", "port-version": 2 }, "quadtree": { diff --git a/versions/q-/qt.json b/versions/q-/qt.json index 0f5fca8a6..922dbedaf 100644 --- a/versions/q-/qt.json +++ b/versions/q-/qt.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "7af9212716c1c55de883178c890121a7d804cc48", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "6744ad0c2da924c58372492b96d9ea9b43747440", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json index 6933b9db0..322b3247c 100644 --- a/versions/q-/qt5compat.json +++ b/versions/q-/qt5compat.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "215bfc596de54c9c4b5c83e1d8d4ab53ddfaba72", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "d3d8792b65b0a5f83423ed425d01bf77759c33d0", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json index e0a42c7e9..0e6ef81b0 100644 --- a/versions/q-/qtactiveqt.json +++ b/versions/q-/qtactiveqt.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "925f4777d7eb69e9fa1d6de9af0fdf3e4511799f", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "746af755dc6d69853c6a369b2fa61aad7ec33c45", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 193994989..16a8e0e8a 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "23812ecb279c5ae29a26e99f2ccc605bbe17f45a", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "ed0018dce35e4246be83589358400a7617a8933f", "version-semver": "6.1.2", "port-version": 1 diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json index e65901685..b9bb06eea 100644 --- a/versions/q-/qtcharts.json +++ b/versions/q-/qtcharts.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "f40ae8925f5dc6cf6947fd0a14f607eff3c0438a", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "74995a3fee551bc872bd44d0a0592a67cc20f3bb", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json index 0b674f5e1..221ffa028 100644 --- a/versions/q-/qtcoap.json +++ b/versions/q-/qtcoap.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "e51f03a5c9c142390aea35d1a6389383c245414f", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "10c8de5683f1878cdee669c101dcbf50fefaf10e", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json index 8ff8df3dd..c5af86697 100644 --- a/versions/q-/qtdatavis3d.json +++ b/versions/q-/qtdatavis3d.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "30c282e8438df69e77b4e2a6935addb778bc761c", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "b25e2c719ecc3c1476ceb68579e97f3562eb9899", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json index f995b8a92..febd23d2e 100644 --- a/versions/q-/qtdeclarative.json +++ b/versions/q-/qtdeclarative.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "a4c4e942686e20cc25f4f608c7f423b295a11830", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "b283ef4063b4040b652dcfe42bf37006cded85a5", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json index 0d5ec5fa9..ba6bbcab9 100644 --- a/versions/q-/qtdoc.json +++ b/versions/q-/qtdoc.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c393da11dd6c6cbdbc01b32e123327a9971fa353", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "8a74cb89e81a66827639d45083efcc0e19260f70", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json index a0a9ca9d6..61b96a2f1 100644 --- a/versions/q-/qtimageformats.json +++ b/versions/q-/qtimageformats.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "37b1ff899c20c104a1987dff249c7b51755e4fc4", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "4e3d92605b4a236be559ec0bfb55a5a282de0fe7", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json index 86d633bc8..2f4f9eafa 100644 --- a/versions/q-/qtlottie.json +++ b/versions/q-/qtlottie.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "4c9e0cf0663bfb60c9f99f44302e0934c2e325bb", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "7d8b35dbd8e41a85097752ce057623380ae023f2", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json index da47891de..4c7ddf656 100644 --- a/versions/q-/qtmqtt.json +++ b/versions/q-/qtmqtt.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "fffa3edc4b989f223176e6c5fd37692361b3b713", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "7c21f77ae949388eb4787d5abc8e3a94667ee584", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json index 1d69784b3..bb670085f 100644 --- a/versions/q-/qtnetworkauth.json +++ b/versions/q-/qtnetworkauth.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "9793619e1a8167daa86e50d533b0ec3d1a843568", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "d3dbdc5974015e8c9e41087a13cd2d83b5f33394", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json index 03ca84289..ee450490c 100644 --- a/versions/q-/qtopcua.json +++ b/versions/q-/qtopcua.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "3112bdb7d0ff9c2e023dd15446975806ffc9a87a", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "477ed1c8be16624d2d7ca9b548aea3d733c30c5e", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json index ee1d8c034..ebbfd3d55 100644 --- a/versions/q-/qtquick3d.json +++ b/versions/q-/qtquick3d.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c9871c8665ce287463902e6aa56b6f8b5836cd46", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "5f9db44634b543a34b525ffc1444f764afe0241e", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtquickcontrols2.json b/versions/q-/qtquickcontrols2.json index 0c5c05551..aa3dec9ba 100644 --- a/versions/q-/qtquickcontrols2.json +++ b/versions/q-/qtquickcontrols2.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "cdf33560d3def651acf48341ea6dc0447c270c5b", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "f7a3f18e05756732c1344a336558851d7f1adafc", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json index 140017053..2b7fd5af4 100644 --- a/versions/q-/qtquicktimeline.json +++ b/versions/q-/qtquicktimeline.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "664a251eb795ac206c32b87e39060db32922fe4d", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "cd4994e897733cbbdab700567854117998f2986a", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json index 53261ba80..a47fea30e 100644 --- a/versions/q-/qtscxml.json +++ b/versions/q-/qtscxml.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "c8e642305ce89691d07946081ac77aa3216dc418", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "12a020d23caf6939a8b10c126bd6dd5230f3c5bf", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json index df6dd8f48..4003afb91 100644 --- a/versions/q-/qtshadertools.json +++ b/versions/q-/qtshadertools.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "4796eb58b411235a7f1b5e45728a9d1ca2c4f944", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "ef324b3fad33f5340cc707700c6666663ca94de2", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json index dfa7c1ea3..2f889f064 100644 --- a/versions/q-/qtsvg.json +++ b/versions/q-/qtsvg.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "ffffd840205636ee1ce99e623679ae7c0159872c", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "7fafae2d0f01bb61cff47d039ea5fa28f1f17967", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json index 4f9682210..e7b68e22a 100644 --- a/versions/q-/qttools.json +++ b/versions/q-/qttools.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "aeacc8ed34e798f5d73df932e09b1b619d89910b", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "f09d833f7ce9934bcc02650cd9c580b84932f6bc", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json index 72e6c3bfc..cb8e674cf 100644 --- a/versions/q-/qttranslations.json +++ b/versions/q-/qttranslations.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "754d6279d7b7c6f7a3b976d90cba153fb12d036e", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "899f3c456dd7aad0a3680083ef8d0f118b6c6761", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json index 71bfc8286..b635eb73d 100644 --- a/versions/q-/qtvirtualkeyboard.json +++ b/versions/q-/qtvirtualkeyboard.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "09bccb97807efe784799cac5346a90fcc16d5517", + "version-semver": "6.1.3", + "port-version": 0 + }, + { "git-tree": "f1ed3185f1204d32b530464acdd1f843e5edbf95", "version-semver": "6.1.2", "port-version": 0 diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json index b688f4d87..744432382 100644 --- a/versions/q-/qtwayland.json +++ b/versions/q-/qtwayland.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "a2e96d86ddc71f8fe862d70d4c685416cfb3479d", + "version-semver": "6.1.3", + "port-version": 2 + }, + { "git-tree": "c520a4f068d807c3ec5bc04accf5af463007a1b8", "version-semver": "6.1.2", "port-version": 2 |