Update KDE fork version, cherry-pick 8797332

35 files changed, 225 insertions, 165 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9dad242353e..17b77b3dc3d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mingw-w64-qt5-base-static
 	pkgdesc = A cross-platform application and UI framework, native OpenGL backend (mingw-w64)
-	pkgver = 5.15.3+kde+r133
+	pkgver = 5.15.3+kde+r145
 	pkgrel = 1
 	url = https://www.qt.io/
 	arch = any
@@ -33,7 +33,7 @@ pkgbase = mingw-w64-qt5-base-static
 	options = !buildflags
 	options = staticlibs
 	options = !emptydirs
-	source = git+https://invent.kde.org/qt/qt/qtbase#commit=e68ca8e51375d963b2391715f70b42707992dbd8
+	source = git+https://invent.kde.org/qt/qt/qtbase#commit=cfa044e74c4f3be46fe2f177d022af3321766b1f
 	source = 0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
 	source = 0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
 	source = 0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -66,38 +66,40 @@ pkgbase = mingw-w64-qt5-base-static
 	source = 0030-Fix-linking-against-static-plugins-with-qmake.patch
 	source = 0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
 	source = 0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
+	source = 0033-Handle-even-more-include-in-enum-cases.patch
 	sha256sums = SKIP
-	sha256sums = afba71c5989978f286179a49607976a35237496d86ac89be8757c899a40d537e
-	sha256sums = b030be6a881a7e1398676079581b7aa72d439989eb1f19092630c43ce0ea95d5
-	sha256sums = 8f964778a3c1d88643e9264e883b8733a8c7b0f4b02cf939e90fdf68842caa98
-	sha256sums = 2bed971bda26f4f0dfec4cce6e3ced11c47b310de50672f68a0dda287a588849
-	sha256sums = dfb2dff89fd4e40622212f042165156fa3ed2d469b6531f942199de33caad14f
-	sha256sums = a12a73536da03752abbdb30d4a9cc969ff428e9e3152980cd021640f905ce03b
-	sha256sums = 254f0b967ba8084880542dcd27b7fb641d36969006d1f5f0da9d54e1969b30a1
-	sha256sums = b8806f862bce296d55da97cb3273f6a7dcb92e7d1266b9610f88b994e1a3ad25
-	sha256sums = 6eb966cfeb80b5170fbd36e51f968a86d89dff532d1bef9daccbcf720b0474f2
-	sha256sums = 9da382aca0cf299d1f736c1adff9033706e4047be419264c6b9ae78370a04756
-	sha256sums = 7c8a923aa2bf5600c0f2993e4e869dab663f3dd2ab27c15035310c06661e4aed
-	sha256sums = ee873b1f6a6e543cb288b39f135b6450f861f5ebcc8b4a7d367ea1bdb197170a
-	sha256sums = b4ca4c64daf48cd1a7ca9d55e91d53294b719c50dd392ba84e0bdc1a8acc597f
-	sha256sums = 8f840fb187612cb28a94bd4a8083c83e29a42b2731e28f8686dcb37411cc69a9
-	sha256sums = 867e7ad44c2aac86f858d973a7af6514385a4f50d200f4259b30d470a3551b35
-	sha256sums = 13443e40d4a470219a2f6dc2dedcd988dd481ebe724f74fb5f1e7fa4fbe29e6e
-	sha256sums = 47b0f93c86108c03641efbdd97b54809a4ac0b575b86f27b7c6217e87320cda3
-	sha256sums = fcac1dd8349e98b20ac4041856fd1d22c56326697fae5ab53e1823caeba10b01
-	sha256sums = d4a31f994dbc39c9267bd2378f10212a5606a78d60956218349a4dc0faa4f215
-	sha256sums = 03dc0efe46cc96984c971e0e744bbf32cadc9fa65a58a9d6435f0ed59169409d
-	sha256sums = d1432fe90e63616e898d7f0c541fe28588101230ca3fe2e20da39365967a64f4
-	sha256sums = d9b68a39699e83674738d507bbe35290893085c8cee5f947ba74d3ef8eaa0a36
-	sha256sums = 6711df068cc141a72ec9a9d1d8d7afa0f718c2fe9799523d03ce47d1574efad0
-	sha256sums = ea2d56b4f2eebd9a83c13706f9e4e37dfe4ba92af76195b97a81230734cbb300
-	sha256sums = b872519418f451d8196fe22182a26994fb9b81c49ad6ca151b895e23e274cc7c
-	sha256sums = 4e7f7cfd9e0ab4f7251f32c5a6cf81b05e2435172f145b5caad64a5e12487116
-	sha256sums = e69332fb658d70256ba232726db853d55372a4f45a5a5b9479a21a10fe807d67
-	sha256sums = 19c5cc4283416942f1575284357a3c3a74bc625f95aecb80d2a8dcc7d2d8c08f
-	sha256sums = b924d45463042e345630b9d54460a8547749f3fa3a3ffb7de3c4e514e92a9a9b
-	sha256sums = 97657b673e434befb42ccb1c153d1094a6d1c23044eb7725aea3a64aaf2ec5b1
-	sha256sums = 562da92bdb7bf27dd44c2ae4f45381668fc80f1e8a0241b8c039c7e2884cfbae
-	sha256sums = 6cd22e4e73ecf402af473859aaedcb4ec62173605a2e4127d72ef73c6882b323
+	sha256sums = c46cc0408f60117c0299ac25c6ada46b54ad48ae6063450609cd650d54b461b9
+	sha256sums = 1c47cf77b1dfe57487b1ad6364ad3e1ad3e67184598bf356fff25ac3847816cd
+	sha256sums = fbcc353eaf380ce3c9884c1f0db94b3b19edd1c2182edf9f64d4c8190d7a426a
+	sha256sums = c8eac4f92067f75cc28cbf3344e54a76ed9783ebf663772e9c417c51a27ece3d
+	sha256sums = 334a9e7ec195e504c51a3ea697d35f62cf58c9c5e255175d9c0aaaa8cfe2b676
+	sha256sums = 38fafe0b297b5451db359b616e91c15f24a91dc8d8876ae8bfb463a4ce05715e
+	sha256sums = a525983aabb87585b76d647c0d53c1d703938dcb48601dde407bff88eb9ac2c9
+	sha256sums = daf1409342054e9464de9b329b775032d0ec94b15ea4be78457c26a184dce31c
+	sha256sums = ad395e48421dda7af1982d37b39bec4891839e7883227801547fcb559a8dee35
+	sha256sums = 189558608903e4c073777fec1f026d4cf09aec1bfd914a1e7ddbee24c36de5ad
+	sha256sums = 9cb6133a2c2a713119ce90974e968e425d634bc5e57870e3ddabbd49fec420c2
+	sha256sums = 38b6fe3c8a4aef5f8aae73edcc2ddcaf27ea6dd2509ec4f0db875a1916c92130
+	sha256sums = 4d4dcb973428232b1f3423e7369b7d252af9bfba238415ac247187073f8a19e1
+	sha256sums = dcc4168cad92fc7b12a80fdd07cfb52a446a138cea95f7fe855d988f1cee6903
+	sha256sums = 37bcaaf3b89670432ec23a5bf8b6cc76122080347aea07b98eb114dfda4247a3
+	sha256sums = 9fb4f6a4dfddd033a72e70972831e5f5b202ab07d1365eab13e628f41f8d44e5
+	sha256sums = 09487150942169445a5be1563073efaa772705c6e1c343d73419919e19e5e486
+	sha256sums = e1e80eb30a4e173eb2a73ab48dde1a8199bf5ac3bd627d888bf2eec9bdcb6785
+	sha256sums = 5599de2decb0004f64ca8ee9972513cdddd58c990a5d5e555acf68400a4db67c
+	sha256sums = b3ce6af7a2315768b647eb482e40c902a4ffd889955dd3fcdd369bb37b15de20
+	sha256sums = 9273a07e25232570adf63543274dc288a0cb9e43307511b9d18b9aa63588cf0d
+	sha256sums = 6642e40e992b5e3449a7a434f20a278cc747894f808ec488b451a29dc8bafeee
+	sha256sums = d049f1a9cb7729cfcb57e0fd306b440abf1119f21799db43473c90ab67935bd9
+	sha256sums = a92ce41ecb6efcdb44b798f8330c4278b8265ff515b5104d673b90c48a149758
+	sha256sums = 58ef2e17a968a5e6339d6ef367f7e63ce87ca179632f5ea89f87243d72d741ad
+	sha256sums = 92c898660785efc23269ba5ed8120bd5b03ec0ac61bda34cc85affdd6288fa2f
+	sha256sums = 6376fed98be25792d6fb1b0f3f4d1bb1d7e87e9a930b20eca243ae423260487e
+	sha256sums = aefec02f32f33a2e5972f32ce525773486b1f7d7e9f7d2f8155110e9ac885238
+	sha256sums = 66093629e17c87474e0138ff7a5c07a22d342dda253f9937a62f633bb60db9fa
+	sha256sums = 507af447d79665d653d08cec57ca4c5045ce07cfad06663c8aa43c7d286f4ac8
+	sha256sums = 3593448edd09d55125b144a1d7cfad8fe0397d5a1c3920541e21adbd3ded01d4
+	sha256sums = 49382f3f487d14743271c96c9c061b083787d74e9f4080451a28e4c9d4106d62
+	sha256sums = 107badd0a0703a1df0484b0f96ae08ffa92279e2e513803b1f8170a99fb76cd1
 
 pkgname = mingw-w64-qt5-base-static
diff --git a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
index c953a2dfd8c9..6ff17d12c545 100644
--- a/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@@ -1,7 +1,7 @@
-From 07e6639a6c703155baeb18fef4924289ad635746 Mon Sep 17 00:00:00 2001
+From 59ea6c2ee1a18c4ba751873837c28d773c16e2cb Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
-Subject: [PATCH 01/32] Adjust win32-g++ profile for cross compilation with
+Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
  mingw-w64
 
 Adding a new, separate mkspec instead of patching the existing one
@@ -162,5 +162,5 @@ index 5de482f23b..3c3d22c699 100644
  
  QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.35.1
+2.36.0
 
diff --git a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
index f4d6020c5e17..bd0f18a3dfa6 100644
--- a/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -1,7 +1,7 @@
-From b0451c4c8ab8e1640172658d2dd70c142680fa8a Mon Sep 17 00:00:00 2001
+From 94948750f287ca19ca97d14f622222969fc585c7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
-Subject: [PATCH 02/32] Ensure GLdouble is defined when using dynamic OpenGL
+Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
 
 FIXME: Not sure whether this is still required
 ---
@@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
  #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
  #include <stdio.h>
 -- 
-2.35.1
+2.36.0
 
diff --git a/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
index 603c535a3344..1564ad7faddd 100644
--- a/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -1,7 +1,7 @@
-From 148b5050b73fb0b90d18662731c0da7e83dc51df Mon Sep 17 00:00:00 2001
+From 1aa8355f0c9b6ffd82f2659d534a08e51f6e9a89 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
-Subject: [PATCH 03/32] Fix too many sections assemler error in OpenGL factory
+Subject: [PATCH 03/33] Fix too many sections assemler error in OpenGL factory
 
 On x86_64 qopenglversionfunctionsfactory.o exceeds the
 limit of 32768 sections.
@@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
      HEADERS += opengl/qopengl.h \
                 opengl/qopengl_p.h \
 -- 
-2.35.1
+2.36.0
 
diff --git a/0004-Make-sure-.pc-files-are-installed-correctly.patch b/0004-Make-sure-.pc-files-are-installed-correctly.patch
index ad9f53a5cee0..08c7acd8bc05 100644
--- a/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/0004-Make-sure-.pc-files-are-installed-correctly.patch
@@ -1,7 +1,7 @@
-From 868525161830dfdb98ad2ae9b8a01b7778b3d133 Mon Sep 17 00:00:00 2001
+From 929fc955a5bf89d34f20d00167020977e4764364 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 04/32] Make sure *.pc files are installed correctly
+Subject: [PATCH 04/33] Make sure *.pc files are installed correctly
 
 ---
  qmake/generators/makefile.cpp          | 8 ++++++--
@@ -62,5 +62,5 @@ index 5e446bd7e2..183cef2908 100644
                      uninst.append("\n\t");
                  uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.35.1
+2.36.0
 
diff --git a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
index 6b0badb1f29e..5436bbc94780 100644
--- a/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -1,7 +1,7 @@
-From c9293396ea6dad4f014c03d2b1e187e5027cb013 Mon Sep 17 00:00:00 2001
+From b7cec595cded4ec614a5f1287d341320c98af56f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 05/32] Don't add resource files to LIBS parameter
+Subject: [PATCH 05/33] Don't add resource files to LIBS parameter
 
 Solves an issue where the generated pkg-config
 files contained invalid Libs.private references
@@ -24,5 +24,5 @@ index ee9a41838b..8d1dcae85b 100644
      if (project->isActiveConfig("dll")) {
          QString destDir = "";
 -- 
-2.35.1
+2.36.0
 
diff --git a/0006-Prevent-debug-library-names-in-pkg-config-files.patch b/0006-Prevent-debug-library-names-in-pkg-config-files.patch
index 2e321aea5380..25d4312c3a4f 100644
--- a/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,7 +1,7 @@
-From 8a31b70973aed143bc85bcace439a626f3dac7ac Mon Sep 17 00:00:00 2001
+From f81842796ab5b0d0046c61b9b96bc669133938ba Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 06/32] Prevent debug library names in pkg-config files
+Subject: [PATCH 06/33] Prevent debug library names in pkg-config files
 
 qmake generates the pkgconfig .pc files two times, once for the
 release build and once for the debug build (which we're not actually
@@ -29,5 +29,5 @@ index a33017e19d..62a06d3560 100644
      QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
      if(!subdir.isEmpty()) {
 -- 
-2.35.1
+2.36.0
 
diff --git a/0007-Fix-linking-against-shared-static-libpng.patch b/0007-Fix-linking-against-shared-static-libpng.patch
index ea40917b575b..d997fb3470dc 100644
--- a/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/0007-Fix-linking-against-shared-static-libpng.patch
@@ -1,7 +1,7 @@
-From 1ce5d69a238d74fdaa042060b75d2b35e94c5e8c Mon Sep 17 00:00:00 2001
+From b20bb5f49da689f26b54790036f55f18844f0ae1 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
-Subject: [PATCH 07/32] Fix linking against shared/static libpng
+Subject: [PATCH 07/33] Fix linking against shared/static libpng
 
 Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
@@ -26,5 +26,5 @@ index 12c95742d2..e0043542ec 100644
              ],
              "use": [
 -- 
-2.35.1
+2.36.0
 
diff --git a/0008-Fix-linking-against-static-D-Bus.patch b/0008-Fix-linking-against-static-D-Bus.patch
index e974aeb99f86..4d8a9bab55e4 100644
--- a/0008-Fix-linking-against-static-D-Bus.patch
+++ b/0008-Fix-linking-against-static-D-Bus.patch
@@ -1,7 +1,7 @@
-From f96c7e9b07643459104d381d3de77170ed5c10ba Mon Sep 17 00:00:00 2001
+From 244bb705e1fc73c97735625af799ed097e8ac3ef Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
-Subject: [PATCH 08/32] Fix linking against static D-Bus
+Subject: [PATCH 08/33] Fix linking against static D-Bus
 
 ---
  configure.json             | 9 +++++++--
@@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644
  #  include <dbus/dbus.h>
  #else
 -- 
-2.35.1
+2.36.0
 
diff --git a/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
index 4de8bfdf7869..e20d348932d4 100644
--- a/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@@ -1,7 +1,7 @@
-From 57b2037ddf96f1254bc8c8e239bfeddd0383c916 Mon Sep 17 00:00:00 2001
+From 17a9b70f3cda06ce586f048105ae03c11b68984a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
-Subject: [PATCH 09/32] Don't try to use debug version of D-Bus library
+Subject: [PATCH 09/33] Don't try to use debug version of D-Bus library
 
 Required for a debug build of Qt because mingw-w64-dbus
 does not contain debug version
@@ -25,5 +25,5 @@ index fedc80fa18..e308b5b7d7 100644
                      },
                      "condition": "config.win32 && features.shared"
 -- 
-2.35.1
+2.36.0
 
diff --git a/0010-Fix-linking-against-static-freetype2.patch b/0010-Fix-linking-against-static-freetype2.patch
index f8118c170486..d712773a811a 100644
--- a/0010-Fix-linking-against-static-freetype2.patch
+++ b/0010-Fix-linking-against-static-freetype2.patch
@@ -1,7 +1,7 @@
-From b53ca6006f70650ccb5d9c7565c4d784d859241e Mon Sep 17 00:00:00 2001
+From a8adb53041a621c15dc8afc05caae8e74fe584b9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 10/32] Fix linking against static freetype2
+Subject: [PATCH 10/33] Fix linking against static freetype2
 
 Change-Id: I6e4a2baa25beb5f63b46f25153bd7bac52a2262f
 ---
@@ -26,5 +26,5 @@ index e0043542ec..2fe0a018b1 100644
                  { "libs": "-lfreetype" }
              ],
 -- 
-2.35.1
+2.36.0
 
diff --git a/0011-Fix-linking-against-static-harfbuzz.patch b/0011-Fix-linking-against-static-harfbuzz.patch
index 1b52479fa98a..2a9a797d835c 100644
--- a/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/0011-Fix-linking-against-static-harfbuzz.patch
@@ -1,7 +1,7 @@
-From 51095c685e065d60263c3ee14b29f3e13ce4659a Mon Sep 17 00:00:00 2001
+From d696e88f2594d6160e7771c386a35f9b1e5315d3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
-Subject: [PATCH 11/32] Fix linking against static harfbuzz
+Subject: [PATCH 11/33] Fix linking against static harfbuzz
 
 ---
  src/gui/configure.json | 6 +++++-
@@ -25,5 +25,5 @@ index 2fe0a018b1..ceeee23164 100644
          },
          "imf": {
 -- 
-2.35.1
+2.36.0
 
diff --git a/0012-Fix-linking-against-static-pcre.patch b/0012-Fix-linking-against-static-pcre.patch
index be6f4e851582..6cff09ce79d4 100644
--- a/0012-Fix-linking-against-static-pcre.patch
+++ b/0012-Fix-linking-against-static-pcre.patch
@@ -1,7 +1,7 @@
-From 462fdd6b868c3c0be6f499b62701d1b71e44e29a Mon Sep 17 00:00:00 2001
+From 4e4a508bd51e30309a495a25a5396db92af87d7d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
-Subject: [PATCH 12/32] Fix linking against static pcre
+Subject: [PATCH 12/33] Fix linking against static pcre
 
 Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 ---
@@ -24,5 +24,5 @@ index d7e3cc5ee2..e17c19fbae 100644
  #include <pcre2.h>
  
 -- 
-2.35.1
+2.36.0
 
diff --git a/0013-Fix-linking-against-shared-static-MariaDB.patch b/0013-Fix-linking-against-shared-static-MariaDB.patch
index 53a92c3e7cef..b94a3a0ff6fd 100644
--- a/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/0013-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,7 +1,7 @@
-From 5bb1a2aa7ac776317f9dd0d2a7ef2d9da1ae731e Mon Sep 17 00:00:00 2001
+From 6a03907710bce50318cd80e233f0e2f54f1f394d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 13/32] Fix linking against shared/static MariaDB
+Subject: [PATCH 13/33] Fix linking against shared/static MariaDB
 
 Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 ---
@@ -22,5 +22,5 @@ index 28ccbeadcd..7262914c64 100644
                  { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                  { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.35.1
+2.36.0
 
diff --git a/0014-Fix-linking-against-shared-static-PostgreSQL.patch b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
index 1fe975e24cc0..57a8691b5da9 100644
--- a/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,7 +1,7 @@
-From 6658c3e842f014e945b4a92f8f07d161a00fc245 Mon Sep 17 00:00:00 2001
+From f537a2f238904e6f61953f1d2e89b03dab9db61e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
-Subject: [PATCH 14/32] Fix linking against shared/static PostgreSQL
+Subject: [PATCH 14/33] Fix linking against shared/static PostgreSQL
 
 ---
  src/plugins/sqldrivers/configure.json | 4 ++--
@@ -24,5 +24,5 @@ index 7262914c64..852ba558be 100644
              ]
          },
 -- 
-2.35.1
+2.36.0
 
diff --git a/0015-Rename-qtmain-to-qt5main.patch b/0015-Rename-qtmain-to-qt5main.patch
index e377df967ce9..71004c944bef 100644
--- a/0015-Rename-qtmain-to-qt5main.patch
+++ b/0015-Rename-qtmain-to-qt5main.patch
@@ -1,7 +1,7 @@
-From 41922a8bda8c15d44ebe8e3cb7fa36f3da8d2679 Mon Sep 17 00:00:00 2001
+From ddc0494d7eedd5b2d9e81f13e87f409ccb32e0b2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 15/32] Rename qtmain to qt5main
+Subject: [PATCH 15/33] Rename qtmain to qt5main
 
 Prevents conflict with mingw-w64-qt4 package
 ---
@@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
  
  CONFIG += static
 -- 
-2.35.1
+2.36.0
 
diff --git a/0016-Enable-rpath-for-build-tools.patch b/0016-Enable-rpath-for-build-tools.patch
index ecbf2830d5e6..05f176cf68cf 100644
--- a/0016-Enable-rpath-for-build-tools.patch
+++ b/0016-Enable-rpath-for-build-tools.patch
@@ -1,7 +1,7 @@
-From d5903df4fe71a8dda22742452f8c2ba0e8ce0919 Mon Sep 17 00:00:00 2001
+From 36f1d2408585cb82ee53f06c7c3fd745ee5e9ff8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
-Subject: [PATCH 16/32] Enable rpath for build tools
+Subject: [PATCH 16/33] Enable rpath for build tools
 
 - Required because various tools depend on libQt5Bootstrap.so which resides
   in folder /usr/${_arch}/lib
@@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
  INSTALLS += target
  
 -- 
-2.35.1
+2.36.0
 
diff --git a/0017-Use-system-zlib-for-build-tools.patch b/0017-Use-system-zlib-for-build-tools.patch
index d5b45117dd1c..9405bb3cc8e5 100644
--- a/0017-Use-system-zlib-for-build-tools.patch
+++ b/0017-Use-system-zlib-for-build-tools.patch
@@ -1,7 +1,7 @@
-From 7da85c7ad051f9d5db2081e3ea33e774e8c4d854 Mon Sep 17 00:00:00 2001
+From f60e40d4df1492d9349105c24abe6d5331afbd1d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
-Subject: [PATCH 17/32] Use system zlib for build tools
+Subject: [PATCH 17/33] Use system zlib for build tools
 
 ---
  src/tools/bootstrap/bootstrap.pro | 4 +++-
@@ -23,5 +23,5 @@ index 24862a07db..698e6cfb95 100644
  } else {
      CONFIG += no_core_dep
 -- 
-2.35.1
+2.36.0
 
diff --git a/0018-Merge-shared-and-static-library-trees.patch b/0018-Merge-shared-and-static-library-trees.patch
index b332e6a684d5..d37829b7e89b 100644
--- a/0018-Merge-shared-and-static-library-trees.patch
+++ b/0018-Merge-shared-and-static-library-trees.patch
@@ -1,7 +1,7 @@
-From 4316cdf19818e71fb41d307af5f6ba0b06bb0fe8 Mon Sep 17 00:00:00 2001
+From ccf5a8a0183be1864d8d1b1be321d4671381b60c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 18/32] Merge shared and static library trees
+Subject: [PATCH 18/33] Merge shared and static library trees
 
 Allow installation of shared and static build in the same prefix
 
@@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
  mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
  INSTALLS += mkspecs
 -- 
-2.35.1
+2.36.0
 
diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch
index a381b2c8b6d8..e0fefea39801 100644
--- a/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/0019-Use-.dll.a-as-import-lib-extension.patch
@@ -1,7 +1,7 @@
-From d3e4d0719bd0aafe543fb6997eeb4152c8fec6e0 Mon Sep 17 00:00:00 2001
+From 80a21a21aac613d66d5f25edaeebddbd944d6a8f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 19/32] Use *.dll.a as import lib extension
+Subject: [PATCH 19/33] Use *.dll.a as import lib extension
 
 The variables used here are provided by
 g++-win32.conf
@@ -94,5 +94,5 @@ index 183cef2908..03732df4a8 100644
                  + project->first("QMAKE_EXTENSION_SHLIB"));
          project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.35.1
+2.36.0
 
diff --git a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
index b7081c8b80a4..596c22d60324 100644
--- a/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@@ -1,7 +1,7 @@
-From 892dcb09da7c69d03be98e4fa3aaf4ceb531e306 Mon Sep 17 00:00:00 2001
+From 8dbcef883d3048562be9ea1f9c80d9db62a0646b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
-Subject: [PATCH 20/32] Pull dependencies of static libraries in CMake modules
+Subject: [PATCH 20/33] Pull dependencies of static libraries in CMake modules
 
 When doing a static build of Qt, the dependencies of the Qt
 libraries and plugins itself must be specified when linking
@@ -501,5 +501,5 @@ index b550a52c60..acbe1cc33b 100644
 +endif()
 \ No newline at end of file
 -- 
-2.35.1
+2.36.0
 
diff --git a/0021-Allow-usage-of-static-version-with-CMake.patch b/0021-Allow-usage-of-static-version-with-CMake.patch
index 374875facbca..3d90b7849415 100644
--- a/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/0021-Allow-usage-of-static-version-with-CMake.patch
@@ -1,7 +1,7 @@
-From 95ce669b134f215030dfc1a20c037dc32a777ea6 Mon Sep 17 00:00:00 2001
+From 556553e661d8b1daf08f372dfb63b2d49fd95cf2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
-Subject: [PATCH 21/32] Allow usage of static version with CMake
+Subject: [PATCH 21/33] Allow usage of static version with CMake
 
 Allow selecting between dynamic and static Qt versions
 installed in the same prefix
@@ -1091,5 +1091,5 @@ index 2a575958ae..ca0e3be3b5 100644
      INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
  )
 -- 
-2.35.1
+2.36.0
 
diff --git a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
index 63cca7885a22..e5e87ce153b4 100644
--- a/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@@ -1,7 +1,7 @@
-From dd92ac8d02f789464af310afeec97e185bcc33cf Mon Sep 17 00:00:00 2001
+From b503245788923091390dfa4bcd86565cbfd45c5e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
-Subject: [PATCH 22/32] Adjust linker flags for static build with
+Subject: [PATCH 22/33] Adjust linker flags for static build with
  cmake/mingw-w64
 
 It is not clear anymore where I picked that change up and for
@@ -27,5 +27,5 @@ index 9da1361c95..5e802dea4c 100644
 +set_target_properties(${IMPORTED_TARGET_NAME} PROPERTIES \"INTERFACE_LINK_LIBRARIES\" \"$<${_isExe}:-static;ws2_32>\")
 +unset(_isExe)
 -- 
-2.35.1
+2.36.0
 
diff --git a/0023-Use-correct-pkg-config-static-flag.patch b/0023-Use-correct-pkg-config-static-flag.patch
index d53bf6c3fb1e..e4998ee73c24 100644
--- a/0023-Use-correct-pkg-config-static-flag.patch
+++ b/0023-Use-correct-pkg-config-static-flag.patch
@@ -1,7 +1,7 @@
-From 8a1d0975d053a9ed231bf936418135224a546192 Mon Sep 17 00:00:00 2001
+From 6c1c4abc454552ff9938a5846d49f7a5e1204e8b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
-Subject: [PATCH 23/32] Use correct pkg-config --static flag
+Subject: [PATCH 23/33] Use correct pkg-config --static flag
 
 ---
  configure.pri | 3 +++
@@ -22,5 +22,5 @@ index 53c67f885b..8934b72291 100644
      $$qtConfEvaluate("features.cross_compile") {
          # cross compiling, check that pkg-config is set up sanely
 -- 
-2.35.1
+2.36.0
 
diff --git a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
index 3b87fdc65187..cc052d242b85 100644
--- a/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,7 +1,7 @@
-From 984c35e68ef3b5fc17a31d3019b675d2564fe83b Mon Sep 17 00:00:00 2001
+From a7a3500fa02896d109e774ce50fe4c3386d54a6b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
-Subject: [PATCH 24/32] Fix macro invoking moc, rcc and uic
+Subject: [PATCH 24/33] Fix macro invoking moc, rcc and uic
 
 * Otherwise the arguments aren't passed correctly leading to errors like
   ```
@@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644
            MAIN_DEPENDENCY ${infile} VERBATIM)
          set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
 -- 
-2.35.1
+2.36.0
 
diff --git a/0025-Ignore-errors-about-missing-feature-static.patch b/0025-Ignore-errors-about-missing-feature-static.patch
index 210dfb7c102a..032d33ef458f 100644
--- a/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/0025-Ignore-errors-about-missing-feature-static.patch
@@ -1,7 +1,7 @@
-From ebcf54083cb5a425e06d3a266ea9464db61137ea Mon Sep 17 00:00:00 2001
+From 38fa787362ec25f1f3602311e444a07b6273cd52 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
-Subject: [PATCH 25/32] Ignore errors about missing feature static
+Subject: [PATCH 25/33] Ignore errors about missing feature static
 
 Not sure why this error occurs, let's hope for the best
 ---
@@ -32,5 +32,5 @@ index 7777e615bd..5f30366660 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
  }
 -- 
-2.35.1
+2.36.0
 
diff --git a/0026-Enable-and-fix-use-of-iconv.patch b/0026-Enable-and-fix-use-of-iconv.patch
index ac06309dff3e..31ae6f5723aa 100644
--- a/0026-Enable-and-fix-use-of-iconv.patch
+++ b/0026-Enable-and-fix-use-of-iconv.patch
@@ -1,7 +1,7 @@
-From 80e1027686310de70fff6a5d8065404857b8e795 Mon Sep 17 00:00:00 2001
+From 2b2bcb4baae3a98427fee0134da14c7a43af7f44 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
-Subject: [PATCH 26/32] Enable and fix use of iconv
+Subject: [PATCH 26/33] Enable and fix use of iconv
 
 Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
 ---
@@ -74,5 +74,5 @@ index 9b5d19d41b..f649a9f6ef 100644
          },
          "icu": {
 -- 
-2.35.1
+2.36.0
 
diff --git a/0027-Ignore-failing-pkg-config-test.patch b/0027-Ignore-failing-pkg-config-test.patch
index e8ed0fb039ea..0d5b217b1ebe 100644
--- a/0027-Ignore-failing-pkg-config-test.patch
+++ b/0027-Ignore-failing-pkg-config-test.patch
@@ -1,7 +1,7 @@
-From b77702d4a42fe2c17c4ad4e4b3d084e33df33c97 Mon Sep 17 00:00:00 2001
+From 4bbf5b08f1dcae784078d7d4bc6f96adbd7d3446 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
-Subject: [PATCH 27/32] Ignore failing pkg-config test
+Subject: [PATCH 27/33] Ignore failing pkg-config test
 
 Didn't investigate why it fails, let's hope for the best
 ---
@@ -21,5 +21,5 @@ index e308b5b7d7..928ee2afa1 100644
                  "publicFeature",
                  { "type": "publicQtConfig", "negative": true },
 -- 
-2.35.1
+2.36.0
 
diff --git a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 39501b85ee9f..109cc29a9854 100644
--- a/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,7 +1,7 @@
-From dd7bcb78b07a7fea031f18510af5acd2646f62c1 Mon Sep 17 00:00:00 2001
+From eef20ecace32e188f1767b4ba7d6bb6f9dd58a7a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 28/32] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 28/33] Prevent qmake from messing static lib dependencies
 
 In particular, it messes resolving cyclic dependency between
 static freetype2 and harfbuzz
@@ -41,5 +41,5 @@ index 03732df4a8..602f7609f5 100644
      int libidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 -- 
-2.35.1
+2.36.0
 
diff --git a/0029-Hardcode-linker-flags-for-platform-plugins.patch b/0029-Hardcode-linker-flags-for-platform-plugins.patch
index 017836df8ab7..e543f204ead4 100644
--- a/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/0029-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,7 +1,7 @@
-From 8a556b7e428261a4061894e4303a327c3447cdf4 Mon Sep 17 00:00:00 2001
+From 71f171ff0493a0e15f58106d3db420b172e832f9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
-Subject: [PATCH 29/32] Hardcode linker flags for platform plugins
+Subject: [PATCH 29/33] Hardcode linker flags for platform plugins
 
 Otherwise incorrect order of libs leads to errors
 when building libqminimal.dll, libqoffscreen.dll,
@@ -174,5 +174,5 @@ index 50a3bb41a9..02f74650a9 100644
  include(windows.pri)
  
 -- 
-2.35.1
+2.36.0
 
diff --git a/0030-Fix-linking-against-static-plugins-with-qmake.patch b/0030-Fix-linking-against-static-plugins-with-qmake.patch
index a0d5bc07da1c..8cd19a06c02e 100644
--- a/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/0030-Fix-linking-against-static-plugins-with-qmake.patch
@@ -1,7 +1,7 @@
-From a6da51cc47652a4dbc5d398304775221246a407b Mon Sep 17 00:00:00 2001
+From eecb8c2d469dc85d58a9ccd02e05183209e74cd0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
-Subject: [PATCH 30/32] Fix linking against static plugins with qmake
+Subject: [PATCH 30/33] Fix linking against static plugins with qmake
 
 Required because qtConfig(static) does not work
 with 'Merge shared and static library trees'
@@ -33,5 +33,5 @@ index b79b324b88..6a03b7a74b 100644
          # Check if the plugin is known to Qt. We can use this to determine
          # the plugin path. Unknown plugins must rely on the default link path.
 -- 
-2.35.1
+2.36.0
 
diff --git a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
index ba36aac8b3f0..7e552c6be6bb 100644
--- a/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@@ -1,7 +1,7 @@
-From 3af5d47c2bde5b60b7170b417907e47bbb9f50c8 Mon Sep 17 00:00:00 2001
+From 4a4ad45a243a2f050d1c70e5a0d750ec97a84a7b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 24 Jun 2019 13:51:02 +0200
-Subject: [PATCH 31/32] Prevent 'Cannot find feature windows_vulkan_sdk'
+Subject: [PATCH 31/33] Prevent 'Cannot find feature windows_vulkan_sdk'
 
 See https://bugreports.qt.io/browse/QTBUG-76660
 ---
@@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644
      LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
      for (nu, LD_USES) {
 -- 
-2.35.1
+2.36.0
 
diff --git a/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch b/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
index 387c8f726377..9bc4f38976ad 100644
--- a/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
@@ -1,7 +1,7 @@
-From 89dca3f775b1d5c8b3c1ffb9ec47ea7600bb330d Mon Sep 17 00:00:00 2001
+From 37253c5b055d9a28d3cf08019fa156b86714ce18 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 Jun 2021 22:24:12 +0200
-Subject: [PATCH 32/32] Fix crashes in rasterization code using setjmp
+Subject: [PATCH 32/33] Fix crashes in rasterization code using setjmp
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -244,5 +244,5 @@ index 7b16e8c211..38f03b73d8 100644
          "Description": "FreeType is a freely available software library to render fonts.",
          "Homepage": "http://www.freetype.org",
 -- 
-2.35.1
+2.36.0
 
diff --git a/0033-Handle-even-more-include-in-enum-cases.patch b/0033-Handle-even-more-include-in-enum-cases.patch
new file mode 100644
index 000000000000..a029a3730f75
--- /dev/null
+++ b/0033-Handle-even-more-include-in-enum-cases.patch
@@ -0,0 +1,56 @@
+From a785d0d6b84ccbe0e74d7846076ba6df7d250dd8 Mon Sep 17 00:00:00 2001
+From: Fabian Kosmale <fabian.kosmale@qt.io>
+Date: Tue, 3 Aug 2021 16:23:25 +0200
+Subject: [PATCH 33/33] Handle even more include in enum cases
+
+The solution in d3ed7dac8aa2f4ede0c409254b9dd44842086be0 was needlessly
+complicated, and broke a valid use case.
+The issue of no identifier being available to parse after the include
+has been processed can instead be solved by moving the test for the
+closing brace after the include processing.
+
+Fixes: QTBUG-94790
+Pick-to: 6.2 6.1 5.15
+Change-Id: Ieec4b89e1d117637f11479e8bddc4060f93da43d
+Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
+Reviewed-by: Lars Knoll <lars.knoll@qt.io>
+---
+ src/tools/moc/moc.cpp                    | 3 +--
+ tests/auto/tools/moc/enum_with_include.h | 5 +++++
+ 2 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
+index 7389919911..28c7a43cb8 100644
+--- a/src/tools/moc/moc.cpp
++++ b/src/tools/moc/moc.cpp
+@@ -305,10 +305,9 @@ bool Moc::parseEnum(EnumDef *def)
+             return IncludeState::NoInclude;
+     };
+     do {
++        handleInclude();
+         if (lookup() == RBRACE) // accept trailing comma
+             break;
+-        if ( handleInclude() == IncludeState::IncludeEnd)
+-            continue;
+         next(IDENTIFIER);
+         def->values += lexem();
+         handleInclude();
+diff --git a/tests/auto/tools/moc/enum_with_include.h b/tests/auto/tools/moc/enum_with_include.h
+index b8abf77f12..cd53ba6a28 100644
+--- a/tests/auto/tools/moc/enum_with_include.h
++++ b/tests/auto/tools/moc/enum_with_include.h
+@@ -34,6 +34,11 @@ class Foo : public QObject {
+     enum en {
+        #include <enum_inc.h>
+     };
++
++    enum class en2 {
++       #include <enum_inc.h>
++       reference = 42
++    };
+     Q_OBJECT
+ };
+ #endif
+-- 
+2.36.0
+
diff --git a/PKGBUILD b/PKGBUILD
index aa6dfd642a23..f0df11e065c2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,10 +17,10 @@
 
 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base-static
-pkgver=5.15.3+kde+r133
+pkgver=5.15.3+kde+r145
 pkgrel=1
 _basever=${pkgver%%+*}
-_commit=e68ca8e51375d963b2391715f70b42707992dbd8
+_commit=cfa044e74c4f3be46fe2f177d022af3321766b1f
 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
 arch=('any')
 url='https://www.qt.io/'
@@ -69,40 +69,42 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
         '0029-Hardcode-linker-flags-for-platform-plugins.patch'
         '0030-Fix-linking-against-static-plugins-with-qmake.patch'
         '0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch'
-        '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch')
+        '0032-Fix-crashes-in-rasterization-code-using-setjmp.patch'
+        '0033-Handle-even-more-include-in-enum-cases.patch')
 sha256sums=('SKIP'
-            'afba71c5989978f286179a49607976a35237496d86ac89be8757c899a40d537e'
-            'b030be6a881a7e1398676079581b7aa72d439989eb1f19092630c43ce0ea95d5'
-            '8f964778a3c1d88643e9264e883b8733a8c7b0f4b02cf939e90fdf68842caa98'
-            '2bed971bda26f4f0dfec4cce6e3ced11c47b310de50672f68a0dda287a588849'
-            'dfb2dff89fd4e40622212f042165156fa3ed2d469b6531f942199de33caad14f'
-            'a12a73536da03752abbdb30d4a9cc969ff428e9e3152980cd021640f905ce03b'
-            '254f0b967ba8084880542dcd27b7fb641d36969006d1f5f0da9d54e1969b30a1'
-            'b8806f862bce296d55da97cb3273f6a7dcb92e7d1266b9610f88b994e1a3ad25'
-            '6eb966cfeb80b5170fbd36e51f968a86d89dff532d1bef9daccbcf720b0474f2'
-            '9da382aca0cf299d1f736c1adff9033706e4047be419264c6b9ae78370a04756'
-            '7c8a923aa2bf5600c0f2993e4e869dab663f3dd2ab27c15035310c06661e4aed'
-            'ee873b1f6a6e543cb288b39f135b6450f861f5ebcc8b4a7d367ea1bdb197170a'
-            'b4ca4c64daf48cd1a7ca9d55e91d53294b719c50dd392ba84e0bdc1a8acc597f'
-            '8f840fb187612cb28a94bd4a8083c83e29a42b2731e28f8686dcb37411cc69a9'
-            '867e7ad44c2aac86f858d973a7af6514385a4f50d200f4259b30d470a3551b35'
-            '13443e40d4a470219a2f6dc2dedcd988dd481ebe724f74fb5f1e7fa4fbe29e6e'
-            '47b0f93c86108c03641efbdd97b54809a4ac0b575b86f27b7c6217e87320cda3'
-            'fcac1dd8349e98b20ac4041856fd1d22c56326697fae5ab53e1823caeba10b01'
-            'd4a31f994dbc39c9267bd2378f10212a5606a78d60956218349a4dc0faa4f215'
-            '03dc0efe46cc96984c971e0e744bbf32cadc9fa65a58a9d6435f0ed59169409d'
-            'd1432fe90e63616e898d7f0c541fe28588101230ca3fe2e20da39365967a64f4'
-            'd9b68a39699e83674738d507bbe35290893085c8cee5f947ba74d3ef8eaa0a36'
-            '6711df068cc141a72ec9a9d1d8d7afa0f718c2fe9799523d03ce47d1574efad0'
-            'ea2d56b4f2eebd9a83c13706f9e4e37dfe4ba92af76195b97a81230734cbb300'
-            'b872519418f451d8196fe22182a26994fb9b81c49ad6ca151b895e23e274cc7c'
-            '4e7f7cfd9e0ab4f7251f32c5a6cf81b05e2435172f145b5caad64a5e12487116'
-            'e69332fb658d70256ba232726db853d55372a4f45a5a5b9479a21a10fe807d67'
-            '19c5cc4283416942f1575284357a3c3a74bc625f95aecb80d2a8dcc7d2d8c08f'
-            'b924d45463042e345630b9d54460a8547749f3fa3a3ffb7de3c4e514e92a9a9b'
-            '97657b673e434befb42ccb1c153d1094a6d1c23044eb7725aea3a64aaf2ec5b1'
-            '562da92bdb7bf27dd44c2ae4f45381668fc80f1e8a0241b8c039c7e2884cfbae'
-            '6cd22e4e73ecf402af473859aaedcb4ec62173605a2e4127d72ef73c6882b323')
+            'c46cc0408f60117c0299ac25c6ada46b54ad48ae6063450609cd650d54b461b9'
+            '1c47cf77b1dfe57487b1ad6364ad3e1ad3e67184598bf356fff25ac3847816cd'
+            'fbcc353eaf380ce3c9884c1f0db94b3b19edd1c2182edf9f64d4c8190d7a426a'
+            'c8eac4f92067f75cc28cbf3344e54a76ed9783ebf663772e9c417c51a27ece3d'
+            '334a9e7ec195e504c51a3ea697d35f62cf58c9c5e255175d9c0aaaa8cfe2b676'
+            '38fafe0b297b5451db359b616e91c15f24a91dc8d8876ae8bfb463a4ce05715e'
+            'a525983aabb87585b76d647c0d53c1d703938dcb48601dde407bff88eb9ac2c9'
+            'daf1409342054e9464de9b329b775032d0ec94b15ea4be78457c26a184dce31c'
+            'ad395e48421dda7af1982d37b39bec4891839e7883227801547fcb559a8dee35'
+            '189558608903e4c073777fec1f026d4cf09aec1bfd914a1e7ddbee24c36de5ad'
+            '9cb6133a2c2a713119ce90974e968e425d634bc5e57870e3ddabbd49fec420c2'
+            '38b6fe3c8a4aef5f8aae73edcc2ddcaf27ea6dd2509ec4f0db875a1916c92130'
+            '4d4dcb973428232b1f3423e7369b7d252af9bfba238415ac247187073f8a19e1'
+            'dcc4168cad92fc7b12a80fdd07cfb52a446a138cea95f7fe855d988f1cee6903'
+            '37bcaaf3b89670432ec23a5bf8b6cc76122080347aea07b98eb114dfda4247a3'
+            '9fb4f6a4dfddd033a72e70972831e5f5b202ab07d1365eab13e628f41f8d44e5'
+            '09487150942169445a5be1563073efaa772705c6e1c343d73419919e19e5e486'
+            'e1e80eb30a4e173eb2a73ab48dde1a8199bf5ac3bd627d888bf2eec9bdcb6785'
+            '5599de2decb0004f64ca8ee9972513cdddd58c990a5d5e555acf68400a4db67c'
+            'b3ce6af7a2315768b647eb482e40c902a4ffd889955dd3fcdd369bb37b15de20'
+            '9273a07e25232570adf63543274dc288a0cb9e43307511b9d18b9aa63588cf0d'
+            '6642e40e992b5e3449a7a434f20a278cc747894f808ec488b451a29dc8bafeee'
+            'd049f1a9cb7729cfcb57e0fd306b440abf1119f21799db43473c90ab67935bd9'
+            'a92ce41ecb6efcdb44b798f8330c4278b8265ff515b5104d673b90c48a149758'
+            '58ef2e17a968a5e6339d6ef367f7e63ce87ca179632f5ea89f87243d72d741ad'
+            '92c898660785efc23269ba5ed8120bd5b03ec0ac61bda34cc85affdd6288fa2f'
+            '6376fed98be25792d6fb1b0f3f4d1bb1d7e87e9a930b20eca243ae423260487e'
+            'aefec02f32f33a2e5972f32ce525773486b1f7d7e9f7d2f8155110e9ac885238'
+            '66093629e17c87474e0138ff7a5c07a22d342dda253f9937a62f633bb60db9fa'
+            '507af447d79665d653d08cec57ca4c5045ce07cfad06663c8aa43c7d286f4ac8'
+            '3593448edd09d55125b144a1d7cfad8fe0397d5a1c3920541e21adbd3ded01d4'
+            '49382f3f487d14743271c96c9c061b083787d74e9f4080451a28e4c9d4106d62'
+            '107badd0a0703a1df0484b0f96ae08ffa92279e2e513803b1f8170a99fb76cd1')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'