aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2021-07-06 22:43:23 +0200
committerGitHub <noreply@github.com>2021-07-06 13:43:23 -0700
commit8a07b5df24dc84255761d2aefb708f572d07f792 (patch)
treedfe8bee34373bb25d01a7744bd9c395ea6ae789e
parent9c5648feb80dfeb6f8edbdb33ca19a3701084456 (diff)
downloadvcpkg-8a07b5df24dc84255761d2aefb708f572d07f792.tar.gz
vcpkg-8a07b5df24dc84255761d2aefb708f572d07f792.zip
[Qt6] Update to 6.1.2 (#18787)
* update qt to 6.1.2 * version stuff
-rw-r--r--ports/qt/vcpkg.json2
-rw-r--r--ports/qt5compat/vcpkg.json2
-rw-r--r--ports/qtactiveqt/vcpkg.json2
-rw-r--r--ports/qtbase/clang-cl_source_location.patch5
-rw-r--r--ports/qtbase/cmake/qt_port_details.cmake48
-rw-r--r--ports/qtbase/dc5e7b6.diff22
-rw-r--r--ports/qtbase/portfile.cmake1
-rw-r--r--ports/qtbase/vcpkg.json2
-rw-r--r--ports/qtcharts/vcpkg.json2
-rw-r--r--ports/qtcoap/vcpkg.json2
-rw-r--r--ports/qtdatavis3d/vcpkg.json2
-rw-r--r--ports/qtdeclarative/vcpkg.json2
-rw-r--r--ports/qtdoc/vcpkg.json2
-rw-r--r--ports/qtimageformats/vcpkg.json2
-rw-r--r--ports/qtlottie/vcpkg.json2
-rw-r--r--ports/qtmqtt/vcpkg.json2
-rw-r--r--ports/qtnetworkauth/vcpkg.json2
-rw-r--r--ports/qtopcua/vcpkg.json2
-rw-r--r--ports/qtquick3d/vcpkg.json2
-rw-r--r--ports/qtquickcontrols2/vcpkg.json2
-rw-r--r--ports/qtquicktimeline/vcpkg.json2
-rw-r--r--ports/qtscxml/vcpkg.json2
-rw-r--r--ports/qtshadertools/vcpkg.json2
-rw-r--r--ports/qtsvg/vcpkg.json2
-rw-r--r--ports/qttools/vcpkg.json2
-rw-r--r--ports/qttranslations/vcpkg.json2
-rw-r--r--ports/qtvirtualkeyboard/vcpkg.json2
-rw-r--r--ports/qtwayland/vcpkg.json2
-rw-r--r--versions/baseline.json48
-rw-r--r--versions/q-/qt.json5
-rw-r--r--versions/q-/qt5compat.json5
-rw-r--r--versions/q-/qtactiveqt.json5
-rw-r--r--versions/q-/qtbase.json5
-rw-r--r--versions/q-/qtcharts.json5
-rw-r--r--versions/q-/qtcoap.json5
-rw-r--r--versions/q-/qtdatavis3d.json5
-rw-r--r--versions/q-/qtdeclarative.json5
-rw-r--r--versions/q-/qtdoc.json5
-rw-r--r--versions/q-/qtimageformats.json5
-rw-r--r--versions/q-/qtlottie.json5
-rw-r--r--versions/q-/qtmqtt.json5
-rw-r--r--versions/q-/qtnetworkauth.json5
-rw-r--r--versions/q-/qtopcua.json5
-rw-r--r--versions/q-/qtquick3d.json5
-rw-r--r--versions/q-/qtquickcontrols2.json5
-rw-r--r--versions/q-/qtquicktimeline.json5
-rw-r--r--versions/q-/qtscxml.json5
-rw-r--r--versions/q-/qtshadertools.json5
-rw-r--r--versions/q-/qtsvg.json5
-rw-r--r--versions/q-/qttools.json5
-rw-r--r--versions/q-/qttranslations.json5
-rw-r--r--versions/q-/qtvirtualkeyboard.json5
-rw-r--r--versions/q-/qtwayland.json5
53 files changed, 195 insertions, 97 deletions
diff --git a/ports/qt/vcpkg.json b/ports/qt/vcpkg.json
index 2c4c3da63..ffe756fdd 100644
--- a/ports/qt/vcpkg.json
+++ b/ports/qt/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qt",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"description": "Qt",
"homepage": "https://www.qt.io/",
"dependencies": [
diff --git a/ports/qt5compat/vcpkg.json b/ports/qt5compat/vcpkg.json
index 85c1e355a..5397492fd 100644
--- a/ports/qt5compat/vcpkg.json
+++ b/ports/qt5compat/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qt5compat",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"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 99dbf9e75..ac68a5c1e 100644
--- a/ports/qtactiveqt/vcpkg.json
+++ b/ports/qtactiveqt/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtactiveqt",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"description": "ActiveQt",
"homepage": "https://www.qt.io/",
"supports": "windows",
diff --git a/ports/qtbase/clang-cl_source_location.patch b/ports/qtbase/clang-cl_source_location.patch
index 643220245..1eeb67aaf 100644
--- a/ports/qtbase/clang-cl_source_location.patch
+++ b/ports/qtbase/clang-cl_source_location.patch
@@ -2,12 +2,13 @@ diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h
index 823b2057b..4a8cd4fa8 100644
--- a/src/corelib/kernel/qproperty.h
+++ b/src/corelib/kernel/qproperty.h
-@@ -49,7 +49,7 @@
+@@ -49,8 +49,8 @@
#include <QtCore/qpropertyprivate.h>
-#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC)
+#if __has_include(<source_location>) && __cplusplus >= 202002L && !defined(Q_CLANG_QDOC) && defined(__cpp_consteval)
- #include <source_location>
+ #include <source_location>
+ #if defined(__cpp_lib_source_location)
#define QT_SOURCE_LOCATION_NAMESPACE std
#define QT_PROPERTY_COLLECT_BINDING_LOCATION
diff --git a/ports/qtbase/cmake/qt_port_details.cmake b/ports/qtbase/cmake/qt_port_details.cmake
index e86a38c65..ac9fab8f4 100644
--- a/ports/qtbase/cmake/qt_port_details.cmake
+++ b/ports/qtbase/cmake/qt_port_details.cmake
@@ -1,4 +1,4 @@
-set(QT_VERSION 6.1.1)
+set(QT_VERSION 6.1.2)
set(QT_GIT_TAG v${QT_VERSION})
#set(QT_UPDATE_VERSION TRUE)
@@ -37,30 +37,30 @@ foreach(_port IN LISTS QT_PORTS)
set(${_port}_TAG ${QT_GIT_TAG})
endforeach()
-set(qtbase_REF 9461362fb0aa5ec91bcfafe1169bd32cf9cfc828)
-set(qttools_REF 3fa59b12c7e23e0eb3fbb0f3a9d3f7fee2669f72)
-set(qtdeclarative_REF 34d723b38ef9b2ef851f589dfd0523420f4c5acc)
-set(qtsvg_REF 242d6a797b6051baccd101978f3e138293701159)
-set(qt5compat_REF 57202ccee96b7297202ba11c867178cff32b6eef)
-set(qtshadertools_REF 954b90fa332b37ba1b60a2fcd92c06a0de6a6322)
-set(qtquicktimeline_REF 2cb89aa7b120ec0ac84426d9f50bf8c613bbcd1e)
-set(qtquick3d_REF 6c5ec5b14829f4181d035ad357f594e32e0e4119)
-set(qttranslations_REF 47deef3a86795ef97708ec1da403a06cf696ec1c)
-set(qtwayland_REF f2c5c1304fc1a5123243a3a83ac8d8f3f67138ca)
-set(qtdoc_REF 097bdcbf52a3cd798b66318f2b453cd01640e06b)
-set(qtimageformats_REF 6cd036f63ff4b939f2ceb02fda98303a89a1b4b1)
-set(qtmqtt_REF d5c00c7245916a919b408578a6dd17bfac0e064d)
-set(qtquickcontrols2_REF 1d84dc70059a6e324faab3535cb3958c6fa52fab)
-set(qtnetworkauth_REF a903abe7e43123ecd727ca2e29d552c5ed639552)
-set(qtcoap_REF 160c3fb6850be44c09142150aef165a09946a608)
-set(qtopcua_REF c025fe5182a369723a67be06d64cbfbf2760ba0e)
-set(qtactiveqt_REF b9cf1840e44d5283f2212a73ba7b74ec18564d5a)
-set(qtdatavis3d_REF 1629d860192ffc644a5c0c7d63e18a6ee6d5e295)
+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(qtdeviceutils_REF 0) #missing tag
-set(qtlottie_REF f6a4557b1484b9ad7db4bae8c5b6b264618876e5)
-set(qtscxml_REF 666adc604fec06fa5b38be4d4f1b0e9b56f16c2b)
-set(qtvirtualkeyboard_REF 5c7df0c55a96e9855bd27c23a18d6f2d91305d31)
-set(qtcharts_REF 251d18d960a6f6ee04f07ba338beb317c425e0a2)
+set(qtlottie_REF 35e46e52d8849caf84269f92701a5b342824582c)
+set(qtscxml_REF d92013adb0a4ad0a80e94a265ec13b5c1730ee05)
+set(qtvirtualkeyboard_REF 4e71c9ae1ef8bfe1d9193cd14d11a4e1cf9ea7bc)
+set(qtcharts_REF 68a5725a5c97adad88a9d7a6318b06547f7bf1a3)
if(QT_UPDATE_VERSION)
message(STATUS "Running Qt in automatic version port update mode!")
diff --git a/ports/qtbase/dc5e7b6.diff b/ports/qtbase/dc5e7b6.diff
deleted file mode 100644
index e420267b2..000000000
--- a/ports/qtbase/dc5e7b6.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
-index 0eeccce..2ee41c2 100644
---- a/cmake/QtFlagHandlingHelpers.cmake
-+++ b/cmake/QtFlagHandlingHelpers.cmake
-@@ -421,7 +421,7 @@
- # cache variable with FORCE will overwrite the non-cache variable in this
- # function scope, but we need to use the original value before that change.
- foreach(flag_value IN LISTS flag_values)
-- string(${replace_type} "${flag_value}" "" ${flag_var_name} "${${flag_var_name}}")
-+ string(${replace_type} "${flag_value}" " " ${flag_var_name} "${${flag_var_name}}")
- endforeach()
- string(STRIP "${${flag_var_name}}" ${flag_var_name})
- set(${flag_var_name} "${${flag_var_name}}" PARENT_SCOPE)
-@@ -433,7 +433,7 @@
- # Work exclusively on cache variable value only.
- set(mod_flags $CACHE{${flag_var_name}})
- foreach(flag_value IN LISTS flag_values)
-- string(${replace_type} "${flag_value}" "" mod_flags "${mod_flags}")
-+ string(${replace_type} "${flag_value}" " " mod_flags "${mod_flags}")
- endforeach()
- string(STRIP "${mod_flags}" mod_flags)
- get_property(help_text CACHE ${flag_var_name} PROPERTY HELPSTRING)
diff --git a/ports/qtbase/portfile.cmake b/ports/qtbase/portfile.cmake
index 0ae81659b..9d48e0ed5 100644
--- a/ports/qtbase/portfile.cmake
+++ b/ports/qtbase/portfile.cmake
@@ -12,7 +12,6 @@ set(${PORT}_PATCHES
dont_force_cmakecache.patch
fix_find_dep.patch
20b3eb0.diff # Upstream fix to build with clang-cl; didn't make 6.1.1 so I backported the patch.
- dc5e7b6.diff
clang-cl_source_location.patch
)
diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json
index 3ca8dc788..4f1ba2214 100644
--- a/ports/qtbase/vcpkg.json
+++ b/ports/qtbase/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtbase",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"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 4129cdfca..f95150d16 100644
--- a/ports/qtcharts/vcpkg.json
+++ b/ports/qtcharts/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtcharts",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"description": "QtCharts module",
"homepage": "https://www.qt.io/",
"dependencies": [
diff --git a/ports/qtcoap/vcpkg.json b/ports/qtcoap/vcpkg.json
index 0b1deb3cd..b35622815 100644
--- a/ports/qtcoap/vcpkg.json
+++ b/ports/qtcoap/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtcoap",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"description": "Qt CoAP client module",
"homepage": "https://www.qt.io/",
"dependencies": [
diff --git a/ports/qtdatavis3d/vcpkg.json b/ports/qtdatavis3d/vcpkg.json
index 35bdd4a67..9f31e8fb5 100644
--- a/ports/qtdatavis3d/vcpkg.json
+++ b/ports/qtdatavis3d/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtdatavis3d",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"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 9e70f72cf..63ef07935 100644
--- a/ports/qtdeclarative/vcpkg.json
+++ b/ports/qtdeclarative/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtdeclarative",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"description": "Qt Declarative (Quick 2)",
"homepage": "https://www.qt.io/",
"dependencies": [
diff --git a/ports/qtdoc/vcpkg.json b/ports/qtdoc/vcpkg.json
index 59bf0aaf2..12196eae8 100644
--- a/ports/qtdoc/vcpkg.json
+++ b/ports/qtdoc/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtdoc",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"description": "Qt Documentation",
"homepage": "https://www.qt.io/",
"dependencies": [
diff --git a/ports/qtimageformats/vcpkg.json b/ports/qtimageformats/vcpkg.json
index 22353d2a8..ef42be64d 100644
--- a/ports/qtimageformats/vcpkg.json
+++ b/ports/qtimageformats/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtimageformats",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"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 c235aa640..d0e796484 100644
--- a/ports/qtlottie/vcpkg.json
+++ b/ports/qtlottie/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtlottie",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"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 fb1be27af..e54eb9bba 100644
--- a/ports/qtmqtt/vcpkg.json
+++ b/ports/qtmqtt/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtmqtt",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"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 ddc43cbb2..bbfb1d0d9 100644
--- a/ports/qtnetworkauth/vcpkg.json
+++ b/ports/qtnetworkauth/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtnetworkauth",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"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 22226b885..dc096d20e 100644
--- a/ports/qtopcua/vcpkg.json
+++ b/ports/qtopcua/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtopcua",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"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 6ec42763f..980faf475 100644
--- a/ports/qtquick3d/vcpkg.json
+++ b/ports/qtquick3d/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtquick3d",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"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 699d9f53d..139b2a828 100644
--- a/ports/qtquickcontrols2/vcpkg.json
+++ b/ports/qtquickcontrols2/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtquickcontrols2",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"description": "Qt Quick Controls 2",
"homepage": "https://www.qt.io/",
"dependencies": [
diff --git a/ports/qtquicktimeline/vcpkg.json b/ports/qtquicktimeline/vcpkg.json
index 5ed5f43bd..aec0718bd 100644
--- a/ports/qtquicktimeline/vcpkg.json
+++ b/ports/qtquicktimeline/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtquicktimeline",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"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 4cc3c4d0c..c6d3ac8a8 100644
--- a/ports/qtscxml/vcpkg.json
+++ b/ports/qtscxml/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtscxml",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"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 4821d9e19..5810e64f7 100644
--- a/ports/qtshadertools/vcpkg.json
+++ b/ports/qtshadertools/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtshadertools",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"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 817abf5e7..9b1a0bd7d 100644
--- a/ports/qtsvg/vcpkg.json
+++ b/ports/qtsvg/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtsvg",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"description": "Qt SVG",
"homepage": "https://www.qt.io/",
"dependencies": [
diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json
index 7567f2220..2ec5a91ed 100644
--- a/ports/qttools/vcpkg.json
+++ b/ports/qttools/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qttools",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"description": "Qt Tools",
"homepage": "https://www.qt.io/",
"dependencies": [
diff --git a/ports/qttranslations/vcpkg.json b/ports/qttranslations/vcpkg.json
index c6b80e943..d4fb9d8c4 100644
--- a/ports/qttranslations/vcpkg.json
+++ b/ports/qttranslations/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qttranslations",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"description": "Qt Translations",
"homepage": "https://www.qt.io/",
"dependencies": [
diff --git a/ports/qtvirtualkeyboard/vcpkg.json b/ports/qtvirtualkeyboard/vcpkg.json
index e73d5f3e9..fca230939 100644
--- a/ports/qtvirtualkeyboard/vcpkg.json
+++ b/ports/qtvirtualkeyboard/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtvirtualkeyboard",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"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 a8f732f6a..9799150e1 100644
--- a/ports/qtwayland/vcpkg.json
+++ b/ports/qtwayland/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "qtwayland",
- "version-semver": "6.1.1",
+ "version-semver": "6.1.2",
"description": "A toolbox for making Qt based Wayland compositors",
"homepage": "https://www.qt.io/",
"supports": "!windows",
diff --git a/versions/baseline.json b/versions/baseline.json
index 1c830adeb..aeecefada 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5077,7 +5077,7 @@
"port-version": 1
},
"qt": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qt-advanced-docking-system": {
@@ -5257,7 +5257,7 @@
"port-version": 0
},
"qt5compat": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qt6betablock": {
@@ -5265,35 +5265,35 @@
"port-version": 0
},
"qtactiveqt": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtbase": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtcharts": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtcoap": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtdatavis3d": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtdeclarative": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtdoc": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtimageformats": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtkeychain": {
@@ -5301,59 +5301,59 @@
"port-version": 0
},
"qtlottie": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtmqtt": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtnetworkauth": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtopcua": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtquick3d": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtquickcontrols2": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtquicktimeline": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtscxml": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtshadertools": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtsvg": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qttools": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qttranslations": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtvirtualkeyboard": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"qtwayland": {
- "baseline": "6.1.1",
+ "baseline": "6.1.2",
"port-version": 0
},
"quadtree": {
diff --git a/versions/q-/qt.json b/versions/q-/qt.json
index cc389853f..0f5fca8a6 100644
--- a/versions/q-/qt.json
+++ b/versions/q-/qt.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "6744ad0c2da924c58372492b96d9ea9b43747440",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "21fd23ba62f5f9c76024d715eb025a6d7458266b",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qt5compat.json b/versions/q-/qt5compat.json
index 927a76006..6933b9db0 100644
--- a/versions/q-/qt5compat.json
+++ b/versions/q-/qt5compat.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "d3d8792b65b0a5f83423ed425d01bf77759c33d0",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "b47025d88998f99cdfe58e3df9498c3a08d72883",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtactiveqt.json b/versions/q-/qtactiveqt.json
index 590f24102..e0a42c7e9 100644
--- a/versions/q-/qtactiveqt.json
+++ b/versions/q-/qtactiveqt.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "746af755dc6d69853c6a369b2fa61aad7ec33c45",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "3e20968097c4a9d81833f16c2f6637b67e72258f",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json
index b351db070..784fc5be0 100644
--- a/versions/q-/qtbase.json
+++ b/versions/q-/qtbase.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "953b2fbc4ecc9e3ec83df47f2470d078f21758bd",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "8f4c208e4c4606ae0f7663901399720437358e76",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtcharts.json b/versions/q-/qtcharts.json
index 1a1d8b8bd..e65901685 100644
--- a/versions/q-/qtcharts.json
+++ b/versions/q-/qtcharts.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "74995a3fee551bc872bd44d0a0592a67cc20f3bb",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "5c3e47558bcd193afac22d72771d726b4e4721a1",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtcoap.json b/versions/q-/qtcoap.json
index 198ee4ec5..0b674f5e1 100644
--- a/versions/q-/qtcoap.json
+++ b/versions/q-/qtcoap.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "10c8de5683f1878cdee669c101dcbf50fefaf10e",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "2dec36ef658a413500ce4486e1d82fe377b3a99c",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtdatavis3d.json b/versions/q-/qtdatavis3d.json
index 855b909e9..8ff8df3dd 100644
--- a/versions/q-/qtdatavis3d.json
+++ b/versions/q-/qtdatavis3d.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b25e2c719ecc3c1476ceb68579e97f3562eb9899",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "0940f08a99ce3d6f46e2ad01242645ee4b4d61d5",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtdeclarative.json b/versions/q-/qtdeclarative.json
index ba440fd7b..f995b8a92 100644
--- a/versions/q-/qtdeclarative.json
+++ b/versions/q-/qtdeclarative.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "b283ef4063b4040b652dcfe42bf37006cded85a5",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "54b33929f07b96d7284b3b79923cafd06bdcb207",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtdoc.json b/versions/q-/qtdoc.json
index 67e0524dc..0d5ec5fa9 100644
--- a/versions/q-/qtdoc.json
+++ b/versions/q-/qtdoc.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "8a74cb89e81a66827639d45083efcc0e19260f70",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "5bf8d66cd624cdbc6158070163895171a76feb3e",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtimageformats.json b/versions/q-/qtimageformats.json
index 31046ef5b..a0a9ca9d6 100644
--- a/versions/q-/qtimageformats.json
+++ b/versions/q-/qtimageformats.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "4e3d92605b4a236be559ec0bfb55a5a282de0fe7",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "e5b06628ae9af1093a1b5a858cec9ca49d0488a6",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtlottie.json b/versions/q-/qtlottie.json
index 9188cc933..86d633bc8 100644
--- a/versions/q-/qtlottie.json
+++ b/versions/q-/qtlottie.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "7d8b35dbd8e41a85097752ce057623380ae023f2",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "58c76699b4615a2d73f708a7216bee9f1e04e265",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtmqtt.json b/versions/q-/qtmqtt.json
index 0761cb41b..da47891de 100644
--- a/versions/q-/qtmqtt.json
+++ b/versions/q-/qtmqtt.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "7c21f77ae949388eb4787d5abc8e3a94667ee584",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "a1503fed7d188e3ec61c12c590c34dd5bd80c88c",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtnetworkauth.json b/versions/q-/qtnetworkauth.json
index e30eed15f..1d69784b3 100644
--- a/versions/q-/qtnetworkauth.json
+++ b/versions/q-/qtnetworkauth.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "d3dbdc5974015e8c9e41087a13cd2d83b5f33394",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "1176858af90b88c983584218ed702abdb184b942",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtopcua.json b/versions/q-/qtopcua.json
index 0356ac85e..03ca84289 100644
--- a/versions/q-/qtopcua.json
+++ b/versions/q-/qtopcua.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "477ed1c8be16624d2d7ca9b548aea3d733c30c5e",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "12ea0d30494f580a959c288490e0443e06ecc5b8",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtquick3d.json b/versions/q-/qtquick3d.json
index 58346078d..ee1d8c034 100644
--- a/versions/q-/qtquick3d.json
+++ b/versions/q-/qtquick3d.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "5f9db44634b543a34b525ffc1444f764afe0241e",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "a9df9d17c45c39e2a6bf24cff0458bc690f16f1c",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtquickcontrols2.json b/versions/q-/qtquickcontrols2.json
index d67281984..0c5c05551 100644
--- a/versions/q-/qtquickcontrols2.json
+++ b/versions/q-/qtquickcontrols2.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "f7a3f18e05756732c1344a336558851d7f1adafc",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "ab667ec0d159c9e2b729dd42c7a0225c9cca6000",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtquicktimeline.json b/versions/q-/qtquicktimeline.json
index f00a9a40b..140017053 100644
--- a/versions/q-/qtquicktimeline.json
+++ b/versions/q-/qtquicktimeline.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "cd4994e897733cbbdab700567854117998f2986a",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "8ae8944b42dacf2e13322dd2946e008056b27dea",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtscxml.json b/versions/q-/qtscxml.json
index 2934589e7..53261ba80 100644
--- a/versions/q-/qtscxml.json
+++ b/versions/q-/qtscxml.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "12a020d23caf6939a8b10c126bd6dd5230f3c5bf",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "fab8ae306010c0bc21189d746169b8f52d728c40",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtshadertools.json b/versions/q-/qtshadertools.json
index 5c3be9ac5..df6dd8f48 100644
--- a/versions/q-/qtshadertools.json
+++ b/versions/q-/qtshadertools.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "ef324b3fad33f5340cc707700c6666663ca94de2",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "68ddad00b0176a27f54fa87b04c55e612f9ee87f",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtsvg.json b/versions/q-/qtsvg.json
index 54177ac31..dfa7c1ea3 100644
--- a/versions/q-/qtsvg.json
+++ b/versions/q-/qtsvg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "7fafae2d0f01bb61cff47d039ea5fa28f1f17967",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "12588c47b6c0faa970cdfc550f5f1526e8811c79",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json
index 5054857f5..4f9682210 100644
--- a/versions/q-/qttools.json
+++ b/versions/q-/qttools.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "f09d833f7ce9934bcc02650cd9c580b84932f6bc",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "93ebe354c38cc124370c24d066d2a631444347e8",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qttranslations.json b/versions/q-/qttranslations.json
index ffb86daf3..72e6c3bfc 100644
--- a/versions/q-/qttranslations.json
+++ b/versions/q-/qttranslations.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "899f3c456dd7aad0a3680083ef8d0f118b6c6761",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "8a70306f29690e0d5bb1a8fa99ed1c4108b5a247",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtvirtualkeyboard.json b/versions/q-/qtvirtualkeyboard.json
index 354106b8b..71bfc8286 100644
--- a/versions/q-/qtvirtualkeyboard.json
+++ b/versions/q-/qtvirtualkeyboard.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "f1ed3185f1204d32b530464acdd1f843e5edbf95",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "6d8d0ee73c77d2b796669b3e874f91d0c7270aa7",
"version-semver": "6.1.1",
"port-version": 0
diff --git a/versions/q-/qtwayland.json b/versions/q-/qtwayland.json
index 8391bd379..63008b3e4 100644
--- a/versions/q-/qtwayland.json
+++ b/versions/q-/qtwayland.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "39df5f0a73c89113b633ae47582d88e6b63b09c3",
+ "version-semver": "6.1.2",
+ "port-version": 0
+ },
+ {
"git-tree": "3b9d48c269a94eb37c62a7e81358855065cdd6cf",
"version-semver": "6.1.1",
"port-version": 0