Rebase mingw-w64-qt5 packages against 5.15.6

2022-09-09 19:02:45 +02:00 · 2022-09-09 19:02:45 +02:00 · a9441237ee
parent 48c13871c5
commit a9441237ee
129 changed files with 455 additions and 496 deletions
--- a/devel/generator/gen-kde-fork-revisions.sh
+++ b/devel/generator/gen-kde-fork-revisions.sh
@ -8,6 +8,8 @@ expected_version=${versions[qt5]}.*
 arch_pkgbuilds=$1
 [[ $arch_pkgbuilds ]] && cd "$arch_pkgbuilds"
 echo "expected version: $expected_version"
 for pkgbuild in qt5-*/trunk/PKGBUILD ; do
    source "$pkgbuild"
    if [[ $pkgname != qt5-doc ]] && [[ $pkgver =~ $expected_version ]] && [[ $_commit ]]; then
--- a/devel/generator/generate.pl
+++ b/devel/generator/generate.pl
@ -77,43 +77,43 @@ $mojolicious->helper(expand_libs => sub {
 # define revisions of Qt modules from KDE fork
 my %kde_fork_revisions = (
    # module => [rev, 'commit on KDE fork', 'version bump to be reverted'],
-    '3d' => [17, '5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016'],
+    activeqt => [0, 'ccc9a61d10404a4999dec61fdb513aa50f265cc3'],
-    activeqt => [0, '065ae50f6bf947f11b7bcaa3199df99a83667574'],
+    winextras => [0, 'a2ef397d1833c7417138a14ae23c880ae434d8a6'],
-    base => [135, 'e0a15c11b853954d4189b2e30aa2450184de0987'],
+    '3d' => [6, 'fe5fca853c09c7e03a2ff66dac21584e3307984d'],
-    charts => [0, '16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5'],
+    base => [165, 'eeadc036d77b75bec5b7c41869688c7db9a2e221'],
-    connectivity => [4, '25720ab6004cf37ae54ad85d22f87f5fc9e6e72e'],
+    charts => [0, '841083c263f16f8acb81e4915bf24bbed0461c9a'],
-    datavis3d => [0, '5f8e2a037d5201c902149c828d102b71e90257e2'],
+    connectivity => [5, '01e8b04b121712ea0a2b2793ce13f4dd5e9cfcf8'],
-    declarative => [17, '51efb2ed2f071beda188270a23ac450fe4b318f7'],
+    datavis3d => [0, '502612c72a2cd3b3b0c4cff926e7764d74106d33'],
-    gamepad => [0, '8526b210146a2d030ae2f55ad44261befea4a087'],
+    declarative => [19, 'e1ecf1c4e09b2f1d04f94971771019e59a50679f'],
-    graphicaleffects => [0, '4c6ec38635aa22cf0854df8e710733c529f4ec02'],
+    gamepad => [0, '0a2d4651362810600d2ff7272772d5908bb8714b'],
-    imageformats => [0, '8c5bcabbf6a2e27539c2ad689fd69f2406d5cf5c'],
+    graphicaleffects => [0, 'e6e1e58ec28fd0f2e6426e6962cc4ccddb493349'],
-    location => [2, 'db3b6bc6afed6477e6ab2d8465e41efee30fb6d5'],
+    imageformats => [4, '9044695f4b1acdd7ec24e7b01f6a6ca61f982a75'],
-    lottie => [0, 'ccba2b00bd7f10558edb8664d6b9a95e9fafe6ac'],
+    location => [3, 'ebdf5b38da6e3fe0a183702bcca395c589c459ed'],
-    multimedia => [0, 'dc0ee181d4c56ff66c989bd3292dad7cc35e234b'],
+    lottie => [0, 'd40b67401afe7156b03c62c9a4d517b07555fe64'],
-    networkauth => [0, '2b0c9499e4000858138802e8f5aa28aa2ebe14c0'],
+    multimedia => [1, '76f84c545429a1b988b79f971734ef4bc3e6643f'],
-    purchasing => [0, '397c721847059b998d3b345149a3f6113579d7fe'],
+    networkauth => [0, '01315e31c5164c896a524175854c4b6df17fe166'],
-    quick3d => [2, 'd52bfdf7d967419a61c2a4492163626096838a99'],
+    purchasing => [0, 'fa07915d5b7c5ba16f2e8ba32a9066fe7eed0cb1'],
-    quickcontrols => [0, 'd405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b'],
+    quick3d => [1, '5cf67a0a93026ffd41d2ea5a11b289f46a518376'],
-    quickcontrols2 => [4, '0d3d39e821ea7634c174a29910c18d7101bce6f7'],
+    quickcontrols => [0, 'e62b8b6d2f45a79652238b33f4bbe23023004ae7'],
-    quicktimeline => [0, '2ce816fa5822bcc1c47678447405b2e5dc1312c1'],
+    quickcontrols2 => [5, '74e8db97fdb9b55c4b4614b83f4bf17e00df55e9'],
-    remoteobjects => [0, '809412e1cc2151c21f843796ef67705600f6aafb'],
+    quicktimeline => [0, '87ad61716a7cba5a070d8a7b1756c8b2b48d5d53'],
-    scxml => [0, 'dcbd73cf3e8a07dbfa249d7db2257caafa83781b'],
+    remoteobjects => [0, 'aa705010da0f658b78c1155babce7091ae44529a'],
-    sensors => [0, '1ab8d6c7257f9ec060739b648704be1cf1c16b05'],
+    scxml => [0, '631fd7bcc34802b7650c2b1dc73691463954d982'],
-    serialbus => [0, 'e34053fbda8d687e3dc294fbd5e3a88bf94a7a66'],
+    sensors => [0, '35eb5ac7eaef4745a38958c3ca780d7baa2e4f30'],
-    serialport => [0, '191e67e428522a0e2e1e8d2f3440607a9760d441'],
+    serialbus => [0, 'f9f7eee60adac72fcf6617d164e3bf61222bb5c5'],
-    speech => [1, 'c8a1dadc46ccdbeaef45aa805a9dc98d4b3220bd'],
+    serialport => [0, 'c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694'],
-    svg => [10, '23b8cf7d833c335d7735855570c05e9e0893a9b7'],
+    speech => [1, 'd1273416f25a15a6edf6ea56a07602cd7d99fe48'],
-    tools => [0, '53ee43a51b5a3de2877dafffc78e71ff55926708'],
+    svg => [9, 'a9752b00a03438de8e5b080073816e12409404b7'],
-    translations => [2, '527dcd684e8d5c645870c854b86df77edeedbc22'],
+    tools => [1, '32912a06aadfc3dcbc34e0a668ce2c78351eee6e'],
-    virtualkeyboard => [3, 'e8ae4757dd32e8dbf69a7c57f2bc5c1e238416db'],
+    translations => [2, 'd4db9d8a4893a70e7ba3a6d5fe62f24f9ce745ca'],
-    wayland => [38, '36659e6130ed3fc2b3f0c91423408ef5ecb7b991'],
+    virtualkeyboard => [1, '9fbb837b55887bec5d73fad142c853ef68db35b3'],
-    webchannel => [3, '8c842152da613f941892481d62267c73c4a4f006'],
+    wayland => [43, '489a0a1fc1db61f46e2b232ae4523723a05304b7'],
-    webglplugin => [0, 'df60c61e640dc4fb6be0d9565a4ab08aee054f93'],
+    webchannel => [3, 'fb1ca87aa1a12048199d2aabe9015b7222d2b773'],
-    websockets => [3, '6a4991250793cd38efa5e8db858cd49c82439130'],
+    webglplugin => [0, '68a322c391c2eb92876fce42b9fc23ad2f3a1ecb'],
-    webview => [0, '826d2a33929c69807917536d48b7861e7682001e'],
+    websockets => [2, 'a066371747a7eb9de9b1ae38fbc41b2059080802'],
-    winextras => [0, '96cfbd36ad9979ff1974cf137b68b9ae101022c3'],
+    webview => [0, '87577dde04ed219bda776dabca86176149736331'],
-    x11extras => [0, '51b0a5a2e3e35f4cb17da1e7cb4babef6294bfb4'],
+    x11extras => [0, '982f20eb585d77e5b5c721e05a466d7161f7f2d1'],
-    xmlpatterns => [0, 'dfcae10dec8c1c2c544ad0cd303cea113b0af51d'],
+    xmlpatterns => [0, '30e6c84fe2752cde8b53aff9d38c2095cd7c8761'],
 );
 # $rev := git rev-list --count v5.15.2..$commit_on_kde_fork
--- a/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep
+++ b/devel/generator/templates/layouts/mingw-w64-qt5-base.sh.ep
@ -31,7 +31,7 @@
 _qt_module=qt<%== $qt_module %>
 pkgname=<%= $package_name %>
-pkgver=5.15.4<%== $kde_fork_revision ? "+kde+r$kde_fork_revision->[0]" : '' %>
+pkgver=5.15.6<%== $kde_fork_revision ? "+kde+r$kde_fork_revision->[0]" : '' %>
 pkgrel=1
 % if ($kde_fork_revision) {
 _basever=${pkgver%%+*}
--- a/devel/versions.sh
+++ b/devel/versions.sh
@ -13,7 +13,7 @@ declare -A versions=(
    [blackwidowcontrol]=1.1.0
    [dbus-soundrecorder]=1.2.3
    [geocoordinatecalculator]=1.1.3
-    [qt5]=5.15.4
+    [qt5]=5.15.6
    [qt6]=6.3.1
 )
 declare -A github_names=(
--- a/qt5-3d/mingw-w64-static/PKGBUILD
+++ b/qt5-3d/mingw-w64-static/PKGBUILD
@ -10,16 +10,16 @@
 _qt_module=qt3d
 pkgname=mingw-w64-qt5-3d-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
 depends=('mingw-w64-qt5-declarative-static' 'mingw-w64-assimp')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-vulkan-headers' 'assimp')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016
+_commit=fe5fca853c09c7e03a2ff66dac21584e3307984d
 _basever=$pkgver
-pkgver+=+kde+r17
+pkgver+=+kde+r6
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-3d/mingw-w64/PKGBUILD
+++ b/qt5-3d/mingw-w64/PKGBUILD
@ -10,16 +10,16 @@
 _qt_module=qt3d
 pkgname=mingw-w64-qt5-3d
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
 depends=('mingw-w64-qt5-declarative' 'mingw-w64-assimp')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-vulkan-headers' 'assimp')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=5fd3906445ac95bf1cca6e7a7e0aeb6e3bcf5016
+_commit=fe5fca853c09c7e03a2ff66dac21584e3307984d
 _basever=$pkgver
-pkgver+=+kde+r17
+pkgver+=+kde+r6
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-3d/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-3d/mingw-w64/PKGBUILD.sh.ep
@ -4,7 +4,7 @@
 # Contributor: ant32 <antreimer@gmail.com>
 % end
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
--- a/qt5-activeqt/mingw-w64/PKGBUILD
+++ b/qt5-activeqt/mingw-w64/PKGBUILD
@ -15,14 +15,14 @@
 _qt_module=qtactiveqt
 pkgname=mingw-w64-qt5-activeqt
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="ActiveX integration framework (mingw-w64)"
 depends=('mingw-w64-qt5-base')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'python')
 license=('GPL3' 'LGPL3' 'LGPL2.1' 'FDL' 'custom')
-_commit=065ae50f6bf947f11b7bcaa3199df99a83667574
+_commit=ccc9a61d10404a4999dec61fdb513aa50f265cc3
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep
@ -10,7 +10,7 @@
 % end
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="ActiveX integration framework (mingw-w64)"
--- a/qt5-base/mingw-w64-static/0033-Handle-even-more-include-in-enum-cases.patch
+++ b/qt5-base/mingw-w64-static/0033-Handle-even-more-include-in-enum-cases.patch
@ -1 +0,0 @@
 ../mingw-w64/0033-Handle-even-more-include-in-enum-cases.patch
--- a/qt5-base/mingw-w64-static/PKGBUILD
+++ b/qt5-base/mingw-w64-static/PKGBUILD
@ -17,10 +17,10 @@
 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base-static
-pkgver=5.15.4+kde+r135
+pkgver=5.15.6+kde+r165
 pkgrel=1
 _basever=${pkgver%%+*}
-_commit=e0a15c11b853954d4189b2e30aa2450184de0987
+_commit=eeadc036d77b75bec5b7c41869688c7db9a2e221
 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
 arch=('any')
 url='https://www.qt.io/'
@ -69,42 +69,40 @@ 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'
-            'e54366498a5374c85164e883c58f7274bf231ec285ba6dc0c7eadad9ec3ffbb1'
+            'c41a27864036608b0356c240d48fb105b6afbd47a976e36908c9aed327d7b7cb'
-            '2962c1a34f36a28401bac0d90b808a79567a4d3105f22ba3534a8f9a16e77c77'
+            'a69ef91d9f42adc4d5796dd268dd58710fd080fb938fa3a65889b6ad517ccaf0'
-            '8d5cee5485be27fde395488328c4ae3751d8b6f99b2fb975178dedaa776c17de'
+            '260a3fb5f812c2dfa515eb2585c395ffb2b00a5ee86ab21f580c70ba2ef6ece5'
-            '0465f1a8f8830106164d86d18514cc1558c7cb0d057e3f8d1902f9e3bd9fb23b'
+            '5a6539b00e1459016554d04c4c4e7951989528c012dd5ed01a5ef5a1a01d326e'
-            'ed5f2b71229201bce7563f5f91d89e059779a49b9c6c91596224332169083507'
+            'b029b7a73680b9b972d8c29be109133b75834c76b3c99533382e7145d9cdadff'
-            '8de6b8c5405917589a6847f69b02d4940a021737c355a25b3f163cdab548b711'
+            '40267b7089d95c59899b5fb2a2ce8c9ce66b284e8ca222ecf56839bbc8619be6'
-            '502cb54d8b77c71b7812dca378c079bcdeb0f0bc991095131896974eed20e04c'
+            '75afb4b6eab560d55058f170565944774fb534bcfe077acf95035f331dce321f'
-            '1ee4ec6ee02f049d8d991d0a56fcd6a687a3a7cc368d5b937a98ee0f52834584'
+            'e76976133fa5b31d57a4b05b8aad5369559f50c93f9e4a3cb75a4645fee0c017'
-            'cc2d8d8daf4ae578690cf50b81196aeff0e9f44672ed30ceb33a41abae42099d'
+            'f4867d176bda13c506543b630931d1efe3b0c8e02d80fd81cca6de9a53ed9fea'
-            'e16188f688e03da51f909151915d201666853a909f132a137c1505daa87d87eb'
+            '2049f9afc17877edc8014ad1abfa7492d7208fc6a1e97f90c6ff3e8fd89ed853'
-            '31bcdb687bf1d0bd0ee789cf5c67ebbfb8e379757f9d4ebb02f16486a1bcc4f0'
+            'b8d69fa14f6e14aaf98e2e9ca201b0e54ea066c70f514d84e652e2dc06d75bba'
-            '7f6c2cb002446f6f24450a6bf6bcd07db46a2cbfc065d751cda1334da0a1facc'
+            'c021e47b0452c47a7b486596324f62fdc192665a6c476cb7fad9207340b7fe5f'
-            '903554c186f1876d01e9a2383820f257bac604a964550cbb1d01b25f374b7872'
+            '0aa2ec748924f3fa1ebe16645c581f6b5d5bf82186e58407c8ee0597e7547a10'
-            '9f29ba92db17e4690ecb10977aca1e3d9212bec143562664a5c2562c9c9e7ade'
+            'b2ffe203da527c95936806121d646bcf03026b0a7cc8ada2f60d4d26284028b3'
-            '911c46fa0a4b8993ae061f91ff2874567ffe40fe5f79930b926aa79c9c2e351f'
+            'bfddd2c8c44bab7f7995623bdcb89fd3ff8fbe9125522b1bb50b43efe297ee13'
-            'bd7ad72c515c519213eb5e3512a6079830f86970a2de5c4a4d58d0c602f35422'
+            'a9e9ac55bd881390b41b49a06f11c3441a008409527f7fce3d337df6820598c6'
-            '07551376ed340d12093ca2f22e354f47b14bff050f83f04eb9b65c91ffa9a0a3'
+            'fb8de523d608ded6a6f6ca82d884af7bd086091e10d492902363f4f3f90f1a5b'
-            '6014b68b4fc357a05cde75a4c84fce9cfcda2ce21368ca3f382756025dce9732'
+            '4d6f76f552cd0eaae0ae8e9ea8232f36ad140680c2d04ed70e792c11b85c86ac'
-            'b522c9c8d2f04ee44d26a32ee0e7b5408e9fb54cc15dda718cf1e8ba03e52157'
+            'bb0bfd9431d103af36d4b09134f3f9f1ac7a05feeb7779e6c15d447593ce6381'
-            '8ea4685376fed385f99c304161597e2f11f942b43efefdb94ee448b2a74f8aeb'
+            'af6014fb1c311b91a1390898d25622d6aba555a0a30724dd953af2ea17cad6c5'
-            'ed71ed12749f8948088dfcec3a980ff7033c7db78d1543888ac1f869bd422e30'
+            'ab620d4da6897d0b5fed70f8ac01febb46b9ff6e04e8fb49b4c1a2cb8527994f'
-            '846b354c2a8a8dd9e85fcbaf2c079627fa33cf8a49349b208a2e4d1698663181'
+            'e7217028a44537e40ddac73ac49630f77a361ecd20d6c40f6482517ae3103939'
-            '9a791909b3adb5c94ddfd4f3b25637190b3327307873d7da6003c082d84a11e8'
+            '7937d08e1aaf5bb59161e84ecd23cb0ea6a251eae0b98a8291e126442bf048f1'
-            'aefa30834e2d8006768591277e6f06afb4f2e79b19fca357d8b05a9fb57153f1'
+            'ed37dc1bef6aee8e842c347ebe4fb3a4435887a15664f98487466d771d85f15e'
-            '93b941ffbb75ed7d6177e8b41c7a39f64b3607955a2102e069c60ae832e6beac'
+            '071cce97add50db7e4703c6798afc42500405276043b2e5e6e9a5cf80556726c'
-            'a7d547da8f8aae320f0f65476dc3bd95c6d9339a6b56793c8a8232432e501874'
+            '62ae5fbeace74ba9830c185f45432decd5f0f8305767d9a3b9bfac27647f5a7c'
-            'a205639ac75464ee2d3a278791262894079b2f1d6b7e4802ccb6b56ac6952be8'
+            '9fae7c2dc88a27322bdb32748ea03fac1a04d8d35327acce05be511dd00b04e2'
-            'faebb2d05cdc748d69f397c237433a7a27aab50922b7b57511a4f03524ec04cd'
+            '06836073078a6cb304931443eab9306baee29d1c19f167765cff238bd34ae78d'
-            '3095c5da24a9e2d572627acf24c4eb36a4f575d564ee17c59b3e6879bfd8dd40'
+            '484996266fe418c1b5db76eec61d1bce1bc163546f534acf8343b0f77796cab7'
-            'b1276acc58de81e72c9bfa456af1328c3bb21615fe42a577e25d21bd77c7c17c'
+            '94852f7bd841f0ded357e9d0a5c6e53434711df1b701674da49f4f1a8f61a26b'
-            '5761551f4c3ba63d357acdb3e313ef4e0cf64b44394484b757cc8725062e2eb6'
+            '242f068c25d72ed8f67790d2c629b4aea2f13053760a9c8de43cab26c620bfe1'
-            'acefce75b6659a72d611609c7edf6ad8478bc8af018e8a37085d52415faae505'
+            '5f83de1635acee180f65019ccd37112f284552d6d4831b770a1a0c0119f17f5e')
            '0d654b878944c128a9cd47cafddd0cc1d326dfbcf6b8d607edeebe1d4c92f2c5')
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
--- a/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@ -1,7 +1,7 @@
-From 23d804d6ac00a19523f807f32f0aca53d44b8512 Mon Sep 17 00:00:00 2001
+From 28fc8a754e54a24bbb1575cce719538629e5042a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
-Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
+Subject: [PATCH 01/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@ -1,7 +1,7 @@
-From 0daf9692e7eb1f22991fe8c911dd44b9728ca300 Mon Sep 17 00:00:00 2001
+From d8a666bc84523bb256f5b78f1876af0efab6cb16 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
-Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
+Subject: [PATCH 02/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -1,7 +1,7 @@
-From 839541ae815910abaa1d282692e2041c73b9148d Mon Sep 17 00:00:00 2001
+From 0f134acc8fadb65198b0c8f43c63a7c67c4fa89c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
-Subject: [PATCH 03/33] Fix too many sections assemler error in OpenGL factory
+Subject: [PATCH 03/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64/0004-Make-sure-.pc-files-are-installed-correctly.patch
@ -1,7 +1,7 @@
-From a7bca5e7438adcb986ade228fb867cf40f232f65 Mon Sep 17 00:00:00 2001
+From 0d645ca83b306f66cc806bc1a487b02de963b612 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
-Subject: [PATCH 04/33] Make sure *.pc files are installed correctly
+Subject: [PATCH 04/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -1,7 +1,7 @@
-From 65f0b9268811388b9f993a983e7b973432fe6985 Mon Sep 17 00:00:00 2001
+From f74d7894cd7c75ac0eba7dae3c413212b5c9aeef Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 05/33] Don't add resource files to LIBS parameter
+Subject: [PATCH 05/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@ -1,7 +1,7 @@
-From f1b16ffa422af5a295178e2e0864e07de5c10f25 Mon Sep 17 00:00:00 2001
+From 94c2309628c6276358e515abf7db2f047c4c6ea4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
-Subject: [PATCH 06/33] Prevent debug library names in pkg-config files
+Subject: [PATCH 06/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64/0007-Fix-linking-against-shared-static-libpng.patch
@ -1,7 +1,7 @@
-From acba669125da3bfdac2195820a9872566db29975 Mon Sep 17 00:00:00 2001
+From c1500438c0431ec3ad710ba5e1da6bafcbfbe09f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
-Subject: [PATCH 07/33] Fix linking against shared/static libpng
+Subject: [PATCH 07/32] Fix linking against shared/static libpng
 Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
@ -26,5 +26,5 @@ index 12c95742d2..e0043542ec 100644
             ],
             "use": [
 -- 
-2.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64/0008-Fix-linking-against-static-D-Bus.patch
@ -1,7 +1,7 @@
-From 9dcf149ca4b41db23a4c1ccc3fec7db4621071c5 Mon Sep 17 00:00:00 2001
+From 4e4b4ef2a7722f09547903ab92a1f1c7cf527ce6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
-Subject: [PATCH 08/33] Fix linking against static D-Bus
+Subject: [PATCH 08/32] Fix linking against static D-Bus
 ---
 configure.json             | 9 +++++++--
@ -54,5 +54,5 @@ index accaa4f5ed..4b11c74caa 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@ -1,7 +1,7 @@
-From 0986318a86937b2222babb6ec7c17c05fee23b32 Mon Sep 17 00:00:00 2001
+From 709f40bf4118e2409ef0d6b0e9ea6fecdbaaf220 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
-Subject: [PATCH 09/33] Don't try to use debug version of D-Bus library
+Subject: [PATCH 09/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64/0010-Fix-linking-against-static-freetype2.patch
@ -1,7 +1,7 @@
-From f41ad000227142d8eb0ae8ee04ff7813d57b4eef Mon Sep 17 00:00:00 2001
+From 9ad4e8f478409ea2e1ea979aff8752bff71e2c6d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
-Subject: [PATCH 10/33] Fix linking against static freetype2
+Subject: [PATCH 10/32] Fix linking against static freetype2
 Change-Id: I6e4a2baa25beb5f63b46f25153bd7bac52a2262f
 ---
@ -26,5 +26,5 @@ index e0043542ec..2fe0a018b1 100644
                 { "libs": "-lfreetype" }
             ],
 -- 
-2.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-harfbuzz.patch
@ -1,7 +1,7 @@
-From 7caf291b795d3b56e66dd3f7f754ec048fb18710 Mon Sep 17 00:00:00 2001
+From ec97898dc6b1446c10a2e357627ffb198b614a81 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
-Subject: [PATCH 11/33] Fix linking against static harfbuzz
+Subject: [PATCH 11/32] Fix linking against static harfbuzz
 ---
 src/gui/configure.json | 6 +++++-
@ -25,5 +25,5 @@ index 2fe0a018b1..ceeee23164 100644
         },
         "imf": {
 -- 
-2.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64/0012-Fix-linking-against-static-pcre.patch
@ -1,7 +1,7 @@
-From 35ee6babaa589049fab6c4b5af44f9b129c7a069 Mon Sep 17 00:00:00 2001
+From 907d2c90e2321ee3e269ebc8491ac62c902bc0c7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
-Subject: [PATCH 12/33] Fix linking against static pcre
+Subject: [PATCH 12/32] Fix linking against static pcre
 Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 ---
@ -24,5 +24,5 @@ index d7e3cc5ee2..e17c19fbae 100644
 #include <pcre2.h>
 -- 
-2.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64/0013-Fix-linking-against-shared-static-MariaDB.patch
@ -1,7 +1,7 @@
-From 6e7f2b340c0a8c699a63a020c71f865c6b3804f5 Mon Sep 17 00:00:00 2001
+From b9b333884c7fae07ab6bb8601e6f915c65fd1423 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
-Subject: [PATCH 13/33] Fix linking against shared/static MariaDB
+Subject: [PATCH 13/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@ -1,7 +1,7 @@
-From 8691567261c4d3d4acb1eaae70d4282901ec29e8 Mon Sep 17 00:00:00 2001
+From 47e906fc890136daf25f1afb512bc3105ddb0e04 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
-Subject: [PATCH 14/33] Fix linking against shared/static PostgreSQL
+Subject: [PATCH 14/32] Fix linking against shared/static PostgreSQL
 ---
 src/plugins/sqldrivers/configure.json | 4 ++--
@ -24,5 +24,5 @@ index 7262914c64..852ba558be 100644
             ]
         },
 -- 
-2.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64/0015-Rename-qtmain-to-qt5main.patch
@ -1,7 +1,7 @@
-From 755c622f8cd0f9c64ab77fef8da72845f4060cee Mon Sep 17 00:00:00 2001
+From 34553edae8fd18e8f3e88056d17625c6d7a8e8c5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
-Subject: [PATCH 15/33] Rename qtmain to qt5main
+Subject: [PATCH 15/32] Rename qtmain to qt5main
 Prevents conflict with mingw-w64-qt4 package
 ---
@ -25,10 +25,10 @@ index 793ff540a1..4f3bb7e764 100644
 QMAKE_IDL               = $${CROSS_COMPILE}widl
 QMAKE_LIB               = $${CROSS_COMPILE}ar -rc
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 24ed125f12..593161f362 100644
+index 64639f177d..6cd94f8058 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -329,14 +329,14 @@ mac {
+@@ -336,14 +336,14 @@ mac {
     }
     mingw {
@ -76,5 +76,5 @@ index 1f54c846ec..162e7a4b1b 100644
 CONFIG += static
 -- 
-2.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0016-Enable-rpath-for-build-tools.patch
@ -1,7 +1,7 @@
-From 765559b1ba5f1829ca61feb9001d06bf79c960ca Mon Sep 17 00:00:00 2001
+From 68d31dfebc88da9640d54282aff55e09b16d66bb Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
-Subject: [PATCH 16/33] Enable rpath for build tools
+Subject: [PATCH 16/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0017-Use-system-zlib-for-build-tools.patch
@ -1,7 +1,7 @@
-From 7db6046edd2c8129660e13b4489feea798b90f77 Mon Sep 17 00:00:00 2001
+From 72b1e80f59d79a032ad1c1805cb511d3285ed440 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
-Subject: [PATCH 17/33] Use system zlib for build tools
+Subject: [PATCH 17/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64/0018-Merge-shared-and-static-library-trees.patch
@ -1,7 +1,7 @@
-From a8c019454d89468771253722224dd00802705289 Mon Sep 17 00:00:00 2001
+From 4329157e0a3f2a59d839da9aaf38b9415391c3da Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
-Subject: [PATCH 18/33] Merge shared and static library trees
+Subject: [PATCH 18/32] Merge shared and static library trees
 Allow installation of shared and static build in the same prefix
@ -89,10 +89,10 @@ index c15559e174..dd09ac749d 100644
 unset(DEVICE_PRI)
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 69d1954306..2bc7b1dedd 100644
+index da1f44a88a..8096d01c34 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -235,6 +235,23 @@ for(ever) {
+@@ -254,6 +254,23 @@ for(ever) {
             !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
                 WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
         }
@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
 INSTALLS += mkspecs
 -- 
-2.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64/0019-Use-.dll.a-as-import-lib-extension.patch
@ -1,23 +1,23 @@
-From 7c2c449e7d286be7aa1df1494e19ec1c3130792d Mon Sep 17 00:00:00 2001
+From 2baddbdcdde10ac0610bfd81b37020f174561dc3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 19/33] Use *.dll.a as import lib extension
+Subject: [PATCH 19/32] Use *.dll.a as import lib extension
 The variables used here are provided by
 g++-win32.conf
-Change-Id: I40acb56685628ed52b3e6b89aab7f53f9a872b1a
+Change-Id: Ic8915ea40b4db3d9f60533d21daf8ff1ec1bd803
 ---
- mkspecs/features/create_cmake.prf      |  5 +++--
+ mkspecs/features/create_cmake.prf      |  5 ++--
- mkspecs/features/qt.prf                | 15 ++++++++++++---
+ mkspecs/features/qt.prf                | 38 ++++++++++----------------
- qmake/generators/win32/winmakefile.cpp | 15 +++++++++++----
+ qmake/generators/win32/winmakefile.cpp | 15 +++++++---
- 3 files changed, 26 insertions(+), 9 deletions(-)
+ 3 files changed, 28 insertions(+), 30 deletions(-)
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 593161f362..37689938eb 100644
+index 6cd94f8058..ac089a2f9f 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -332,8 +332,9 @@ mac {
+@@ -339,8 +339,9 @@ mac {
         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a
         CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
@ -30,20 +30,37 @@ index 593161f362..37689938eb 100644
         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib
         CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 2bc7b1dedd..b79b324b88 100644
+index 8096d01c34..b79b324b88 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -216,12 +216,21 @@ for(ever) {
+@@ -215,32 +215,22 @@ for(ever) {
                 # Linking frameworks by absolute path does not work.
                 LIBS$$var_sfx += -framework $$framework
             } else {
-                 lib = $$MODULE_MODULE$$qtPlatformTargetSuffix()
+-                candidates = $$MODULE_MODULE$$qtPlatformTargetSuffix()
 -                darwin: candidates *= $$MODULE_MODULE
 -                win32|contains(MODULE_CONFIG, staticlib) {
 -                    lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB
 -                    lib_suffix = $$QMAKE_EXTENSION_STATICLIB
 -                    add_lib_to_pretargetdeps = true
 +                lib = $$MODULE_MODULE$$qtPlatformTargetSuffix()
 +                contains(MODULE_CONFIG, staticlib) {
-                     lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_STATICLIB
+                    lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_STATICLIB
-                     PRE_TARGETDEPS += $$lib
+                    PRE_TARGETDEPS += $$lib
                 } else {
-                    lib = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB$${lib}.$$QMAKE_EXTENSION_SHLIB
+-                    lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB
 -                    lib_suffix = $$QMAKE_EXTENSION_SHLIB
 -                    add_lib_to_pretargetdeps = false
 -                }
 -                lib_missing = true
 -                lib_fallback =
 -                for(lib_base, candidates) {
 -                    lib = $${lib_prefix}$${lib_base}.$${lib_suffix}
 -                    isEmpty(lib_fallback): \
 -                        lib_fallback = $$lib
 -                    exists($$lib) {
 -                        lib_missing = false
 -                        break()
 +                    win32 {
 +                        shared|actually_a_shared_build {
 +                            lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_IMPORTLIB
@ -53,7 +70,12 @@ index 2bc7b1dedd..b79b324b88 100644
 +                        PRE_TARGETDEPS += $$lib
 +                    } else {
 +                        lib = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB$${lib}.$$QMAKE_EXTENSION_SHLIB
-+                    }
+                     }
 -                }
 -                $$lib_missing: \
 -                    lib = $$lib_fallback
 -                $$add_lib_to_pretargetdeps: \
 -                    PRE_TARGETDEPS += $$lib
 +		}
                 LIBS$$var_sfx += $$lib
             }
@ -94,5 +116,5 @@ index 183cef2908..03732df4a8 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,7 +1,7 @@
-From 2549c562ae5de32f93a1b1ea63f32f6284d0aedf Mon Sep 17 00:00:00 2001
+From 296e4bdadaedd8b2ec38ba98b53b24c337edde5c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
-Subject: [PATCH 20/33] Pull dependencies of static libraries in CMake modules
+Subject: [PATCH 20/32] 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
@ -28,11 +28,11 @@ actually works so I keep using my own implemention for now.
 That's why this patch now removes a lot of the 5.14.0 and 5.15.0
 additions in favour of 'how it used to work'.
-Change-Id: I75a9c91e9ab0dc06a941b576c28f87aef254669c
+Change-Id: I9a1a384aeb39f9185342e3581ab98feb8ad103a0
 ---
 .../data/cmake/Qt5BasicConfig.cmake.in        | 242 +++++++++---------
- .../data/cmake/Qt5PluginTarget.cmake.in       |  93 +------
+ .../data/cmake/Qt5PluginTarget.cmake.in       |  92 +------
- 2 files changed, 133 insertions(+), 202 deletions(-)
+ 2 files changed, 133 insertions(+), 201 deletions(-)
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 index db18dbece6..5a5bc4d61d 100644
@ -384,7 +384,7 @@ index db18dbece6..5a5bc4d61d 100644
     include(\"${CMAKE_CURRENT_LIST_DIR}/Qt5$${CMAKE_MODULE_NAME}ConfigExtras.cmake\")
 !!ENDIF
 diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-index b550a52c60..acbe1cc33b 100644
+index 2e23109167..eaf9011c3d 100644
 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
@@ -1,5 +1,6 @@
@ -396,7 +396,7 @@ index b550a52c60..acbe1cc33b 100644
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
 set(_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_PLUGIN_MODULE_DEPS}\")
-@@ -16,99 +17,17 @@ foreach(_module_dep ${_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES})
+@@ -16,98 +17,17 @@ foreach(_module_dep ${_Qt5$${CMAKE_PLUGIN_NAME}_MODULE_DEPENDENCIES})
 endforeach()
 !!IF !isEmpty(CMAKE_RELEASE_TYPE)
@ -472,15 +472,14 @@ index b550a52c60..acbe1cc33b 100644
 -        \"${_user_specified_genex_versionless},\"
 -        # Add this plugin if all of the following are true:
 -        # 1) the list of explicitly included plugin types is empty
-        # 2) the QT_PLUGIN_EXTENDS property for the plugin is empty or equal to the current
+-        # 2) the QT_PLUGIN_EXTENDS property for the plugin is empty or equal to one of the modules
-        #    module name
+-        #    listed in the plugin's PLUGIN_EXTEND qmake variable
 -        # 3) the user hasn\'t explicitly excluded the plugin.
 -        # TODO: Note that the current implementation of (2) is not entirely correct QTBUG-93501
 -        \"$<AND:\"
 -            \"$<STREQUAL:${_plugin_type_genex},>,\"
 -            \"$<OR:\"
-                # FIXME: The value of CMAKE_MODULE_NAME seems to be wrong (e.g for Svg plugin
+-                $${CMAKE_PLUGIN_EXTENDS_GENEX_CHECK}
 -                # it should be Qt::Svg instead of Qt::Gui).
 -                \"$<STREQUAL:$<TARGET_PROPERTY:Qt5::$${CMAKE_PLUGIN_NAME},QT_PLUGIN_EXTENDS>,Qt::$${CMAKE_MODULE_NAME}>,\"
 -                \"$<STREQUAL:$<TARGET_PROPERTY:Qt5::$${CMAKE_PLUGIN_NAME},QT_PLUGIN_EXTENDS>,>\"
 -            \">,\"
 -            \"$<NOT:$<IN_LIST:Qt5::$${CMAKE_PLUGIN_NAME},${_no_plugins_genex}>>,\"
@ -499,7 +498,6 @@ index b550a52c60..acbe1cc33b 100644
 set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\")
 set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_CLASS_NAME \"$$CMAKE_PLUGIN_NAME\")
 +endif()
 \ No newline at end of file
 -- 
-2.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64/0021-Allow-usage-of-static-version-with-CMake.patch
@ -1,7 +1,7 @@
-From 97dd25ccddaf09c2cd81e7e1c6bc937b18fcb314 Mon Sep 17 00:00:00 2001
+From 9eac4a7941ee50c585a74b5555e0bd15b7bff786 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
-Subject: [PATCH 21/33] Allow usage of static version with CMake
+Subject: [PATCH 21/32] Allow usage of static version with CMake
 Allow selecting between dynamic and static Qt versions
 installed in the same prefix
@ -11,20 +11,20 @@ installed in the same prefix
 - Set USE_STATIC_QT_BY_DEFAULT to use static version
   via regular find_package(Qt5Core)
-Change-Id: I75f8ff616ad23038416be6271369f9dcc36f2528
+Change-Id: I410d22d1bee9dd66b90e07461c85fdb74ef621c1
 ---
 mkspecs/features/create_cmake.prf             |  96 ++++--
 .../data/cmake/Qt5BasicConfig.cmake.in        | 311 +++++++++++-------
- .../data/cmake/Qt5PluginTarget.cmake.in       |  32 +-
+ .../data/cmake/Qt5PluginTarget.cmake.in       |  30 +-
 .../cmake/Qt5StaticOnlyRedirection.cmake.in   |  11 +
 src/corelib/Qt5CoreConfigExtras.cmake.in      |  26 +-
 src/gui/Qt5GuiConfigExtras.cmake.in           |   8 +-
 src/testlib/Qt5TestConfigExtras.cmake.in      |   2 +-
- 7 files changed, 319 insertions(+), 167 deletions(-)
+ 7 files changed, 318 insertions(+), 166 deletions(-)
 create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 37689938eb..636a2af9b6 100644
+index ac089a2f9f..ceae7c1f8c 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
@@ -68,7 +68,7 @@ split_incpath {
@ -45,7 +45,7 @@ index 37689938eb..636a2af9b6 100644
 internal_module {
     CMAKE_INTERNAL_MODULE = true
-@@ -214,20 +216,25 @@ contains(CONFIG, plugin) {
+@@ -221,20 +223,25 @@ contains(CONFIG, plugin) {
     win32 {
         !mingw|qtConfig(debug_and_release): debug_suffix="d"
@ -78,7 +78,7 @@ index 37689938eb..636a2af9b6 100644
         mac {
             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PLUGIN_EXT = .dylib
             else: CMAKE_PLUGIN_EXT = .a
-@@ -247,9 +254,9 @@ contains(CONFIG, plugin) {
+@@ -254,9 +261,9 @@ contains(CONFIG, plugin) {
         }
     }
     cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
@ -90,7 +90,7 @@ index 37689938eb..636a2af9b6 100644
     !build_pass {
         QMAKE_SUBSTITUTES += cmake_target_file
-@@ -258,7 +265,7 @@ contains(CONFIG, plugin) {
+@@ -265,7 +272,7 @@ contains(CONFIG, plugin) {
     cmake_qt5_plugin_file.files = $$cmake_target_file.output
     static|staticlib: cmake_qt5_plugin_file.files += $$cmake_qt5_plugin_import_file.output
@ -99,7 +99,7 @@ index 37689938eb..636a2af9b6 100644
     INSTALLS += cmake_qt5_plugin_file
     return()
-@@ -271,30 +278,38 @@ mod_deps =
+@@ -278,30 +285,38 @@ mod_deps =
 lib_deps =
 aux_mod_deps =
 aux_lib_deps =
@ -142,7 +142,7 @@ index 37689938eb..636a2af9b6 100644
     !isEmpty(CMAKE_STATIC_TYPE) {
         CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
         CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -321,13 +336,6 @@ mac {
+@@ -328,13 +343,6 @@ mac {
     CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
     CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
@ -156,7 +156,7 @@ index 37689938eb..636a2af9b6 100644
     mingw {
         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a
         CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
-@@ -335,14 +343,30 @@ mac {
+@@ -342,14 +350,30 @@ mac {
         isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
         CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.$${QMAKE_EXTENSION_IMPORTLIB}
         CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB}
@ -187,7 +187,7 @@ index 37689938eb..636a2af9b6 100644
     !isEmpty(CMAKE_STATIC_TYPE) {
         CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
         CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -362,12 +386,12 @@ mac {
+@@ -369,12 +393,12 @@ mac {
 INSTALLS += cmake_qt5_module_files
 cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@ -202,7 +202,7 @@ index 37689938eb..636a2af9b6 100644
 !build_pass:QMAKE_SUBSTITUTES += \
     cmake_config_file \
-@@ -377,11 +401,29 @@ cmake_qt5_module_files.files = \
+@@ -384,11 +408,29 @@ cmake_qt5_module_files.files = \
     $$cmake_config_file.output \
     $$cmake_config_version_file.output
@ -233,7 +233,7 @@ index 37689938eb..636a2af9b6 100644
     !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
-@@ -393,7 +435,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -400,7 +442,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
 exists($$cmake_macros_file.input) {
     CMAKE_MODULE_MACROS = "true"
@ -242,7 +242,7 @@ index 37689938eb..636a2af9b6 100644
     cmake_macros_file.CONFIG = verbatim
     !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -401,7 +443,7 @@ exists($$cmake_macros_file.input) {
+@@ -408,7 +450,7 @@ exists($$cmake_macros_file.input) {
     cmake_qt5_module_files.files += $$cmake_macros_file.output
 }
@ -887,7 +887,7 @@ index 5a5bc4d61d..97150fb244 100644
     )
 endif()
 diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
-index acbe1cc33b..65869c5122 100644
+index eaf9011c3d..65869c5122 100644
 --- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
@@ -1,13 +1,13 @@
@ -935,14 +935,12 @@ index acbe1cc33b..65869c5122 100644
 -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_TYPE \"$$CMAKE_PLUGIN_TYPE\")
 -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\")
 -set_property(TARGET Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_CLASS_NAME \"$$CMAKE_PLUGIN_NAME\")
 -endif()
 \ No newline at end of file
 +list(APPEND ${QT_VARIANT_PREFIX}Qt5$${CMAKE_MODULE_NAME}_PLUGINS ${QT_VARIANT_PREFIX}Qt5::$$CMAKE_PLUGIN_NAME)
 +set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY QT_ALL_PLUGINS_$${CMAKE_PLUGIN_TYPE_ESCAPED} ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_PLUGIN_NAME})
 +set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_TYPE \"$$CMAKE_PLUGIN_TYPE\")
 +set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_EXTENDS \"$$CMAKE_PLUGIN_EXTENDS\")
 +set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_PLUGIN_NAME} PROPERTY QT_PLUGIN_CLASS_NAME \"$$CMAKE_PLUGIN_NAME\")
-+endif()
+ endif()
 diff --git a/mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in b/mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
 new file mode 100644
 index 0000000000..0091940fd2
@ -1091,5 +1089,5 @@ index 2a575958ae..ca0e3be3b5 100644
     INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
 )
 -- 
-2.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,7 +1,7 @@
-From 11da4f686d3b0b0cde2524f0dbd45341e89bf459 Mon Sep 17 00:00:00 2001
+From 0352e345a0d67776eaacfe26a2047d5f5b06cb3b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
-Subject: [PATCH 22/33] Adjust linker flags for static build with
+Subject: [PATCH 22/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64/0023-Use-correct-pkg-config-static-flag.patch
@ -1,7 +1,7 @@
-From 8e60e28dda9d636716fcd8503135fa9a0579d83c Mon Sep 17 00:00:00 2001
+From c9fe6b198963a628779fb708d044b325deb154af Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
-Subject: [PATCH 23/33] Use correct pkg-config --static flag
+Subject: [PATCH 23/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,7 +1,7 @@
-From 44428a18a9d7a548f78b22cdc24945e79ae6fcc2 Mon Sep 17 00:00:00 2001
+From 531447697fcfaecad46f1169e9a2b3a684993a45 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
-Subject: [PATCH 24/33] Fix macro invoking moc, rcc and uic
+Subject: [PATCH 24/32] Fix macro invoking moc, rcc and uic
 * Otherwise the arguments aren't passed correctly leading to errors like
  ```
@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c
 2 files changed, 8 insertions(+), 4 deletions(-)
 diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
-index f5766f8775..2403717802 100644
+index d91873f1bc..8f1fb17722 100644
 --- a/src/corelib/Qt5CoreMacros.cmake
 +++ b/src/corelib/Qt5CoreMacros.cmake
@@ -153,8 +153,9 @@ function(qt5_create_moc_command infile outfile moc_flags moc_options moc_target
@ -70,5 +70,5 @@ index 35d2a2dc54..99f061f1b8 100644
           MAIN_DEPENDENCY ${infile} VERBATIM)
         set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
 -- 
-2.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64/0025-Ignore-errors-about-missing-feature-static.patch
@ -1,7 +1,7 @@
-From 3ca911c0682dfc2dc76709a27de47085727d31d3 Mon Sep 17 00:00:00 2001
+From 5a96b713cfd0f59571eacbaad496e13e30a29192 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
-Subject: [PATCH 25/33] Ignore errors about missing feature static
+Subject: [PATCH 25/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64/0026-Enable-and-fix-use-of-iconv.patch
@ -1,7 +1,7 @@
-From 269b1e040b8358d29cfee1709fc19cb5409a808b Mon Sep 17 00:00:00 2001
+From 1bfc05dc42edfc5fdd694fd81db6fb2a4e0362dd Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
-Subject: [PATCH 26/33] Enable and fix use of iconv
+Subject: [PATCH 26/32] Enable and fix use of iconv
 Change-Id: I5f0ab27afca0800dec11c7af74d196190820ae5c
 ---
@ -49,7 +49,7 @@ index 9c39727946..cc14036b25 100644
 #else
     char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index 9b5d19d41b..f649a9f6ef 100644
+index 74c7181dd1..e8403aa6de 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
@@ -72,7 +72,7 @@
@ -74,5 +74,5 @@ index 9b5d19d41b..f649a9f6ef 100644
         },
         "icu": {
 -- 
-2.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64/0027-Ignore-failing-pkg-config-test.patch
@ -1,7 +1,7 @@
-From 6f8b521567786e38f5c986f05793c1a8e376eee4 Mon Sep 17 00:00:00 2001
+From e87edd3a17d9c1ff4eb4e60ae71ae276af9d93f6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
-Subject: [PATCH 27/33] Ignore failing pkg-config test
+Subject: [PATCH 27/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,7 +1,7 @@
-From 892c3bb8d9dfad8ef0d54112dc9d2af23c58638b Mon Sep 17 00:00:00 2001
+From f78cf68b18981cd16c8c0034f4d46517c7905f02 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
-Subject: [PATCH 28/33] Prevent qmake from messing static lib dependencies
+Subject: [PATCH 28/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64/0029-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,7 +1,7 @@
-From ab90e575a14292a690cc51241fd54f579f9ac3ad Mon Sep 17 00:00:00 2001
+From d5e12ed7959fac200b629da221b22e65f11c999d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
-Subject: [PATCH 29/33] Hardcode linker flags for platform plugins
+Subject: [PATCH 29/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64/0030-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,7 +1,7 @@
-From cff7c1280b6f94659a17235692dafecc71049d54 Mon Sep 17 00:00:00 2001
+From 7f833b6849bc91b24f7a2361f8a090b71ed90826 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
-Subject: [PATCH 30/33] Fix linking against static plugins with qmake
+Subject: [PATCH 30/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/qt5-base/mingw-w64/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@ -1,7 +1,7 @@
-From b10914297d9675501a1daadecda9c309aec546fd Mon Sep 17 00:00:00 2001
+From 0dcb8192c585eaff536b8f9c22abe7fe4ada06d0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 24 Jun 2019 13:51:02 +0200
-Subject: [PATCH 31/33] Prevent 'Cannot find feature windows_vulkan_sdk'
+Subject: [PATCH 31/32] 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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
+++ b/qt5-base/mingw-w64/0032-Fix-crashes-in-rasterization-code-using-setjmp.patch
@ -1,7 +1,7 @@
-From 7841fa06722b5778b9882076dd12dc81402b66d0 Mon Sep 17 00:00:00 2001
+From b0d04c84efd9a26e76cea53e17b526e2073a1bb1 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 Jun 2021 22:24:12 +0200
-Subject: [PATCH 32/33] Fix crashes in rasterization code using setjmp
+Subject: [PATCH 32/32] Fix crashes in rasterization code using setjmp
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@ -231,7 +231,7 @@ index 0143e9b602..803a676e1a 100644
         *araster = 0;
         return ErrRaster_Memory_Overflow;
 diff --git a/src/gui/painting/qt_attribution.json b/src/gui/painting/qt_attribution.json
-index 7b16e8c211..38f03b73d8 100644
+index 0e87d30aa2..8566ce0048 100644
 --- a/src/gui/painting/qt_attribution.json
 +++ b/src/gui/painting/qt_attribution.json
@@ -4,7 +4,7 @@
@ -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.36.1
+2.37.3
--- a/qt5-base/mingw-w64/0033-Handle-even-more-include-in-enum-cases.patch
+++ b/qt5-base/mingw-w64/0033-Handle-even-more-include-in-enum-cases.patch
@ -1,56 +0,0 @@
 From 1bd4629742cda699fccdbc75ab6a722ddf1b6af8 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.1
--- a/qt5-base/mingw-w64/PKGBUILD
+++ b/qt5-base/mingw-w64/PKGBUILD
@ -17,10 +17,10 @@
 _qt_module=qtbase
 pkgname=mingw-w64-qt5-base
-pkgver=5.15.4+kde+r135
+pkgver=5.15.6+kde+r165
 pkgrel=1
 _basever=${pkgver%%+*}
-_commit=e0a15c11b853954d4189b2e30aa2450184de0987
+_commit=eeadc036d77b75bec5b7c41869688c7db9a2e221
 pkgdesc='A cross-platform application and UI framework, native OpenGL backend (mingw-w64)'
 arch=('i686' 'x86_64')
 url='https://www.qt.io/'
@ -68,42 +68,40 @@ 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'
-            'e54366498a5374c85164e883c58f7274bf231ec285ba6dc0c7eadad9ec3ffbb1'
+            'c41a27864036608b0356c240d48fb105b6afbd47a976e36908c9aed327d7b7cb'
-            '2962c1a34f36a28401bac0d90b808a79567a4d3105f22ba3534a8f9a16e77c77'
+            'a69ef91d9f42adc4d5796dd268dd58710fd080fb938fa3a65889b6ad517ccaf0'
-            '8d5cee5485be27fde395488328c4ae3751d8b6f99b2fb975178dedaa776c17de'
+            '260a3fb5f812c2dfa515eb2585c395ffb2b00a5ee86ab21f580c70ba2ef6ece5'
-            '0465f1a8f8830106164d86d18514cc1558c7cb0d057e3f8d1902f9e3bd9fb23b'
+            '5a6539b00e1459016554d04c4c4e7951989528c012dd5ed01a5ef5a1a01d326e'
-            'ed5f2b71229201bce7563f5f91d89e059779a49b9c6c91596224332169083507'
+            'b029b7a73680b9b972d8c29be109133b75834c76b3c99533382e7145d9cdadff'
-            '8de6b8c5405917589a6847f69b02d4940a021737c355a25b3f163cdab548b711'
+            '40267b7089d95c59899b5fb2a2ce8c9ce66b284e8ca222ecf56839bbc8619be6'
-            '502cb54d8b77c71b7812dca378c079bcdeb0f0bc991095131896974eed20e04c'
+            '75afb4b6eab560d55058f170565944774fb534bcfe077acf95035f331dce321f'
-            '1ee4ec6ee02f049d8d991d0a56fcd6a687a3a7cc368d5b937a98ee0f52834584'
+            'e76976133fa5b31d57a4b05b8aad5369559f50c93f9e4a3cb75a4645fee0c017'
-            'cc2d8d8daf4ae578690cf50b81196aeff0e9f44672ed30ceb33a41abae42099d'
+            'f4867d176bda13c506543b630931d1efe3b0c8e02d80fd81cca6de9a53ed9fea'
-            'e16188f688e03da51f909151915d201666853a909f132a137c1505daa87d87eb'
+            '2049f9afc17877edc8014ad1abfa7492d7208fc6a1e97f90c6ff3e8fd89ed853'
-            '31bcdb687bf1d0bd0ee789cf5c67ebbfb8e379757f9d4ebb02f16486a1bcc4f0'
+            'b8d69fa14f6e14aaf98e2e9ca201b0e54ea066c70f514d84e652e2dc06d75bba'
-            '7f6c2cb002446f6f24450a6bf6bcd07db46a2cbfc065d751cda1334da0a1facc'
+            'c021e47b0452c47a7b486596324f62fdc192665a6c476cb7fad9207340b7fe5f'
-            '903554c186f1876d01e9a2383820f257bac604a964550cbb1d01b25f374b7872'
+            '0aa2ec748924f3fa1ebe16645c581f6b5d5bf82186e58407c8ee0597e7547a10'
-            '9f29ba92db17e4690ecb10977aca1e3d9212bec143562664a5c2562c9c9e7ade'
+            'b2ffe203da527c95936806121d646bcf03026b0a7cc8ada2f60d4d26284028b3'
-            '911c46fa0a4b8993ae061f91ff2874567ffe40fe5f79930b926aa79c9c2e351f'
+            'bfddd2c8c44bab7f7995623bdcb89fd3ff8fbe9125522b1bb50b43efe297ee13'
-            'bd7ad72c515c519213eb5e3512a6079830f86970a2de5c4a4d58d0c602f35422'
+            'a9e9ac55bd881390b41b49a06f11c3441a008409527f7fce3d337df6820598c6'
-            '07551376ed340d12093ca2f22e354f47b14bff050f83f04eb9b65c91ffa9a0a3'
+            'fb8de523d608ded6a6f6ca82d884af7bd086091e10d492902363f4f3f90f1a5b'
-            '6014b68b4fc357a05cde75a4c84fce9cfcda2ce21368ca3f382756025dce9732'
+            '4d6f76f552cd0eaae0ae8e9ea8232f36ad140680c2d04ed70e792c11b85c86ac'
-            'b522c9c8d2f04ee44d26a32ee0e7b5408e9fb54cc15dda718cf1e8ba03e52157'
+            'bb0bfd9431d103af36d4b09134f3f9f1ac7a05feeb7779e6c15d447593ce6381'
-            '8ea4685376fed385f99c304161597e2f11f942b43efefdb94ee448b2a74f8aeb'
+            'af6014fb1c311b91a1390898d25622d6aba555a0a30724dd953af2ea17cad6c5'
-            'ed71ed12749f8948088dfcec3a980ff7033c7db78d1543888ac1f869bd422e30'
+            'ab620d4da6897d0b5fed70f8ac01febb46b9ff6e04e8fb49b4c1a2cb8527994f'
-            '846b354c2a8a8dd9e85fcbaf2c079627fa33cf8a49349b208a2e4d1698663181'
+            'e7217028a44537e40ddac73ac49630f77a361ecd20d6c40f6482517ae3103939'
-            '9a791909b3adb5c94ddfd4f3b25637190b3327307873d7da6003c082d84a11e8'
+            '7937d08e1aaf5bb59161e84ecd23cb0ea6a251eae0b98a8291e126442bf048f1'
-            'aefa30834e2d8006768591277e6f06afb4f2e79b19fca357d8b05a9fb57153f1'
+            'ed37dc1bef6aee8e842c347ebe4fb3a4435887a15664f98487466d771d85f15e'
-            '93b941ffbb75ed7d6177e8b41c7a39f64b3607955a2102e069c60ae832e6beac'
+            '071cce97add50db7e4703c6798afc42500405276043b2e5e6e9a5cf80556726c'
-            'a7d547da8f8aae320f0f65476dc3bd95c6d9339a6b56793c8a8232432e501874'
+            '62ae5fbeace74ba9830c185f45432decd5f0f8305767d9a3b9bfac27647f5a7c'
-            'a205639ac75464ee2d3a278791262894079b2f1d6b7e4802ccb6b56ac6952be8'
+            '9fae7c2dc88a27322bdb32748ea03fac1a04d8d35327acce05be511dd00b04e2'
-            'faebb2d05cdc748d69f397c237433a7a27aab50922b7b57511a4f03524ec04cd'
+            '06836073078a6cb304931443eab9306baee29d1c19f167765cff238bd34ae78d'
-            '3095c5da24a9e2d572627acf24c4eb36a4f575d564ee17c59b3e6879bfd8dd40'
+            '484996266fe418c1b5db76eec61d1bce1bc163546f534acf8343b0f77796cab7'
-            'b1276acc58de81e72c9bfa456af1328c3bb21615fe42a577e25d21bd77c7c17c'
+            '94852f7bd841f0ded357e9d0a5c6e53434711df1b701674da49f4f1a8f61a26b'
-            '5761551f4c3ba63d357acdb3e313ef4e0cf64b44394484b757cc8725062e2eb6'
+            '242f068c25d72ed8f67790d2c629b4aea2f13053760a9c8de43cab26c620bfe1'
-            'acefce75b6659a72d611609c7edf6ad8478bc8af018e8a37085d52415faae505'
+            '5f83de1635acee180f65019ccd37112f284552d6d4831b770a1a0c0119f17f5e')
            '0d654b878944c128a9cd47cafddd0cc1d326dfbcf6b8d607edeebe1d4c92f2c5')
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
--- a/qt5-charts/mingw-w64-static/PKGBUILD
+++ b/qt5-charts/mingw-w64-static/PKGBUILD
@ -9,7 +9,7 @@
 _qt_module=qtcharts
 pkgname=mingw-w64-qt5-charts-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Provides a set of easy to use chart components (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base-static' 'mingw-w64-pkg-config')
 optdepends=('mingw-w64-qt5-declarative-static: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-declarative-static')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5
+_commit=841083c263f16f8acb81e4915bf24bbed0461c9a
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-charts/mingw-w64/PKGBUILD
+++ b/qt5-charts/mingw-w64/PKGBUILD
@ -9,7 +9,7 @@
 _qt_module=qtcharts
 pkgname=mingw-w64-qt5-charts
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Provides a set of easy to use chart components (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base' 'mingw-w64-pkg-config')
 optdepends=('mingw-w64-qt5-declarative: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-declarative')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=16c2a8821135bf89369c4e3c5a1bdff8b05ffdb5
+_commit=841083c263f16f8acb81e4915bf24bbed0461c9a
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-charts/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-charts/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt5-module';
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Provides a set of easy to use chart components (mingw-w64)"
--- a/qt5-connectivity/mingw-w64-static/PKGBUILD
+++ b/qt5-connectivity/mingw-w64-static/PKGBUILD
@ -9,16 +9,16 @@
 _qt_module=qtconnectivity
 pkgname=mingw-w64-qt5-connectivity-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to Bluetooth hardware (mingw-w64)"
 depends=('mingw-w64-qt5-base-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative-static')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=25720ab6004cf37ae54ad85d22f87f5fc9e6e72e
+_commit=01e8b04b121712ea0a2b2793ce13f4dd5e9cfcf8
 _basever=$pkgver
-pkgver+=+kde+r4
+pkgver+=+kde+r5
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-connectivity/mingw-w64/PKGBUILD
+++ b/qt5-connectivity/mingw-w64/PKGBUILD
@ -9,16 +9,16 @@
 _qt_module=qtconnectivity
 pkgname=mingw-w64-qt5-connectivity
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to Bluetooth hardware (mingw-w64)"
 depends=('mingw-w64-qt5-base')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=25720ab6004cf37ae54ad85d22f87f5fc9e6e72e
+_commit=01e8b04b121712ea0a2b2793ce13f4dd5e9cfcf8
 _basever=$pkgver
-pkgver+=+kde+r4
+pkgver+=+kde+r5
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-connectivity/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt5-module';
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to Bluetooth hardware (mingw-w64)"
--- a/qt5-datavis3d/mingw-w64-static/PKGBUILD
+++ b/qt5-datavis3d/mingw-w64-static/PKGBUILD
@ -9,7 +9,7 @@
 _qt_module=qtdatavis3d
 pkgname=mingw-w64-qt5-datavis3d-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Qt Data Visualization module (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base-static')
 optdepends=('mingw-w64-qt5-declarative-static: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative-static')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=5f8e2a037d5201c902149c828d102b71e90257e2
+_commit=502612c72a2cd3b3b0c4cff926e7764d74106d33
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-datavis3d/mingw-w64/PKGBUILD
+++ b/qt5-datavis3d/mingw-w64/PKGBUILD
@ -9,7 +9,7 @@
 _qt_module=qtdatavis3d
 pkgname=mingw-w64-qt5-datavis3d
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Qt Data Visualization module (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base')
 optdepends=('mingw-w64-qt5-declarative: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=5f8e2a037d5201c902149c828d102b71e90257e2
+_commit=502612c72a2cd3b3b0c4cff926e7764d74106d33
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-datavis3d/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-datavis3d/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt5-module';
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Qt Data Visualization module (mingw-w64)"
--- a/qt5-declarative/mingw-w64-static/PKGBUILD
+++ b/qt5-declarative/mingw-w64-static/PKGBUILD
@ -14,16 +14,16 @@
 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
 depends=('mingw-w64-qt5-base-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'python')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=51efb2ed2f071beda188270a23ac450fe4b318f7
+_commit=e1ecf1c4e09b2f1d04f94971771019e59a50679f
 _basever=$pkgver
-pkgver+=+kde+r17
+pkgver+=+kde+r19
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
@ -34,9 +34,9 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
        '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch'
        '0003-Disable-d3d12-requiring-fxc.exe.patch')
 sha256sums=('SKIP'
-            'a27f544db7c19991ef1ba785b3faaa159f71e035c05009467155c59ffcee95d7'
+            '93ca828371ec1ca99cf94c0f57a6558ee362190120dc009146aff0c4d9afea8a'
-            'da409a2ce953a69545cf27294d4de042bd66fda42c9442a0922192b452321a83'
+            '382e8325139c465a9b687d6b40c2b81e74258fbf30e8feacb19cb80372ca0b86'
-            '142eb48c75dcd6b707550bf978b8f4125ea8ef2333fc6dd6b50e7de43f6eecd3')
+            '560e481e059960d957a5ed6e9b0a96c5a62b1ca0198203dbe490a454b9ee2608')
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
--- a/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch
+++ b/qt5-declarative/mingw-w64/0001-Ensure-static-plugins-are-exported.patch
@ -1,4 +1,4 @@
-From e6e8b269ace9857c3ca487201bbd3566cd6f39a6 Mon Sep 17 00:00:00 2001
+From 83e49e77be2f909caab679b3b26f3f63d5f410ad Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 23 Oct 2016 01:18:13 +0200
 Subject: [PATCH 1/3] Ensure static plugins are exported
@ -19,5 +19,5 @@ index 4242143bca..bccb7b3146 100644
     foreach(_other_plugin ${_qt5qml_other_plugins})
         include(${_other_plugin} OPTIONAL)
 -- 
-2.36.1
+2.37.3
--- a/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
+++ b/qt5-declarative/mingw-w64/0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch
@ -1,4 +1,4 @@
-From 7177e5dad754a9266d2dd8a6d4485e5fc35437d9 Mon Sep 17 00:00:00 2001
+From 228400565e48d53d0b6c0b79a29484af5e08adc2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 4 Feb 2017 01:59:59 +0100
 Subject: [PATCH 2/3] Prevent exporting QML parser symbols on static build
@ -33,5 +33,5 @@ index bf8155c6ec..2bfa230bcc 100644
 #      define QML_PARSER_EXPORT
 #    elif defined(QT_BUILD_QML_LIB)
 -- 
-2.36.1
+2.37.3
--- a/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch
+++ b/qt5-declarative/mingw-w64/0003-Disable-d3d12-requiring-fxc.exe.patch
@ -1,4 +1,4 @@
-From dfb96194f58dd199ade22c34fcdd9b93c53d4739 Mon Sep 17 00:00:00 2001
+From 0445f6c4f3755318c39bb5207031f230bdbb270b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 20 Nov 2020 18:32:31 +0100
 Subject: [PATCH 3/3] Disable d3d12 requiring fxc.exe
@ -29,5 +29,5 @@ index 39c0c0815c..9cc521a191 100644
 qtConfig(openvg): SUBDIRS += openvg
 -- 
-2.36.1
+2.37.3
--- a/qt5-declarative/mingw-w64/PKGBUILD
+++ b/qt5-declarative/mingw-w64/PKGBUILD
@ -14,16 +14,16 @@
 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
 depends=('mingw-w64-qt5-base')
 makedepends=('mingw-w64-gcc' 'mingw-w64-vulkan-headers' 'mingw-w64-pkg-config' 'python')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=51efb2ed2f071beda188270a23ac450fe4b318f7
+_commit=e1ecf1c4e09b2f1d04f94971771019e59a50679f
 _basever=$pkgver
-pkgver+=+kde+r17
+pkgver+=+kde+r19
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
@ -34,9 +34,9 @@ source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
        '0002-Prevent-exporting-QML-parser-symbols-on-static-build.patch'
        '0003-Disable-d3d12-requiring-fxc.exe.patch')
 sha256sums=('SKIP'
-            'a27f544db7c19991ef1ba785b3faaa159f71e035c05009467155c59ffcee95d7'
+            '93ca828371ec1ca99cf94c0f57a6558ee362190120dc009146aff0c4d9afea8a'
-            'da409a2ce953a69545cf27294d4de042bd66fda42c9442a0922192b452321a83'
+            '382e8325139c465a9b687d6b40c2b81e74258fbf30e8feacb19cb80372ca0b86'
-            '142eb48c75dcd6b707550bf978b8f4125ea8ef2333fc6dd6b50e7de43f6eecd3')
+            '560e481e059960d957a5ed6e9b0a96c5a62b1ca0198203dbe490a454b9ee2608')
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
--- a/qt5-declarative/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-declarative/mingw-w64/PKGBUILD.sh.ep
@ -6,7 +6,7 @@
 # Contributor: ohmyarch
 % end
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
--- a/qt5-gamepad/mingw-w64-static/PKGBUILD
+++ b/qt5-gamepad/mingw-w64-static/PKGBUILD
@ -9,7 +9,7 @@
 _qt_module=qtgamepad
 pkgname=mingw-w64-qt5-gamepad-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base-static' 'mingw-w64-sdl2')
 optdepends=('mingw-w64-qt5-declarative-static: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative-static')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=8526b210146a2d030ae2f55ad44261befea4a087
+_commit=0a2d4651362810600d2ff7272772d5908bb8714b
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-gamepad/mingw-w64/PKGBUILD
+++ b/qt5-gamepad/mingw-w64/PKGBUILD
@ -9,7 +9,7 @@
 _qt_module=qtgamepad
 pkgname=mingw-w64-qt5-gamepad
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base' 'mingw-w64-sdl2')
 optdepends=('mingw-w64-qt5-declarative: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config' 'mingw-w64-qt5-declarative')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=8526b210146a2d030ae2f55ad44261befea4a087
+_commit=0a2d4651362810600d2ff7272772d5908bb8714b
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-gamepad/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-gamepad/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt5-module';
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)"
--- a/qt5-graphicaleffects/mingw-w64-static/PKGBUILD
+++ b/qt5-graphicaleffects/mingw-w64-static/PKGBUILD
@ -11,14 +11,14 @@
 _qt_module=qtgraphicaleffects
 pkgname=mingw-w64-qt5-graphicaleffects-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)"
 depends=('mingw-w64-qt5-declarative-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=4c6ec38635aa22cf0854df8e710733c529f4ec02
+_commit=e6e1e58ec28fd0f2e6426e6962cc4ccddb493349
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-graphicaleffects/mingw-w64/PKGBUILD
+++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD
@ -11,14 +11,14 @@
 _qt_module=qtgraphicaleffects
 pkgname=mingw-w64-qt5-graphicaleffects
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)"
 depends=('mingw-w64-qt5-declarative')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=4c6ec38635aa22cf0854df8e710733c529f4ec02
+_commit=e6e1e58ec28fd0f2e6426e6962cc4ccddb493349
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-graphicaleffects/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD.sh.ep
@ -5,7 +5,7 @@
 # Contributor: Filip Brcic <brcha@gna.org>
 % end
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)"
--- a/qt5-imageformats/mingw-w64-static/PKGBUILD
+++ b/qt5-imageformats/mingw-w64-static/PKGBUILD
@ -11,7 +11,7 @@
 _qt_module=qtimageformats
 pkgname=mingw-w64-qt5-imageformats-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)"
@ -22,9 +22,9 @@ depends=('mingw-w64-qt5-base-static')
 #depends+=('mingw-w64-libwebp') # for WebP
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=8c5bcabbf6a2e27539c2ad689fd69f2406d5cf5c
+_commit=9044695f4b1acdd7ec24e7b01f6a6ca61f982a75
 _basever=$pkgver
-pkgver+=+kde+r0
+pkgver+=+kde+r4
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-imageformats/mingw-w64/PKGBUILD
+++ b/qt5-imageformats/mingw-w64/PKGBUILD
@ -11,7 +11,7 @@
 _qt_module=qtimageformats
 pkgname=mingw-w64-qt5-imageformats
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)"
@ -22,9 +22,9 @@ depends=('mingw-w64-qt5-base')
 #depends+=('mingw-w64-libwebp') # for WebP
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=8c5bcabbf6a2e27539c2ad689fd69f2406d5cf5c
+_commit=9044695f4b1acdd7ec24e7b01f6a6ca61f982a75
 _basever=$pkgver
-pkgver+=+kde+r0
+pkgver+=+kde+r4
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-imageformats/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-imageformats/mingw-w64/PKGBUILD.sh.ep
@ -5,7 +5,7 @@
 # Contributor: Filip Brcic <brcha@gna.org>
 % end
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)"
--- a/qt5-location/mingw-w64-static/PKGBUILD
+++ b/qt5-location/mingw-w64-static/PKGBUILD
@ -15,16 +15,16 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic
 _qt_module=qtlocation
 pkgname=mingw-w64-qt5-location-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)'
 depends=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-declarative-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=db3b6bc6afed6477e6ab2d8465e41efee30fb6d5
+_commit=ebdf5b38da6e3fe0a183702bcca395c589c459ed
 _basever=$pkgver
-pkgver+=+kde+r2
+pkgver+=+kde+r3
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-location/mingw-w64/PKGBUILD
+++ b/qt5-location/mingw-w64/PKGBUILD
@ -15,16 +15,16 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic
 _qt_module=qtlocation
 pkgname=mingw-w64-qt5-location
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)'
 depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=db3b6bc6afed6477e6ab2d8465e41efee30fb6d5
+_commit=ebdf5b38da6e3fe0a183702bcca395c589c459ed
 _basever=$pkgver
-pkgver+=+kde+r2
+pkgver+=+kde+r3
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-location/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-location/mingw-w64/PKGBUILD.sh.ep
@ -12,7 +12,7 @@ _additional_qmake_args+='-- -no-feature-geoservices_mapbox -no-feature-geoservic
 % end
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)'
--- a/qt5-multimedia/mingw-w64-static/PKGBUILD
+++ b/qt5-multimedia/mingw-w64-static/PKGBUILD
@ -12,16 +12,16 @@
 _qt_module=qtmultimedia
 pkgname=mingw-w64-qt5-multimedia-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
 depends=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-declarative-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=dc0ee181d4c56ff66c989bd3292dad7cc35e234b
+_commit=76f84c545429a1b988b79f971734ef4bc3e6643f
 _basever=$pkgver
-pkgver+=+kde+r0
+pkgver+=+kde+r1
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-multimedia/mingw-w64/PKGBUILD
+++ b/qt5-multimedia/mingw-w64/PKGBUILD
@ -12,16 +12,16 @@
 _qt_module=qtmultimedia
 pkgname=mingw-w64-qt5-multimedia
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
 depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=dc0ee181d4c56ff66c989bd3292dad7cc35e234b
+_commit=76f84c545429a1b988b79f971734ef4bc3e6643f
 _basever=$pkgver
-pkgver+=+kde+r0
+pkgver+=+kde+r1
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-multimedia/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-multimedia/mingw-w64/PKGBUILD.sh.ep
@ -4,7 +4,7 @@
 # Contributor: ant32 <antreimer@gmail.com>
 % end
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
--- a/qt5-networkauth/mingw-w64-static/PKGBUILD
+++ b/qt5-networkauth/mingw-w64-static/PKGBUILD
@ -10,7 +10,7 @@
 _qt_module=qtnetworkauth
 pkgname=mingw-w64-qt5-networkauth-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Network authentication module (mingw-w64)"
@ -18,7 +18,7 @@ depends=('mingw-w64-qt5-base-static')
 optdepends=()
 makedepends=('mingw-w64-gcc')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=2b0c9499e4000858138802e8f5aa28aa2ebe14c0
+_commit=01315e31c5164c896a524175854c4b6df17fe166
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-networkauth/mingw-w64/PKGBUILD
+++ b/qt5-networkauth/mingw-w64/PKGBUILD
@ -10,7 +10,7 @@
 _qt_module=qtnetworkauth
 pkgname=mingw-w64-qt5-networkauth
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Network authentication module (mingw-w64)"
@ -18,7 +18,7 @@ depends=('mingw-w64-qt5-base')
 optdepends=()
 makedepends=('mingw-w64-gcc')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=2b0c9499e4000858138802e8f5aa28aa2ebe14c0
+_commit=01315e31c5164c896a524175854c4b6df17fe166
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-networkauth/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-networkauth/mingw-w64/PKGBUILD.sh.ep
@ -4,7 +4,7 @@
 # Contributor: ant32 <antreimer@gmail.com>
 % end
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Network authentication module (mingw-w64)"
--- a/qt5-quickcontrols/mingw-w64-static/PKGBUILD
+++ b/qt5-quickcontrols/mingw-w64-static/PKGBUILD
@ -11,14 +11,14 @@
 _qt_module=qtquickcontrols
 pkgname=mingw-w64-qt5-quickcontrols-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)"
 depends=('mingw-w64-qt5-declarative-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=d405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b
+_commit=e62b8b6d2f45a79652238b33f4bbe23023004ae7
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-quickcontrols/mingw-w64/PKGBUILD
+++ b/qt5-quickcontrols/mingw-w64/PKGBUILD
@ -11,14 +11,14 @@
 _qt_module=qtquickcontrols
 pkgname=mingw-w64-qt5-quickcontrols
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)"
 depends=('mingw-w64-qt5-declarative')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=d405bf6a29bc9d6da6e3dcefbd1b88f5ed70fb1b
+_commit=e62b8b6d2f45a79652238b33f4bbe23023004ae7
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-quickcontrols/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-quickcontrols/mingw-w64/PKGBUILD.sh.ep
@ -5,7 +5,7 @@
 # Contributor: Filip Brcic <brcha@gna.org>
 % end
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)"
--- a/qt5-quickcontrols2/mingw-w64-static/PKGBUILD
+++ b/qt5-quickcontrols2/mingw-w64-static/PKGBUILD
@ -11,16 +11,16 @@
 _qt_module=qtquickcontrols2
 pkgname=mingw-w64-qt5-quickcontrols2-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)"
 depends=('mingw-w64-qt5-declarative-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=0d3d39e821ea7634c174a29910c18d7101bce6f7
+_commit=74e8db97fdb9b55c4b4614b83f4bf17e00df55e9
 _basever=$pkgver
-pkgver+=+kde+r4
+pkgver+=+kde+r5
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-quickcontrols2/mingw-w64/PKGBUILD
+++ b/qt5-quickcontrols2/mingw-w64/PKGBUILD
@ -11,16 +11,16 @@
 _qt_module=qtquickcontrols2
 pkgname=mingw-w64-qt5-quickcontrols2
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)"
 depends=('mingw-w64-qt5-declarative')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=0d3d39e821ea7634c174a29910c18d7101bce6f7
+_commit=74e8db97fdb9b55c4b4614b83f4bf17e00df55e9
 _basever=$pkgver
-pkgver+=+kde+r4
+pkgver+=+kde+r5
 makedepends+=('git')
 options=('!strip' '!buildflags' 'staticlibs')
 groups=('mingw-w64-qt5')
--- a/qt5-quickcontrols2/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-quickcontrols2/mingw-w64/PKGBUILD.sh.ep
@ -5,7 +5,7 @@
 # Contributor: Filip Brcic <brcha@gna.org>
 % end
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)"
--- a/qt5-remoteobjects/mingw-w64-static/PKGBUILD
+++ b/qt5-remoteobjects/mingw-w64-static/PKGBUILD
@ -9,7 +9,7 @@
 _qt_module=qtremoteobjects
 pkgname=mingw-w64-qt5-remoteobjects-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base-static')
 optdepends=('mingw-w64-qt5-declarative-static: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-declarative-static')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=809412e1cc2151c21f843796ef67705600f6aafb
+_commit=aa705010da0f658b78c1155babce7091ae44529a
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-remoteobjects/mingw-w64/PKGBUILD
+++ b/qt5-remoteobjects/mingw-w64/PKGBUILD
@ -9,7 +9,7 @@
 _qt_module=qtremoteobjects
 pkgname=mingw-w64-qt5-remoteobjects
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)"
@ -17,7 +17,7 @@ depends=('mingw-w64-qt5-base')
 optdepends=('mingw-w64-qt5-declarative: QML bindings')
 makedepends=('mingw-w64-gcc' 'mingw-w64-qt5-declarative')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=809412e1cc2151c21f843796ef67705600f6aafb
+_commit=aa705010da0f658b78c1155babce7091ae44529a
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-remoteobjects/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-remoteobjects/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt5-module';
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
 pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)"
--- a/qt5-script/mingw-w64-static/PKGBUILD
+++ b/qt5-script/mingw-w64-static/PKGBUILD
@ -11,8 +11,8 @@
 _qt_module=qtscript
 pkgname=mingw-w64-qt5-script-static
-_basever=5.15.4
+_basever=5.15.6
-pkgver=5.15.9
+pkgver=5.15.10
 pkgrel=1
 arch=('any')
 pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)"
--- a/qt5-script/mingw-w64/PKGBUILD
+++ b/qt5-script/mingw-w64/PKGBUILD
@ -11,8 +11,8 @@
 _qt_module=qtscript
 pkgname=mingw-w64-qt5-script
-_basever=5.15.4
+_basever=5.15.6
-pkgver=5.15.9
+pkgver=5.15.10
 pkgrel=1
 arch=('any')
 pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)"
--- a/qt5-script/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-script/mingw-w64/PKGBUILD.sh.ep
@ -11,8 +11,8 @@
 % end
 % stash(is_lts => 1);
 \
-_basever=5.15.4
+_basever=5.15.6
-pkgver=5.15.9
+pkgver=5.15.10
 pkgrel=1
 arch=('any')
 pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)"
--- a/qt5-scxml/mingw-w64-static/PKGBUILD
+++ b/qt5-scxml/mingw-w64-static/PKGBUILD
@ -9,14 +9,14 @@
 _qt_module=qtscxml
 pkgname=mingw-w64-qt5-scxml-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)"
 depends=('mingw-w64-qt5-declarative-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=dcbd73cf3e8a07dbfa249d7db2257caafa83781b
+_commit=631fd7bcc34802b7650c2b1dc73691463954d982
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-scxml/mingw-w64/PKGBUILD
+++ b/qt5-scxml/mingw-w64/PKGBUILD
@ -9,14 +9,14 @@
 _qt_module=qtscxml
 pkgname=mingw-w64-qt5-scxml
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)"
 depends=('mingw-w64-qt5-declarative')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=dcbd73cf3e8a07dbfa249d7db2257caafa83781b
+_commit=631fd7bcc34802b7650c2b1dc73691463954d982
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-scxml/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-scxml/mingw-w64/PKGBUILD.sh.ep
@ -1,6 +1,6 @@
 % layout 'mingw-w64-qt5-module';
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=(<%== include 'fragments/mingw-w64-qt5-non_any_archs' %>)
 pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)"
--- a/qt5-sensors/mingw-w64-static/PKGBUILD
+++ b/qt5-sensors/mingw-w64-static/PKGBUILD
@ -11,14 +11,14 @@
 _qt_module=qtsensors
 pkgname=mingw-w64-qt5-sensors-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)"
 depends=('mingw-w64-qt5-base-static' 'mingw-w64-qt5-declarative-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=1ab8d6c7257f9ec060739b648704be1cf1c16b05
+_commit=35eb5ac7eaef4745a38958c3ca780d7baa2e4f30
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-sensors/mingw-w64/PKGBUILD
+++ b/qt5-sensors/mingw-w64/PKGBUILD
@ -11,14 +11,14 @@
 _qt_module=qtsensors
 pkgname=mingw-w64-qt5-sensors
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)"
 depends=('mingw-w64-qt5-base' 'mingw-w64-qt5-declarative')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=1ab8d6c7257f9ec060739b648704be1cf1c16b05
+_commit=35eb5ac7eaef4745a38958c3ca780d7baa2e4f30
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-sensors/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-sensors/mingw-w64/PKGBUILD.sh.ep
@ -5,7 +5,7 @@
 # Contributor: Filip Brcic <brcha@gna.org>
 % end
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)"
--- a/qt5-serialport/mingw-w64-static/PKGBUILD
+++ b/qt5-serialport/mingw-w64-static/PKGBUILD
@ -10,14 +10,14 @@
 _qt_module=qtserialport
 pkgname=mingw-w64-qt5-serialport-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)"
 depends=('mingw-w64-qt5-base-static')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=191e67e428522a0e2e1e8d2f3440607a9760d441
+_commit=c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-serialport/mingw-w64/PKGBUILD
+++ b/qt5-serialport/mingw-w64/PKGBUILD
@ -10,14 +10,14 @@
 _qt_module=qtserialport
 pkgname=mingw-w64-qt5-serialport
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)"
 depends=('mingw-w64-qt5-base')
 makedepends=('mingw-w64-gcc' 'mingw-w64-pkg-config')
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
-_commit=191e67e428522a0e2e1e8d2f3440607a9760d441
+_commit=c9abfcd5d88cb43c2a7c1d5ddecbff4cdd320694
 _basever=$pkgver
 pkgver+=+kde+r0
 makedepends+=('git')
--- a/qt5-serialport/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-serialport/mingw-w64/PKGBUILD.sh.ep
@ -4,7 +4,7 @@
 # Contributor: ant32 <antreimer@gmail.com>
 % end
 \
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to hardware and virtual serial ports (mingw-w64)"
--- a/qt5-speech/mingw-w64-static/PKGBUILD
+++ b/qt5-speech/mingw-w64-static/PKGBUILD
@ -9,7 +9,7 @@
 _qt_module=qtspeech
 pkgname=mingw-w64-qt5-speech-static
-pkgver=5.15.4
+pkgver=5.15.6
 pkgrel=1
 arch=('any')
 pkgdesc="Qt module to make text to speech and speech recognition easy (mingw-w64)"
@ -20,7 +20,7 @@ makedepends=('mingw-w64-gcc')
 #optdepends=('mingw-w64-flite: flite TTS backend' 'mingw-w64-speech-dispatcher: speech-dispatcher TTS backend')
 #makedepends=('mingw-w64-gcc' 'mingw-w64-flite' 'mingw-w64-speech-dispatcher')
 license=('GPL3' 'LGPL' 'FDL' 'custom')
-_commit=c8a1dadc46ccdbeaef45aa805a9dc98d4b3220bd
+_commit=d1273416f25a15a6edf6ea56a07602cd7d99fe48
 _basever=$pkgver
 pkgver+=+kde+r1
 makedepends+=('git')
--- a/Show More
+++ b/Show More
		`@ -1 +0,0 @@`
			`../mingw-w64/0033-Handle-even-more-include-in-enum-cases.patch`