Update to 6.6.3

20 files changed, 321 insertions, 102 deletions

diff --git a/.SRCINFO b/.SRCINFO
index efe8a00ead80..22941293b9c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt6-base
 	pkgdesc = A cross-platform application and UI framework (mingw-w64)
-	pkgver = 6.6.2
+	pkgver = 6.6.3
 	pkgrel = 1
 	url = https://www.qt.io
 	arch = any
@@ -18,6 +18,7 @@ pkgbase = mingw-w64-qt6-base
 	makedepends = qt6-base
 	makedepends = ninja
 	depends = mingw-w64-crt
+	depends = mingw-w64-cppwinrt
 	depends = mingw-w64-zlib
 	depends = mingw-w64-libjpeg-turbo
 	depends = mingw-w64-sqlite
@@ -35,7 +36,7 @@ pkgbase = mingw-w64-qt6-base
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = https://download.qt.io/official_releases/qt/6.6/6.6.2/submodules/qtbase-everywhere-src-6.6.2.tar.xz
+	source = https://download.qt.io/official_releases/qt/6.6/6.6.3/submodules/qtbase-everywhere-src-6.6.3.tar.xz
 	source = 0001-Use-CMake-s-default-import-library-suffix.patch
 	source = 0002-Fix-finding-D-Bus.patch
 	source = 0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -49,19 +50,27 @@ pkgbase = mingw-w64-qt6-base
 	source = 0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
 	source = 0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
 	source = 0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
-	sha256sums = b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b
-	sha256sums = 5337bd308d6c6342b1a61cb45a6e435d706c2eb751ab93c9118322165370809a
-	sha256sums = f1e013452ca62cccf9d17682701f67886173eb24e53b94ea0fe99a5edcb34d7a
-	sha256sums = 401d9275e9832c5000dd2b410158289b0cf853319da1a5ee97130598e28c0599
-	sha256sums = 404dc4efb1bdbdcaee2f0f8d561edf1b55a1050fab8e9a80c8eaf1c8aa816be2
-	sha256sums = bfae4a5fb06153204e2b731ade3f169a6f4b5b44769f7b7cd420cf9d492ff830
-	sha256sums = 6bbf063870a45dd58be5ec849195b553ce8697985cca8441c18e5baccf67d449
-	sha256sums = 843b63b105767bf26c3d2e0fb65d4a9021aae598b7fbae8f501e848551e6bc6c
-	sha256sums = a9c705a909876e20e0da2bf1137020b509e59fa25bb759831ce23f9b46576ffb
-	sha256sums = 6935ba318b0af86c40fca397e84046d004a23422b0c74187808133e5b1539b8c
-	sha256sums = ba9fb48fb7ddeaa665e81136fa33377ba4fbf1efeb787c229cb091c33c1b31c6
-	sha256sums = 6fd11b4bdd602f0b17cc75f8fc0e999119d2606e16e6ebca5804865a4094c55c
-	sha256sums = a589ff90a9be1c4b973e632f4b7419505a89406221a32c432aa9e72d59c8ef8f
-	sha256sums = 70f35a369aa9ee3d5b69ed036ee1091efc4535d727f6d05dd5737d2b81efe707
+	source = 0014-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch
+	source = 0015-Fix-setting-exception-flags-of-plugin-targets.patch
+	source = 0016-Link-corelib-correctly-against-runtimeobject-when-co.patch
+	source = 0017-Workaround-linker-error-about-missing-symbol-__sync_.patch
+	sha256sums = 0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462
+	sha256sums = 4436fa3cb4ae8042d4e7420dd69aff5e7ee90eab623b55290dadb4347f3af562
+	sha256sums = 5535db09b73284474eaf13181f52f52d67acad39f9fdc3a4cbd9938354e431b5
+	sha256sums = c4dd118f2670f526d1a294e00db91e3bc8e3fc733ece40f3d42e14f4210c9d9e
+	sha256sums = 9e4e0cffecb7718c76f6f1f5d1d73bfddb630339ebb71e1fe947b0abe1cd9696
+	sha256sums = 2365407788639c006c03b0c9ab524c1335a4175623e92d537b6e134b5b78793d
+	sha256sums = 9de86821cb75a0c7f6ffd26188a58347d4982497460aa1940ae7c6fd19a05e11
+	sha256sums = 721c32de68daca63ee2440218da7f998d052cf5122f0266ce18dc9fcf979d743
+	sha256sums = e8540d9b2b06a149668e389d8713a5e5d70a6728a01f7678fec36091f10d57a1
+	sha256sums = 25aaadd7ea30f4fc2d75f3bcb8dcb0a82e1fed23c7c34fa1deb7369032f9e24e
+	sha256sums = 7f1d483ab4b229c60a0658c6da18fb82619e0d8696ad5010de40748ce0b15b85
+	sha256sums = e61047f9f167c9229978895cd19cb7cbd722620fb600d48f63dcc8f727b79b09
+	sha256sums = e2811f2f857bf09572622cfec907bf738f3fdca1da9d83acd6cbaa62aa12ec85
+	sha256sums = 4b3a18cb211bdbdefda2ac34e97d16bc989e969ab77983cfcef8a75e06366504
+	sha256sums = d3a02fb4fe241187ce9dd91123e661cde1e6ccdb098c26a9f7a2209b20074c89
+	sha256sums = 3652e0a71c16c2d7ec249f349cd38374d32b0f87401b4ef3e2f583e0e290ec78
+	sha256sums = 022dbdf8b2e89bb4ec80311807aaae46cb52896dd89ecb212adc5c7b7ab59be6
+	sha256sums = 1497d88387d761da233588b024cdb46e7f02b4a7a3efcc9508317fd4571e008c
 
 pkgname = mingw-w64-qt6-base
diff --git a/0001-Use-CMake-s-default-import-library-suffix.patch b/0001-Use-CMake-s-default-import-library-suffix.patch
index a2906473c16a..32c8bc3e704f 100644
--- a/0001-Use-CMake-s-default-import-library-suffix.patch
+++ b/0001-Use-CMake-s-default-import-library-suffix.patch
@@ -1,7 +1,7 @@
-From ab531280437a9ea29a579c6cf6303850b3cf3af3 Mon Sep 17 00:00:00 2001
+From 30fa1f27688dd6b7263479bdfaefb266102427c3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 22:08:10 +0100
-Subject: [PATCH 01/13] Use CMake's default import library suffix
+Subject: [PATCH 01/17] Use CMake's default import library suffix
 
 Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
 ---
@@ -13,7 +13,7 @@ Change-Id: I3dbedaec74683e5bfd008f7f2fd1e046dfb921b2
  5 files changed, 21 insertions(+), 6 deletions(-)
 
 diff --git a/cmake/QtPriHelpers.cmake b/cmake/QtPriHelpers.cmake
-index f1d45cdcf6..32ca058969 100644
+index f1d45cdcf6c..32ca0589699 100644
 --- a/cmake/QtPriHelpers.cmake
 +++ b/cmake/QtPriHelpers.cmake
 @@ -523,9 +523,13 @@ QT.${config_module_name}_private.disabled_features = ${disabled_private_features
@@ -47,7 +47,7 @@ index f1d45cdcf6..32ca058969 100644
          ${CMAKE_STATIC_LIBRARY_SUFFIX})
      if(MSVC)
 diff --git a/cmake/QtPrlHelpers.cmake b/cmake/QtPrlHelpers.cmake
-index 45bfaedcdf..a433c98fe8 100644
+index 45bfaedcdf6..a433c98fe8c 100644
 --- a/cmake/QtPrlHelpers.cmake
 +++ b/cmake/QtPrlHelpers.cmake
 @@ -123,11 +123,17 @@ ${prl_step1_content_libs}
@@ -70,7 +70,7 @@ index 45bfaedcdf..a433c98fe8 100644
      if(QT_GENERATOR_IS_MULTI_CONFIG)
          set(configs ${CMAKE_CONFIGURATION_TYPES})
 diff --git a/mkspecs/common/g++-win32.conf b/mkspecs/common/g++-win32.conf
-index 67ad1e3b8c..b98c7121f6 100644
+index 67ad1e3b8c1..b98c7121f6f 100644
 --- a/mkspecs/common/g++-win32.conf
 +++ b/mkspecs/common/g++-win32.conf
 @@ -54,6 +54,7 @@ QMAKE_PREFIX_SHLIB      =
@@ -82,7 +82,7 @@ index 67ad1e3b8c..b98c7121f6 100644
  
  QMAKE_LIBS              =
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 24ed125f12..73ebe453d3 100644
+index 24ed125f12b..73ebe453d3d 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -332,8 +332,9 @@ mac {
@@ -98,7 +98,7 @@ index 24ed125f12..73ebe453d3 100644
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
 diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake
-index e082e586a6..791c580c73 100644
+index 32d0693311d..566cbac3799 100644
 --- a/src/corelib/Qt6CoreMacros.cmake
 +++ b/src/corelib/Qt6CoreMacros.cmake
 @@ -550,7 +550,6 @@ function(_qt_internal_apply_win_prefix_and_suffix target)
@@ -110,5 +110,5 @@ index e082e586a6..791c580c73 100644
              get_target_property(target_type ${target} TYPE)
              if(target_type STREQUAL "STATIC_LIBRARY")
 -- 
-2.43.0
+2.44.0
 
diff --git a/0002-Fix-finding-D-Bus.patch b/0002-Fix-finding-D-Bus.patch
index afdae3016c55..46145217abff 100644
--- a/0002-Fix-finding-D-Bus.patch
+++ b/0002-Fix-finding-D-Bus.patch
@@ -1,7 +1,7 @@
-From df5d77a3a0ab5cd0c4237a65cbdedc0825910544 Mon Sep 17 00:00:00 2001
+From 238012eaa343098ec97473788bec60cc74587800 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 7 Oct 2020 12:13:37 +0200
-Subject: [PATCH 02/13] Fix finding D-Bus
+Subject: [PATCH 02/17] Fix finding D-Bus
 
 Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
 ---
@@ -9,7 +9,7 @@ Change-Id: Ie21eb9cbc6b1b5d9c8b34eea46f54718e5926986
  1 file changed, 3 insertions(+)
 
 diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
-index e2a58790c4..8e0ed81f89 100644
+index e2a58790c4e..8e0ed81f893 100644
 --- a/cmake/FindWrapDBus1.cmake
 +++ b/cmake/FindWrapDBus1.cmake
 @@ -48,3 +48,6 @@ include(FindPackageHandleStandardArgs)
@@ -20,5 +20,5 @@ index e2a58790c4..8e0ed81f89 100644
 +    set_property(TARGET dbus-1 PROPERTY IMPORTED_IMPLIB ${DBus1_LIBRARY})
 +endif()
 -- 
-2.43.0
+2.44.0
 
diff --git a/0003-Fix-using-static-PCRE2-and-DBus-1.patch b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
index e61464377e32..6e50a5b1f6e1 100644
--- a/0003-Fix-using-static-PCRE2-and-DBus-1.patch
+++ b/0003-Fix-using-static-PCRE2-and-DBus-1.patch
@@ -1,7 +1,7 @@
-From a061819f2b68392ecff422c54d80cedb529acc15 Mon Sep 17 00:00:00 2001
+From a77593b453a5361feb0dd053dbe389fdd5501cdd Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:13:19 +0100
-Subject: [PATCH 03/13] Fix using static PCRE2 and DBus-1
+Subject: [PATCH 03/17] Fix using static PCRE2 and DBus-1
 
 When making a static build of Qt we're using the static version of these
 libraries and must define the corresponding macros.
@@ -13,7 +13,7 @@ Change-Id: I2387b79462b6d183b71f9433dd937f63fc7ef26e
  2 files changed, 9 insertions(+)
 
 diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
-index 93e4f7d1f9..23299af94b 100644
+index b00d263b710..032812ae861 100644
 --- a/src/corelib/text/qregularexpression.cpp
 +++ b/src/corelib/text/qregularexpression.cpp
 @@ -20,6 +20,11 @@
@@ -29,7 +29,7 @@ index 93e4f7d1f9..23299af94b 100644
  #include <pcre2.h>
  
 diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
-index e3008be761..9c745c16c4 100644
+index e3008be7619..9c745c16c41 100644
 --- a/src/dbus/qdbus_symbols_p.h
 +++ b/src/dbus/qdbus_symbols_p.h
 @@ -21,6 +21,10 @@
@@ -44,5 +44,5 @@ index e3008be761..9c745c16c4 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.43.0
+2.44.0
 
diff --git a/0004-Fix-transitive-dependencies-of-static-libraries.patch b/0004-Fix-transitive-dependencies-of-static-libraries.patch
index 173063a4d122..7bb7b38a698f 100644
--- a/0004-Fix-transitive-dependencies-of-static-libraries.patch
+++ b/0004-Fix-transitive-dependencies-of-static-libraries.patch
@@ -1,7 +1,7 @@
-From 76a37b0e210b0199388d1ddf8697ba2d055db32c Mon Sep 17 00:00:00 2001
+From f54f12d78abb6cd209f79c2309d6b50cff64c06e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 5 Nov 2020 21:59:33 +0100
-Subject: [PATCH 04/13] Fix transitive dependencies (of static libraries)
+Subject: [PATCH 04/17] Fix transitive dependencies (of static libraries)
 
 The dependencies of these libraries are not reliably picked up by their
 corresponding find modules. This change allows adding the required
@@ -23,7 +23,7 @@ Change-Id: I3baec612ee071eec77f756b18bbb9af87663527c
  8 files changed, 9 insertions(+), 7 deletions(-)
 
 diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
-index 24a194c9cb..a6a16b494f 100644
+index 24a194c9cb3..a6a16b494fd 100644
 --- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
 +++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
 @@ -135,7 +135,7 @@ if(GLIB2_FOUND AND NOT TARGET GLIB2::GLIB2)
@@ -36,7 +36,7 @@ index 24a194c9cb..a6a16b494f 100644
  endif()
  
 diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
-index d191d1ac0a..b61d0107f2 100644
+index d191d1ac0a3..b61d0107f25 100644
 --- a/cmake/FindMySQL.cmake
 +++ b/cmake/FindMySQL.cmake
 @@ -83,6 +83,7 @@ if(MySQL_FOUND)
@@ -48,7 +48,7 @@ index d191d1ac0a..b61d0107f2 100644
      if(MySQL_LIBRARY_DEBUG)
        set_target_properties(MySQL::MySQL PROPERTIES
 diff --git a/cmake/FindWrapDBus1.cmake b/cmake/FindWrapDBus1.cmake
-index 8e0ed81f89..0aec7dbb77 100644
+index 8e0ed81f893..0aec7dbb776 100644
 --- a/cmake/FindWrapDBus1.cmake
 +++ b/cmake/FindWrapDBus1.cmake
 @@ -50,4 +50,5 @@ find_package_handle_standard_args(WrapDBus1 REQUIRED_VARS
@@ -58,7 +58,7 @@ index 8e0ed81f89..0aec7dbb77 100644
 +    set_property(TARGET dbus-1 PROPERTY INTERFACE_LINK_LIBRARIES "${DBUS1_DEPENDENCIES}")
  endif()
 diff --git a/cmake/FindWrapOpenSSL.cmake b/cmake/FindWrapOpenSSL.cmake
-index a4341271fe..be6ac7003a 100644
+index a4341271fee..be6ac7003a1 100644
 --- a/cmake/FindWrapOpenSSL.cmake
 +++ b/cmake/FindWrapOpenSSL.cmake
 @@ -14,7 +14,7 @@ set(WrapOpenSSL_FOUND OFF)
@@ -80,7 +80,7 @@ index a4341271fe..be6ac7003a 100644
  
  include(FindPackageHandleStandardArgs)
 diff --git a/cmake/FindWrapSystemFreetype.cmake b/cmake/FindWrapSystemFreetype.cmake
-index d0c27a9f0f..64e14c584c 100644
+index d0c27a9f0f7..64e14c584c2 100644
 --- a/cmake/FindWrapSystemFreetype.cmake
 +++ b/cmake/FindWrapSystemFreetype.cmake
 @@ -47,7 +47,7 @@ find_package_handle_standard_args(WrapSystemFreetype
@@ -93,7 +93,7 @@ index d0c27a9f0f..64e14c584c 100644
  unset(__freetype_target_name)
  unset(__freetype_found)
 diff --git a/cmake/FindWrapSystemHarfbuzz.cmake b/cmake/FindWrapSystemHarfbuzz.cmake
-index 07b3405bc0..10fb738d7c 100644
+index 07b3405bc07..10fb738d7cb 100644
 --- a/cmake/FindWrapSystemHarfbuzz.cmake
 +++ b/cmake/FindWrapSystemHarfbuzz.cmake
 @@ -73,7 +73,7 @@ find_package_handle_standard_args(WrapSystemHarfbuzz
@@ -106,7 +106,7 @@ index 07b3405bc0..10fb738d7c 100644
  unset(__harfbuzz_target_name)
  unset(__harfbuzz_find_include_dirs_hints)
 diff --git a/cmake/FindWrapSystemPNG.cmake b/cmake/FindWrapSystemPNG.cmake
-index 967ccc5c02..9a7d5150dc 100644
+index 967ccc5c026..9a7d5150dcf 100644
 --- a/cmake/FindWrapSystemPNG.cmake
 +++ b/cmake/FindWrapSystemPNG.cmake
 @@ -36,7 +36,7 @@ find_package_handle_standard_args(WrapSystemPNG
@@ -119,7 +119,7 @@ index 967ccc5c02..9a7d5150dc 100644
  unset(__png_target_name)
  unset(__png_found)
 diff --git a/src/plugins/sqldrivers/psql/CMakeLists.txt b/src/plugins/sqldrivers/psql/CMakeLists.txt
-index d392f4dfa5..165c345e1b 100644
+index d392f4dfa55..165c345e1ba 100644
 --- a/src/plugins/sqldrivers/psql/CMakeLists.txt
 +++ b/src/plugins/sqldrivers/psql/CMakeLists.txt
 @@ -17,7 +17,7 @@ qt_internal_add_plugin(QPSQLDriverPlugin
@@ -132,5 +132,5 @@ index d392f4dfa5..165c345e1b 100644
          Qt::CorePrivate
          Qt::SqlPrivate
 -- 
-2.43.0
+2.44.0
 
diff --git a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
index b15d9d6804c2..16dcd04ffeb4 100644
--- a/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
+++ b/0005-Fix-libjpeg-workaround-for-conflict-with-rpcndr.h.patch
@@ -1,7 +1,7 @@
-From a17fb43c9257fe1e7a1c57f7c968103ed4ee4c7b Mon Sep 17 00:00:00 2001
+From 9304a56442c6af9deec0a4d084477e0daf63e24e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 2 Nov 2020 13:47:45 +0100
-Subject: [PATCH 05/13] Fix libjpeg workaround for conflict with rpcndr.h
+Subject: [PATCH 05/17] Fix libjpeg workaround for conflict with rpcndr.h
 
 Otherwise it won't compile against mingw-w64-libjpeg-turbo. This version of
 libjpeg seems to take care of the conflict already as long as jconfig.h is
@@ -13,7 +13,7 @@ Change-Id: I011b7735485689c9797cffe2646c8c3d15d0645e
  1 file changed, 1 insertion(+)
 
 diff --git a/src/plugins/imageformats/jpeg/qjpeghandler.cpp b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
-index 0d72ba01d0..a706fb4cea 100644
+index 0d72ba01d04..a706fb4cea3 100644
 --- a/src/plugins/imageformats/jpeg/qjpeghandler.cpp
 +++ b/src/plugins/imageformats/jpeg/qjpeghandler.cpp
 @@ -26,6 +26,7 @@
@@ -25,5 +25,5 @@ index 0d72ba01d0..a706fb4cea 100644
  #ifdef const
  #  undef const          // remove crazy C hackery in jconfig.h
 -- 
-2.43.0
+2.44.0
 
diff --git a/0006-Support-finding-static-MariaDB-client-library.patch b/0006-Support-finding-static-MariaDB-client-library.patch
index 582dac9355eb..bdc06f3201be 100644
--- a/0006-Support-finding-static-MariaDB-client-library.patch
+++ b/0006-Support-finding-static-MariaDB-client-library.patch
@@ -1,7 +1,7 @@
-From ef17546b4c93fdc922db5655586149af8137e99c Mon Sep 17 00:00:00 2001
+From 5e59b3c67062118177e0e4370db7d06b05c276da Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:33:12 +0100
-Subject: [PATCH 06/13] Support finding static MariaDB client library
+Subject: [PATCH 06/17] Support finding static MariaDB client library
 
 We need to reverse the order to look for mariadb first (and only then
 for mysql) because otherwise it would pick up the static library
@@ -14,7 +14,7 @@ Change-Id: I8f9ba27e638619dba411ad0e37f2f03eab4775bf
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake
-index b61d0107f2..6fb26e51f1 100644
+index b61d0107f25..6fb26e51f13 100644
 --- a/cmake/FindMySQL.cmake
 +++ b/cmake/FindMySQL.cmake
 @@ -63,13 +63,13 @@ find_path(MySQL_INCLUDE_DIR
@@ -34,5 +34,5 @@ index b61d0107f2..6fb26e51f1 100644
  endif()
  
 -- 
-2.43.0
+2.44.0
 
diff --git a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
index b9522d74991f..70b88d8015c9 100644
--- a/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
+++ b/0007-Allow-overriding-CMAKE_FIND_LIBRARY_SUFFIXES-to-pref.patch
@@ -1,7 +1,7 @@
-From dc4b23c50ba75b9bffc397c38f73496d7bf04100 Mon Sep 17 00:00:00 2001
+From ee08e83b5a8bc4960326f15229ee9f033be8134b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 8 Nov 2020 00:34:09 +0100
-Subject: [PATCH 07/13] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
+Subject: [PATCH 07/17] Allow overriding CMAKE_FIND_LIBRARY_SUFFIXES to prefer
  static libraries
 
 Change-Id: Ibb688ac503ecdf1dd3bd838890efdfc01bf706aa
@@ -10,7 +10,7 @@ Change-Id: Ibb688ac503ecdf1dd3bd838890efdfc01bf706aa
  1 file changed, 4 insertions(+)
 
 diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
-index 129f1ebb77..9bae62d879 100644
+index 129f1ebb771..9bae62d8795 100644
 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
 +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
 @@ -4,6 +4,10 @@
@@ -25,5 +25,5 @@ index 129f1ebb77..9bae62d879 100644
  
  # This depends on qt_internal_read_repo_dependencies existing.
 -- 
-2.43.0
+2.44.0
 
diff --git a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
index a5176e1a2e83..179d84763d85 100644
--- a/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/0008-Fix-crashes-in-rasterization-code-using-setjmp.patch
@@ -1,7 +1,7 @@
-From 6a3ba9e734570288c5a6127c201524c92149dff9 Mon Sep 17 00:00:00 2001
+From cc87940ac0e524bc249bc79c343eaa1502d8bbc1 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 Jun 2021 22:24:12 +0200
-Subject: [PATCH 08/13] Fix crashes in rasterization code using setjmp
+Subject: [PATCH 08/17] Fix crashes in rasterization code using setjmp
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -28,7 +28,7 @@ Change-Id: I01937d13569dd01ab4cb1f608020544c93bc343c
  rename src/gui/painting/{qgrayraster.c => qgrayraster.cpp} (98%)
 
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index dded14bb31..820b943f16 100644
+index dded14bb313..820b943f16d 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
 @@ -174,7 +174,7 @@ qt_internal_add_module(Gui
@@ -56,7 +56,7 @@ diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.cpp
 similarity index 98%
 rename from src/gui/painting/qgrayraster.c
 rename to src/gui/painting/qgrayraster.cpp
-index 3c222c49e1..813cfc08dc 100644
+index 3c222c49e16..813cfc08dcf 100644
 --- a/src/gui/painting/qgrayraster.c
 +++ b/src/gui/painting/qgrayraster.cpp
 @@ -3,7 +3,7 @@
@@ -235,7 +235,7 @@ index 3c222c49e1..813cfc08dc 100644
          *araster = 0;
          return ErrRaster_Memory_Overflow;
 diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json
-index 33ed2fd5c7..658547ce4a 100644
+index 33ed2fd5c7b..658547ce4a8 100644
 --- a/src/gui/painting/qt_attribution.json
 +++ b/src/gui/painting/qt_attribution.json
 @@ -4,7 +4,7 @@
@@ -248,5 +248,5 @@ index 33ed2fd5c7..658547ce4a 100644
          "Description": "FreeType is a freely available software library to render fonts.",
          "Homepage": "http://www.freetype.org",
 -- 
-2.43.0
+2.44.0
 
diff --git a/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch b/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
index b5a60af7da60..b5f7d0aaffc5 100644
--- a/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
+++ b/0009-Find-fontconfig-via-pkg-config-for-correct-handling-.patch
@@ -1,7 +1,7 @@
-From d4c8e46503f4037e6203dbfd31106ec16ffce434 Mon Sep 17 00:00:00 2001
+From 3e13be5576b33773f16a4a4cdddbaab6235eae85 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 24 Apr 2022 23:00:27 +0200
-Subject: [PATCH 09/13] Find fontconfig via pkg-config for correct handling of
+Subject: [PATCH 09/17] Find fontconfig via pkg-config for correct handling of
  its dependencies
 
 CMake's own find module unforunately does not consider fontconfig's deps so
@@ -17,7 +17,7 @@ Change-Id: I331cd6b1af4f2857279c90920d777977e80fdce5
 
 diff --git a/cmake/FindFontconfig.cmake b/cmake/FindFontconfig.cmake
 new file mode 100644
-index 0000000000..1a52327ae6
+index 00000000000..1a52327ae6f
 --- /dev/null
 +++ b/cmake/FindFontconfig.cmake
 @@ -0,0 +1,11 @@
@@ -33,7 +33,7 @@ index 0000000000..1a52327ae6
 +    set(Fontconfig_FOUND 1)
 +endif()
 diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 820b943f16..c6eb55f0a5 100644
+index 820b943f16d..c6eb55f0a56 100644
 --- a/src/gui/CMakeLists.txt
 +++ b/src/gui/CMakeLists.txt
 @@ -710,7 +710,7 @@ qt_internal_extend_target(Gui CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_fre
@@ -46,7 +46,7 @@ index 820b943f16..c6eb55f0a5 100644
  
  qt_internal_extend_target(Gui CONDITION APPLE AND NOT MACOS
 diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
-index 222073adcd..27cdac0dbf 100644
+index 222073adcdd..27cdac0dbf5 100644
 --- a/src/gui/configure.cmake
 +++ b/src/gui/configure.cmake
 @@ -43,7 +43,7 @@ qt_find_package(WrapSystemFreetype 2.2.0 PROVIDED_TARGETS WrapSystemFreetype::Wr
@@ -59,5 +59,5 @@ index 222073adcd..27cdac0dbf 100644
  qt_find_package(gbm PROVIDED_TARGETS gbm::gbm MODULE_NAME gui QMAKE_LIB gbm)
  qt_find_package(WrapSystemHarfbuzz 2.6.0 PROVIDED_TARGETS WrapSystemHarfbuzz::WrapSystemHarfbuzz MODULE_NAME gui QMAKE_LIB harfbuzz)
 -- 
-2.43.0
+2.44.0
 
diff --git a/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch b/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch
index c2d1f7ca0d2c..1f79d3405f86 100644
--- a/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch
+++ b/0010-Fix-dependency-of-xcb-image-on-xcb-util.patch
@@ -1,7 +1,7 @@
-From af9caa1b9cc22f2534755d0754404f8b20a0c82c Mon Sep 17 00:00:00 2001
+From 1f7ead09cc41d8be6f60b03ace9d6583be130bbe Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 24 Apr 2022 23:49:36 +0200
-Subject: [PATCH 10/13] Fix dependency of xcb-image on xcb-util
+Subject: [PATCH 10/17] Fix dependency of xcb-image on xcb-util
 
 Considering this linker error, xcb-image apparently depends on xcb-util:
 ```
@@ -15,7 +15,7 @@ Change-Id: Ic87a94ec664c126a5af1012d31b068d3dc7ec947
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
-index 26b9bf8963..0ae21f774c 100644
+index 26b9bf89633..0ae21f774c6 100644
 --- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
 +++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindXCB.cmake
 @@ -108,6 +108,7 @@ set(XCB_known_components
@@ -44,5 +44,5 @@ index 26b9bf8963..0ae21f774c 100644
  set(XCB_XFIXES_component_deps XCB RENDER SHAPE)
  set(XCB_XVMC_component_deps XCB XV)
 -- 
-2.43.0
+2.44.0
 
diff --git a/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch b/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
index 68b49d0face1..a23fbf7a7e27 100644
--- a/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
+++ b/0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch
@@ -1,7 +1,7 @@
-From c67988c5f36623d9ac326bbb86fdcea4265da815 Mon Sep 17 00:00:00 2001
+From b372fe6ab04d2ab06c173f16f8f116f477ff025b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 26 Apr 2022 20:16:31 +0200
-Subject: [PATCH 11/13] Allow using properties of PkgConfig targets for glib2
+Subject: [PATCH 11/17] Allow using properties of PkgConfig targets for glib2
  to handle deps of static glib2
 
 Change-Id: I37d20256d17ae9cc0775e32aa479f1e433ece908
@@ -10,7 +10,7 @@ Change-Id: I37d20256d17ae9cc0775e32aa479f1e433ece908
  1 file changed, 18 insertions(+), 4 deletions(-)
 
 diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
-index a6a16b494f..a5da57824c 100644
+index a6a16b494fd..a5da57824c9 100644
 --- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
 +++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindGLIB2.cmake
 @@ -52,7 +52,7 @@
@@ -70,5 +70,5 @@ index a6a16b494f..a5da57824c 100644
  set_package_properties(GLIB2 PROPERTIES
    URL "https://wiki.gnome.org/Projects/GLib"
 -- 
-2.43.0
+2.44.0
 
diff --git a/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch b/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
index bb6136e66764..22036c58efc9 100644
--- a/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
+++ b/0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch
@@ -1,7 +1,7 @@
-From 003a0762443d8b8cfdf8a33c2a15163ac5c4d346 Mon Sep 17 00:00:00 2001
+From 02b48c168d191668a4b22a950ed507aafdaf8c55 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 1 May 2022 23:28:26 +0200
-Subject: [PATCH 12/13] Allow using properties of PkgConfig targets for Wayland
+Subject: [PATCH 12/17] Allow using properties of PkgConfig targets for Wayland
  to handle deps of static libs
 
 Change-Id: I2a4acf0acaf5a363d551384bb4c33c48a3792f27
@@ -10,7 +10,7 @@ Change-Id: I2a4acf0acaf5a363d551384bb4c33c48a3792f27
  1 file changed, 21 insertions(+)
 
 diff --git a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
-index 233cc88d02..875c71377c 100644
+index 233cc88d020..875c71377c6 100644
 --- a/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
 +++ b/cmake/3rdparty/extra-cmake-modules/find-modules/FindWayland.cmake
 @@ -75,6 +75,13 @@
@@ -49,5 +49,5 @@ index 233cc88d02..875c71377c 100644
  set_package_properties(Wayland PROPERTIES
      URL "http://wayland.freedesktop.org"
 -- 
-2.43.0
+2.44.0
 
diff --git a/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch b/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
index b1fb5ecf9347..520604a85f85 100644
--- a/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
+++ b/0013-Allow-overriding-preference-for-shared-libzstd-libra.patch
@@ -1,7 +1,7 @@
-From ee14993094cc62d1a819bfe37f4447512f2a265c Mon Sep 17 00:00:00 2001
+From 4e1a0159903caec1b32ed1556dffecb66eba5298 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Nov 2023 23:58:54 +0100
-Subject: [PATCH 13/13] Allow overriding preference for shared libzstd library
+Subject: [PATCH 13/17] Allow overriding preference for shared libzstd library
 
 As of 3f45905953d57e0174059d7d9d6bc75c3c1c406c Qt prefers the shared zstd
 library. This breaks static builds. With this change the static library is
@@ -14,7 +14,7 @@ Change-Id: I38b8a15929e6b7044d827c095f13a27e0adf11da
  1 file changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/cmake/FindWrapZSTD.cmake b/cmake/FindWrapZSTD.cmake
-index fb424236b8..12a3178518 100644
+index fb424236b89..12a3178518e 100644
 --- a/cmake/FindWrapZSTD.cmake
 +++ b/cmake/FindWrapZSTD.cmake
 @@ -28,10 +28,12 @@ include(FindPackageHandleStandardArgs)
@@ -34,5 +34,5 @@ index fb424236b8..12a3178518 100644
      if(NOT TARGET WrapZSTD::WrapZSTD)
          add_library(WrapZSTD::WrapZSTD INTERFACE IMPORTED)
 -- 
-2.43.0
+2.44.0
 
diff --git a/0014-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch b/0014-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch
new file mode 100644
index 000000000000..bf04d417efab
--- /dev/null
+++ b/0014-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch
@@ -0,0 +1,29 @@
+From 3cb82f403853a4e18280f369394fc2da36b29a01 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 17 Feb 2024 20:31:12 +0100
+Subject: [PATCH 14/17] Fix errors due to disabled exceptions with cpp_winrt
+ support
+
+The winrt headers use exceptions so code using them must be compiled
+with exceptions enabled.
+
+Change-Id: I216f65b260062ff2020f8a288ddda78c3e9fc3c9
+---
+ src/plugins/platforms/windows/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
+index ca1bbcb758c..16fd2cd2be9 100644
+--- a/src/plugins/platforms/windows/CMakeLists.txt
++++ b/src/plugins/platforms/windows/CMakeLists.txt
+@@ -9,6 +9,7 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
+     OUTPUT_NAME qwindows
+     PLUGIN_TYPE platforms
+     DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES windows
++    EXCEPTIONS
+     SOURCES
+         main.cpp
+         qtwindowsglobal.h
+-- 
+2.44.0
+
diff --git a/0015-Fix-setting-exception-flags-of-plugin-targets.patch b/0015-Fix-setting-exception-flags-of-plugin-targets.patch
new file mode 100644
index 000000000000..87f99ffae728
--- /dev/null
+++ b/0015-Fix-setting-exception-flags-of-plugin-targets.patch
@@ -0,0 +1,31 @@
+From 16270d06822ab9ad3f0aa179c32607ad7260a6ad Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 17 Feb 2024 20:48:21 +0100
+Subject: [PATCH 15/17] Fix setting exception flags of plugin targets
+
+Change-Id: I93b1b5fa55f3e35e13351d9c981409f1593bf8a8
+---
+ cmake/QtPluginHelpers.cmake | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/QtPluginHelpers.cmake b/cmake/QtPluginHelpers.cmake
+index bc0f651b99c..0a832a71f08 100644
+--- a/cmake/QtPluginHelpers.cmake
++++ b/cmake/QtPluginHelpers.cmake
+@@ -376,8 +376,11 @@ function(qt_internal_add_plugin target)
+ 
+     qt_internal_add_repo_local_defines("${target}")
+ 
+-    qt_internal_set_exceptions_flags("${target}" ${arg_EXCEPTIONS})
+-
++    if(NOT arg_EXCEPTIONS AND NOT ${arg_HEADER_MODULE})
++        qt_internal_set_exceptions_flags("${target}" FALSE)
++    elseif(arg_EXCEPTIONS)
++        qt_internal_set_exceptions_flags("${target}" TRUE)
++    endif()
+ 
+     set(qt_libs_private "")
+     qt_internal_get_qt_all_known_modules(known_modules)
+-- 
+2.44.0
+
diff --git a/0016-Link-corelib-correctly-against-runtimeobject-when-co.patch b/0016-Link-corelib-correctly-against-runtimeobject-when-co.patch
new file mode 100644
index 000000000000..9ba902becbc8
--- /dev/null
+++ b/0016-Link-corelib-correctly-against-runtimeobject-when-co.patch
@@ -0,0 +1,45 @@
+From 31f9863d7d2228baaea7be1debf94d1e272c6768 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 17 Feb 2024 21:39:39 +0100
+Subject: [PATCH 16/17] Link corelib correctly against runtimeobject when
+ compiling for Windows
+
+This library is included by mingw-w64 and also needs to be linked against
+for code in `qlocale_win.cpp` enabled via the `cpp_winrt` feature flag.
+
+Change-Id: Ie3bd0290bb2f1c0d227c60a6cf6580efddd837fd
+---
+ src/corelib/CMakeLists.txt                                     | 3 +--
+ .../networkinformation/networklistmanager/CMakeLists.txt       | 2 +-
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
+index f4bd31b55d4..ba7c025d722 100644
+--- a/src/corelib/CMakeLists.txt
++++ b/src/corelib/CMakeLists.txt
+@@ -779,8 +779,7 @@ qt_internal_extend_target(Core CONDITION WIN32
+         text/qlocale_win.cpp
+ )
+ 
+-# On MS-Win, clang has two flavors, one of which immitates MSVC (so claims to be it)
+-qt_internal_extend_target(Core CONDITION WIN32 AND MSVC AND NOT CLANG
++qt_internal_extend_target(Core CONDITION WIN32
+     LIBRARIES
+         runtimeobject
+ )
+diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
+index a9acc465f36..acd3754f4e5 100644
+--- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
++++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
+@@ -14,7 +14,7 @@ qt_internal_add_plugin(QNLMNIPlugin
+         Qt::NetworkPrivate
+ )
+ 
+-qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32 AND MSVC AND NOT CLANG
++qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32
+     LIBRARIES
+         runtimeobject
+         oleaut32
+-- 
+2.44.0
+
diff --git a/0017-Workaround-linker-error-about-missing-symbol-__sync_.patch b/0017-Workaround-linker-error-about-missing-symbol-__sync_.patch
new file mode 100644
index 000000000000..3a5b33741e6e
--- /dev/null
+++ b/0017-Workaround-linker-error-about-missing-symbol-__sync_.patch
@@ -0,0 +1,87 @@
+From 267f6ff8b49fca1b16463864fe18accbf81d6e37 Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Sat, 17 Feb 2024 23:11:18 +0100
+Subject: [PATCH 17/17] Workaround linker error about missing symbol
+ `__sync_bool_compare_and_swap_16`
+
+This error only happens when compiling for the x86_64-w64-mingw32 target
+with the `cpp_winrt` feature enabled. Adding the `-mcx16c` flag helps to
+avoid it. This means the `CMPXCHG16B` instruction is required but this
+code will only run on newer systems anyway (considering Qt requires Windows
+10).
+
+Change-Id: I02c47c386d80e5f8a21bb2a4cee83e2141dee481
+---
+ src/corelib/CMakeLists.txt                                   | 5 +++++
+ .../networkinformation/networklistmanager/CMakeLists.txt     | 5 +++++
+ src/plugins/platforms/direct2d/CMakeLists.txt                | 5 +++++
+ src/plugins/platforms/windows/CMakeLists.txt                 | 5 +++++
+ 4 files changed, 20 insertions(+)
+
+diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
+index ba7c025d722..fbb40bb8305 100644
+--- a/src/corelib/CMakeLists.txt
++++ b/src/corelib/CMakeLists.txt
+@@ -779,6 +779,11 @@ qt_internal_extend_target(Core CONDITION WIN32
+         text/qlocale_win.cpp
+ )
+ 
++# workaround undefined reference to `__sync_bool_compare_and_swap_16'
++if (QT_FEATURE_cpp_winrt AND MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86.*)|(X86.*)|(amd64)|(AMD64)")
++    set_property(SOURCE text/qlocale_win.cpp APPEND PROPERTY COMPILE_FLAGS "-mcx16")
++endif ()
++
+ qt_internal_extend_target(Core CONDITION WIN32
+     LIBRARIES
+         runtimeobject
+diff --git a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
+index acd3754f4e5..0557c60afd1 100644
+--- a/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
++++ b/src/plugins/networkinformation/networklistmanager/CMakeLists.txt
+@@ -20,6 +20,11 @@ qt_internal_extend_target(QNLMNIPlugin CONDITION WIN32
+         oleaut32
+ )
+ 
++# workaround undefined reference to `__sync_bool_compare_and_swap_16'
++if (QT_FEATURE_cpp_winrt AND MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86.*)|(X86.*)|(amd64)|(AMD64)")
++    target_compile_options(QNLMNIPlugin PRIVATE -mcx16)
++endif ()
++
+ # Don't repeat the target name in AUTOGEN_BUILD_DIR to work around issues with overlong paths.
+ set_property(TARGET QNLMNIPlugin PROPERTY
+     AUTOGEN_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/autogen")
+diff --git a/src/plugins/platforms/direct2d/CMakeLists.txt b/src/plugins/platforms/direct2d/CMakeLists.txt
+index e21b230cd78..e44587af743 100644
+--- a/src/plugins/platforms/direct2d/CMakeLists.txt
++++ b/src/plugins/platforms/direct2d/CMakeLists.txt
+@@ -82,6 +82,11 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
+         runtimeobject
+ )
+ 
++# workaround undefined reference to `__sync_bool_compare_and_swap_16'
++if (QT_FEATURE_cpp_winrt AND MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86.*)|(X86.*)|(amd64)|(AMD64)")
++    target_compile_options(QWindowsDirect2DIntegrationPlugin PRIVATE -mcx16)
++endif ()
++
+ # Resources:
+ set_source_files_properties("../windows/openglblacklists/default.json"
+     PROPERTIES QT_RESOURCE_ALIAS "default.json"
+diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
+index 16fd2cd2be9..2521707ddae 100644
+--- a/src/plugins/platforms/windows/CMakeLists.txt
++++ b/src/plugins/platforms/windows/CMakeLists.txt
+@@ -70,6 +70,11 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
+         runtimeobject
+ )
+ 
++# workaround undefined reference to `__sync_bool_compare_and_swap_16'
++if (QT_FEATURE_cpp_winrt AND MINGW AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "(x86.*)|(X86.*)|(amd64)|(AMD64)")
++    target_compile_options(QWindowsIntegrationPlugin PRIVATE -mcx16)
++endif ()
++
+ # Resources:
+ set_source_files_properties("openglblacklists/default.json"
+     PROPERTIES QT_RESOURCE_ALIAS "default.json"
+-- 
+2.44.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 8f257458151f..a3d1cbb63e0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,14 +11,14 @@
 # All patches are managed at https://github.com/Martchus/qtbase
 
 pkgname=mingw-w64-qt6-base
-_qtver=6.6.2
+_qtver=6.6.3
 pkgver=${_qtver/-/}
 pkgrel=1
 arch=(any)
 url='https://www.qt.io'
 license=(GPL3 LGPL3 FDL custom)
 pkgdesc='A cross-platform application and UI framework (mingw-w64)'
-depends=('mingw-w64-crt' 'mingw-w64-zlib' 'mingw-w64-libjpeg-turbo' 'mingw-w64-sqlite'
+depends=('mingw-w64-crt' 'mingw-w64-cppwinrt' 'mingw-w64-zlib' 'mingw-w64-libjpeg-turbo' 'mingw-w64-sqlite'
          'mingw-w64-libpng' 'mingw-w64-openssl' 'mingw-w64-dbus' 'mingw-w64-harfbuzz'
          'mingw-w64-brotli' 'mingw-w64-pcre2' 'mingw-w64-zstd')
 makedepends=('mingw-w64-cmake' 'mingw-w64-postgresql' 'mingw-w64-mariadb-connector-c'
@@ -43,21 +43,29 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/subm
         '0010-Fix-dependency-of-xcb-image-on-xcb-util.patch'
         '0011-Allow-using-properties-of-PkgConfig-targets-for-glib.patch'
         '0012-Allow-using-properties-of-PkgConfig-targets-for-Wayl.patch'
-        '0013-Allow-overriding-preference-for-shared-libzstd-libra.patch')
-sha256sums=('b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b'
-            '5337bd308d6c6342b1a61cb45a6e435d706c2eb751ab93c9118322165370809a'
-            'f1e013452ca62cccf9d17682701f67886173eb24e53b94ea0fe99a5edcb34d7a'
-            '401d9275e9832c5000dd2b410158289b0cf853319da1a5ee97130598e28c0599'
-            '404dc4efb1bdbdcaee2f0f8d561edf1b55a1050fab8e9a80c8eaf1c8aa816be2'
-            'bfae4a5fb06153204e2b731ade3f169a6f4b5b44769f7b7cd420cf9d492ff830'
-            '6bbf063870a45dd58be5ec849195b553ce8697985cca8441c18e5baccf67d449'
-            '843b63b105767bf26c3d2e0fb65d4a9021aae598b7fbae8f501e848551e6bc6c'
-            'a9c705a909876e20e0da2bf1137020b509e59fa25bb759831ce23f9b46576ffb'
-            '6935ba318b0af86c40fca397e84046d004a23422b0c74187808133e5b1539b8c'
-            'ba9fb48fb7ddeaa665e81136fa33377ba4fbf1efeb787c229cb091c33c1b31c6'
-            '6fd11b4bdd602f0b17cc75f8fc0e999119d2606e16e6ebca5804865a4094c55c'
-            'a589ff90a9be1c4b973e632f4b7419505a89406221a32c432aa9e72d59c8ef8f'
-            '70f35a369aa9ee3d5b69ed036ee1091efc4535d727f6d05dd5737d2b81efe707')
+        '0013-Allow-overriding-preference-for-shared-libzstd-libra.patch'
+        '0014-Fix-errors-due-to-disabled-exceptions-with-cpp_winrt.patch'
+        '0015-Fix-setting-exception-flags-of-plugin-targets.patch'
+        '0016-Link-corelib-correctly-against-runtimeobject-when-co.patch'
+        '0017-Workaround-linker-error-about-missing-symbol-__sync_.patch')
+sha256sums=('0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462'
+            '4436fa3cb4ae8042d4e7420dd69aff5e7ee90eab623b55290dadb4347f3af562'
+            '5535db09b73284474eaf13181f52f52d67acad39f9fdc3a4cbd9938354e431b5'
+            'c4dd118f2670f526d1a294e00db91e3bc8e3fc733ece40f3d42e14f4210c9d9e'
+            '9e4e0cffecb7718c76f6f1f5d1d73bfddb630339ebb71e1fe947b0abe1cd9696'
+            '2365407788639c006c03b0c9ab524c1335a4175623e92d537b6e134b5b78793d'
+            '9de86821cb75a0c7f6ffd26188a58347d4982497460aa1940ae7c6fd19a05e11'
+            '721c32de68daca63ee2440218da7f998d052cf5122f0266ce18dc9fcf979d743'
+            'e8540d9b2b06a149668e389d8713a5e5d70a6728a01f7678fec36091f10d57a1'
+            '25aaadd7ea30f4fc2d75f3bcb8dcb0a82e1fed23c7c34fa1deb7369032f9e24e'
+            '7f1d483ab4b229c60a0658c6da18fb82619e0d8696ad5010de40748ce0b15b85'
+            'e61047f9f167c9229978895cd19cb7cbd722620fb600d48f63dcc8f727b79b09'
+            'e2811f2f857bf09572622cfec907bf738f3fdca1da9d83acd6cbaa62aa12ec85'
+            '4b3a18cb211bdbdefda2ac34e97d16bc989e969ab77983cfcef8a75e06366504'
+            'd3a02fb4fe241187ce9dd91123e661cde1e6ccdb098c26a9f7a2209b20074c89'
+            '3652e0a71c16c2d7ec249f349cd38374d32b0f87401b4ef3e2f583e0e290ec78'
+            '022dbdf8b2e89bb4ec80311807aaae46cb52896dd89ecb212adc5c7b7ab59be6'
+            '1497d88387d761da233588b024cdb46e7f02b4a7a3efcc9508317fd4571e008c')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
@@ -74,7 +82,17 @@ prepare () {
 build() {
   for _arch in ${_architectures}; do
     export PKG_CONFIG=/usr/bin/$_arch-pkg-config
+
+    local _enable_winrt_support=ON
+    if [[ ! -e /usr/${_arch}/include/winrt/Windows.Foundation.h ]]; then
+      echo "cppwinrt headers seem incomplete, disabling FEATURE_cpp_winrt"
+      _enable_winrt_support=OFF
+    fi
+
     $_arch-cmake -G Ninja -B build-$_arch -S $_pkgfqn \
+      -DCMAKE_CXX_STANDARD=20 \
+      -DCMAKE_CXX_FLAGS="$CXX_FLAGS -std=c++20" \
+      -DFEATURE_cpp_winrt=$_enable_winrt_support \
       -DFEATURE_pkg_config=ON \
       -DFEATURE_system_pcre2=ON \
       -DFEATURE_system_freetype=ON \
diff --git a/qtbase-sha256.txt b/qtbase-sha256.txt
index b337cdee0bf6..21b56735a692 100644
--- a/qtbase-sha256.txt
+++ b/qtbase-sha256.txt
@@ -1 +1 @@
-b89b426b9852a17d3e96230ab0871346574d635c7914480a2a27f98ff942677b
+0493fd0b380c4edf8872f011a7f26d245aa4cdd75b349904ef340a22dedf7462