[Qt6] Update to 6.1.2 (#18787)

* update qt to 6.1.2

* version stuff

5 files changed, 28 insertions, 50 deletions

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": [