Update mingw-w64-qt5 to 5.14.1

2020-01-28 21:12:38 +01:00 · 2020-01-28 21:12:38 +01:00 · 7bbd52b9eb
parent 34bbd66404
commit 7bbd52b9eb
246 changed files with 1199 additions and 1102 deletions
--- a/devel/apply-versions.sh
+++ b/devel/apply-versions.sh
@ -31,6 +31,10 @@ for pkgbuild_file in "${PKGBUILD_DIR:-.}"/*/*/PKGBUILD; do
    source "$pkgbuild_file"
    [[ $version == $pkgver ]] && continue

+    # check if template exists and modify template instead
+    template=$pkgbuild_file.sh.ep
+    [[ -f $template ]] && pkgbuild_file=$template
+
    # apply new version
    sed -i -e "s/^pkgver=.*/pkgver=$version/" -e "s/pkgrel=.*/pkgrel=1/" "$pkgbuild_file"
    chmod 644 "$pkgbuild_file"
--- a/devel/generator/generate.pl
+++ b/devel/generator/generate.pl
@ -85,6 +85,7 @@ for my $top_level_dir (@$top_level_dirs) {
                    qt_module_sha256 => $qt_module_sha256,
                    shared_config => 1,
                    static_config => 1,
+                    no_libraries => 0,
                },
            ]
        });
--- a/devel/generator/templates/layouts/mingw-w64-qt5-module.sh.ep
+++ b/devel/generator/templates/layouts/mingw-w64-qt5-module.sh.ep
@ -85,6 +85,7 @@ package() {

      make INSTALL_ROOT="$pkgdir" install
 <%== content_for 'package_config_after_install' %>\
+% unless ($no_libraries) {

      # use prl files from build directory since installed prl files seem to have incorrect QMAKE_PRL_LIBS_FOR_CMAKE
      if [[ -d 'lib' ]]; then
@ -120,13 +121,16 @@ package() {
      [[ -d "${pkgdir}/usr/${_arch}/lib/qt/bin/" ]] && \\
        find "${pkgdir}/usr/${_arch}/lib/qt/bin/" -exec strip --strip-all {} \;
      find "${pkgdir}/usr/${_arch}/lib/" -iname "*.so.$pkgver" -exec strip --strip-unneeded {} \;
+% }
 <%== content_for 'package_config' %>\
      popd
    done
 <%== content_for 'package_arch' %>\
+% unless ($no_libraries) {

    # drop QMAKE_PRL_BUILD_DIR because reference the build dir
    find "${pkgdir}/usr/${_arch}/lib" -type f -name '*.prl' -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;
+% }
  done
 <%== content_for 'package' %>\
 }
--- a/devel/qt5/update-patches.sh
+++ b/devel/qt5/update-patches.sh
@ -55,7 +55,11 @@ if ! [[ -d $wd ]]; then
    exit -2
 fi

-source "$dest/PKGBUILD"
+pkgbuild_path=$dest/PKGBUILD
+template=$pkgbuild_path.sh.ep has_template=
+[[ -f $template ]] && has_template=1
+
+source "$pkgbuild_path"

 new_sources=()
 new_md5sums=()
@ -86,8 +90,13 @@ fi
 git format-patch "origin/${pkgver}" --output-directory "$dest"
 popd > /dev/null

+# skip if building all Qt modules in one package (currently used for Android target)
 [[ $pkgdir == qt5 ]] && exit 0

+# skip if a template file is present (then the patch list is generated by the template
+# system)
+[[ -f $has_template ]] && exit 0
+
 new_patches=("$dest"/*.patch)
 for patch in "${new_patches[@]}"; do
    new_sources+=("$patch")
@ -96,7 +105,7 @@ for patch in "${new_patches[@]}"; do
 done

 # preserve first src line to keep variables unevaluated
-newsrc=$(grep 'source=(' "$dest/PKGBUILD")
+newsrc=$(grep 'source=(' "$pkgbuild_path")
 [[ $newsrc ]] || newsrc="source=(${new_sources[0]}"
 [ "${newsrc: -1:1}" == ')' ] && newsrc="${newsrc: 0:-1}" # truncate trailing )
 for source in "${new_sources[@]:1}"; do
@ -111,7 +120,7 @@ done
 newsums+=')'

 # apply changes
-mv "$dest/PKGBUILD" "$dest/PKGBUILD.bak"
+mv "$pkgbuild_path" "$pkgbuild_path.bak"
 awk -v newsrc="$newsrc" -v newsums="$newsums" '
    /^[[:blank:]]*source(_[^=]+)?=/,/\)[[:blank:]]*(#.*)?$/ {
        if (!s) {
@ -137,4 +146,4 @@ awk -v newsrc="$newsrc" -v newsums="$newsums" '
            print newsums
        }
    }
-' "$dest/PKGBUILD.bak" > "$dest/PKGBUILD"
+' "$pkgbuild_path.bak" > "$pkgbuild_path"
--- a/devel/versions.sh
+++ b/devel/versions.sh
@ -12,7 +12,7 @@ declare -A versions=(
    [blackwidowcontrol]=1.0.1
    [dbus-soundrecorder]=1.2.3
    [geocoordinatecalculator]=1.1.3
-    [qt5]=5.14.0
+    [qt5]=5.14.1
 )
 declare -A github_names=(
    [c++utilities]=cpp-utilities
--- a/qt5-3d/mingw-w64/PKGBUILD
+++ b/qt5-3d/mingw-w64/PKGBUILD
@ -13,7 +13,7 @@

 _qt_module=qt3d
 pkgname=mingw-w64-qt5-3d
-pkgver=5.14.0
+pkgver=5.14.1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
@ -25,7 +25,7 @@ groups=('mingw-w64-qt5')
 url='https://www.qt.io/'
 _pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('515b57d0f99be48f70817cf73bc8a0c0e63f7c9c41dbf35fc8baf065fc752515')
+sha256sums=('86f425e8bdf55b7b3f6a8384c2b9cffee30407fcf87ece0db060fdfb797a0774')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- 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.14.0
+pkgver=5.14.1
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
--- a/qt5-3d/mingw-w64/qt3d-sha256.txt
+++ b/qt5-3d/mingw-w64/qt3d-sha256.txt
@ -1 +1 @@
-515b57d0f99be48f70817cf73bc8a0c0e63f7c9c41dbf35fc8baf065fc752515
+86f425e8bdf55b7b3f6a8384c2b9cffee30407fcf87ece0db060fdfb797a0774
--- a/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch
+++ b/qt5-activeqt/mingw-w64/0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch
@ -1,4 +1,4 @@
-From 92fb8cbda38e191a91c4883543d3a2e214fef424 Mon Sep 17 00:00:00 2001
+From 9522a4e53cdc414922882cb4cc33d82d998192bd Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 17:17:46 +0200
 Subject: [PATCH 1/2] Don't require windows.h when using native Linux gcc
@ -17,5 +17,5 @@ index 7f9a8d4..6f3548a 100644
 SOURCES = main.cpp
 
 -- 
-2.24.1
+2.25.0

--- a/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
+++ b/qt5-activeqt/mingw-w64/0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch
@ -1,4 +1,4 @@
-From 539d90bbe98100fa4321f4ed05a49573892c5b93 Mon Sep 17 00:00:00 2001
+From 0d9d35f6a84d19a5767d7d4bd59c07f1118ed31b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 17:21:08 +0200
 Subject: [PATCH 2/2] Handle win64 in dumpcpp and
@ -52,5 +52,5 @@ index 86699eb..4e454f8 100644
     }
 
 -- 
-2.24.1
+2.25.0

--- a/qt5-activeqt/mingw-w64/PKGBUILD
+++ b/qt5-activeqt/mingw-w64/PKGBUILD
@ -15,7 +15,7 @@

 _qt_module=qtactiveqt
 pkgname=mingw-w64-qt5-activeqt
-pkgver=5.14.0
+pkgver=5.14.1
 pkgrel=1
 arch=('any')
 pkgdesc="ActiveX integration framework (mingw-w64)"
@ -29,9 +29,9 @@ _pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz"
        '0001-Don-t-require-windows.h-when-using-native-Linux-gcc.patch'
        '0002-Handle-win64-in-dumpcpp-and-MetaObjectGenerator-read.patch')
-sha256sums=('0bfb32189a79af97c86e4591c8b11fa47cec53b1b2a81c7cf20b2e0a70a051b0'
-            '8c3bcfad62dd31ec07809114c0e0ae2f1ef738dc81bc135e60a3cf2c40c11396'
-            '247b0f5f8d46cd68ee32c838e3fe4c5eda44813a8be51163243d96eb05e92a35')
+sha256sums=('457dba433497d79a0ee0e44f9f8cf8afbcbb2e36861f98516413a688a5e88aa0'
+            'be77080f4d55621fde0b8ff5e0f5d8f914b0753502f511dcdc03a6218d2b351f'
+            '07004636c487802fb26c5eb7a5b125bbf236b3ef36fa56ba4652c1b10d5b549c')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

--- a/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep
+++ b/qt5-activeqt/mingw-w64/PKGBUILD.sh.ep
@ -10,7 +10,7 @@

 % end
 \
-pkgver=5.14.0
+pkgver=5.14.1
 pkgrel=1
 arch=('any')
 pkgdesc="ActiveX integration framework (mingw-w64)"
--- a/qt5-activeqt/mingw-w64/qtactiveqt-sha256.txt
+++ b/qt5-activeqt/mingw-w64/qtactiveqt-sha256.txt
@ -1 +1 @@
-0bfb32189a79af97c86e4591c8b11fa47cec53b1b2a81c7cf20b2e0a70a051b0
+457dba433497d79a0ee0e44f9f8cf8afbcbb2e36861f98516413a688a5e88aa0
--- a/qt5-base/apple-darwin/PKGBUILD
+++ b/qt5-base/apple-darwin/PKGBUILD
@ -5,7 +5,7 @@
 # All patches are managed at https://github.com/Martchus/qtbase

 pkgname=apple-darwin-qt5-base
-pkgver=5.14.0
+pkgver=5.14.1
 pkgrel=1
 pkgdesc='A cross-platform application and UI framework (apple-darwin)'
 arch=('i686' 'x86_64')
--- a/qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64-angle/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@ -1,4 +1,4 @@
-From b9877c6af8be840543ce928bf0a54bd3dc5f186e Mon Sep 17 00:00:00 2001
+From 5a6b36b853699f49504173ca35a1c47c9a54d56f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/31] Adjust win32-g++ profile for cross compilation with
@ -163,5 +163,5 @@ index 5de482f23b..3c3d22c699 100644
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64-angle/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@ -1,4 +1,4 @@
-From be14c1951af73ccc2e7a9bbde0db332a0aa3fe6f Mon Sep 17 00:00:00 2001
+From 236c97172a05e530ab98153c0d16a4ddf59cd33c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
 Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL
@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-angle/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -1,4 +1,4 @@
-From 982428d4be89771ffcafc850d30b47ecfdeebcc5 Mon Sep 17 00:00:00 2001
+From 160ef19acaa0504bb04a8f5ffc22229102c3ec9b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
 Subject: [PATCH 03/31] Fix too many sections assemler error in OpenGL factory
@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
     HEADERS += opengl/qopengl.h \
                opengl/qopengl_p.h \
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-angle/0004-Make-sure-.pc-files-are-installed-correctly.patch
@ -1,4 +1,4 @@
-From 499284b7e311cd91dc674ae924d49ceb86c36809 Mon Sep 17 00:00:00 2001
+From d758e71cb38b4fec2f012121605185bf395206cf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
 Subject: [PATCH 04/31] Make sure *.pc files are installed correctly
@ -10,10 +10,10 @@ Subject: [PATCH 04/31] Make sure *.pc files are installed correctly
 3 files changed, 8 insertions(+), 4 deletions(-)

 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index ed7d057a88..1694dea086 100644
+index 7e471f126c..f9532e0db9 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3212,7 +3212,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3215,7 +3215,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
 }
 
 QString
@ -22,7 +22,7 @@ index ed7d057a88..1694dea086 100644
 {
     QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
     if (ret.isEmpty()) {
-@@ -3237,7 +3237,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3240,7 +3240,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
     if(fixify) {
         if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
             ret.prepend(project->first("DESTDIR").toQString());
@ -36,10 +36,10 @@ index ed7d057a88..1694dea086 100644
     return ret;
 }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index 47e4c7531c..057853a4ce 100644
+index ab970c966f..01f97c61d4 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
-@@ -95,7 +95,7 @@ protected:
+@@ -96,7 +96,7 @@ protected:
     virtual void writeDefaultVariables(QTextStream &t);
 
     QString pkgConfigPrefix() const;
@ -62,5 +62,5 @@ index 86d10c213c..c1b28a52e9 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-angle/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -1,4 +1,4 @@
-From 0b7f7b8e98ade7ba816c2439e35cd60d9a5c67ac Mon Sep 17 00:00:00 2001
+From c38954b7d8c29530a5290c52f7981d7a784e7a4f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
 Subject: [PATCH 05/31] Don't add resource files to LIBS parameter
@ -24,5 +24,5 @@ index 096b041056..eb498b28e8 100644
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-angle/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@ -1,4 +1,4 @@
-From 8a7e29949e5fbbcd2ce02def5f0146786ffe3f59 Mon Sep 17 00:00:00 2001
+From 8b73190855f699bd7c1ff67c753fe3d17996f43b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
 Subject: [PATCH 06/31] Prevent debug library names in pkg-config files
@ -15,10 +15,10 @@ files for the debug build an unique file name.
 1 file changed, 3 insertions(+)

 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 1694dea086..01d24418ce 100644
+index f9532e0db9..9c65f21ac0 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3226,6 +3226,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3229,6 +3229,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
         if (dot != -1)
             ret = ret.left(dot);
     }
@ -29,5 +29,5 @@ index 1694dea086..01d24418ce 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64-angle/0007-Fix-linking-against-shared-static-libpng.patch
@ -1,4 +1,4 @@
-From a623fd18b4613f907ddf7cdd3cd1fa3bf0b4eac0 Mon Sep 17 00:00:00 2001
+From 99c07cf7413a04cd7297a4c18e4ebf73351c8720 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
 Subject: [PATCH 07/31] Fix linking against shared/static libpng
@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 1 file changed, 4 insertions(+), 2 deletions(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 19312d245d..c89831c404 100644
+index 0202f17b21..099c11da95 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -399,8 +399,10 @@
+@@ -400,8 +400,10 @@
                 { "type": "pkgConfig", "args": "libpng" },
                 { "libs": "-llibpng16", "condition": "config.msvc" },
                 { "libs": "-llibpng", "condition": "config.msvc" },
@ -26,5 +26,5 @@ index 19312d245d..c89831c404 100644
             ],
             "use": [
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-static-D-Bus.patch
@ -1,4 +1,4 @@
-From 8d4aa856026bbb9f87024cbea65eb482a2fef4a9 Mon Sep 17 00:00:00 2001
+From 3a5c4c981dade3223099630a16a874ba083ecd55 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
 Subject: [PATCH 08/31] Fix linking against static D-Bus
@ -9,7 +9,7 @@ Subject: [PATCH 08/31] Fix linking against static D-Bus
 2 files changed, 11 insertions(+), 2 deletions(-)

 diff --git a/configure.json b/configure.json
-index 159fdf12fa..4aa1221395 100644
+index 62d78f8dc6..f7d169f053 100644
 --- a/configure.json
 +++ b/configure.json
@@ -188,18 +188,23 @@
@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64-angle/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@ -1,4 +1,4 @@
-From 0f69c4775ad5f7f145e924330bffb7b351839eed Mon Sep 17 00:00:00 2001
+From e1a1979b15712954adfca6d44f45dad99357286e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
 Subject: [PATCH 09/31] Don't try to use debug version of D-Bus library
@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/configure.json b/configure.json
-index 4aa1221395..bf7c14906f 100644
+index f7d169f053..846cb678c9 100644
 --- a/configure.json
 +++ b/configure.json
@@ -201,7 +201,7 @@
@ -25,5 +25,5 @@ index 4aa1221395..bf7c14906f 100644
                     },
                     "condition": "config.win32 && features.shared"
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0010-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64-angle/0010-Fix-linking-against-static-freetype2.patch
@ -1,4 +1,4 @@
-From 6e50cb934d6293f26e6b2b403da5a62cfa7b6342 Mon Sep 17 00:00:00 2001
+From 3c9bf1e7fcd5f965d9f3a91d05d762d6f4061a5e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
 Subject: [PATCH 10/31] Fix linking against static freetype2
@ -8,7 +8,7 @@ Subject: [PATCH 10/31] Fix linking against static freetype2
 1 file changed, 5 insertions(+), 2 deletions(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index c89831c404..c51a1b0ce1 100644
+index 099c11da95..872deb3ad3 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
@@ -239,8 +239,11 @@
@ -26,5 +26,5 @@ index c89831c404..c51a1b0ce1 100644
                 { "libs": "-lfreetype" }
             ],
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-harfbuzz.patch
@ -1,4 +1,4 @@
-From 47cfe60f65a7a3dc8e300b72cd4df1aa5c7952c6 Mon Sep 17 00:00:00 2001
+From c7515aea498a46c8d2291b8590989d6092ab3404 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
 Subject: [PATCH 11/31] Fix linking against static harfbuzz
@ -8,7 +8,7 @@ Subject: [PATCH 11/31] Fix linking against static harfbuzz
 1 file changed, 5 insertions(+), 1 deletion(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index c51a1b0ce1..06becdaa41 100644
+index 872deb3ad3..7daaaa5a11 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
@@ -307,7 +307,11 @@
@ -25,5 +25,5 @@ index c51a1b0ce1..06becdaa41 100644
         },
         "imf": {
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-pcre.patch
@ -1,4 +1,4 @@
-From 3b7985bd23118f396645b86a1ccc414540a1c148 Mon Sep 17 00:00:00 2001
+From d3f6ecda90e28aabf58cbb4a92f22e803551ac05 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
 Subject: [PATCH 12/31] Fix linking against static pcre
@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 1 file changed, 4 insertions(+)

 diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
-index 8d2187eb28..aaafb43039 100644
+index 67be67c243..0bc4c5157c 100644
 --- a/src/corelib/text/qregularexpression.cpp
 +++ b/src/corelib/text/qregularexpression.cpp
@@ -53,6 +53,10 @@
@ -24,5 +24,5 @@ index 8d2187eb28..aaafb43039 100644
 #include <pcre2.h>
 
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-shared-static-MariaDB.patch
@ -1,4 +1,4 @@
-From 2ab64206b307901607110d750e17cadff1a337d4 Mon Sep 17 00:00:00 2001
+From e6dde84ed7cc286a9e195b96e609f244654b4540 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 13/31] Fix linking against shared/static MariaDB
@ -22,5 +22,5 @@ index cd20eef1df..babd0465ce 100644
                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@ -1,4 +1,4 @@
-From 9032e7d6eef20df7722f49d4e6f6ad060d8a6755 Mon Sep 17 00:00:00 2001
+From 44ddb94b2cab4338b0c4c941f5e3f8130a076530 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL
@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644
             ]
         },
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-angle/0015-Rename-qtmain-to-qt5main.patch
@ -1,9 +1,11 @@
-From dd827f5dae7363c5bab406e8cd2291b6d623b2b9 Mon Sep 17 00:00:00 2001
+From 27a910a4727d8d33ea9f2f70d572512365dde3e9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
 Subject: [PATCH 15/31] Rename qtmain to qt5main

 Prevents conflict with mingw-w64-qt4 package
+
+Change-Id: I1a1533bb37d5c87b3f8e9534f67aa76026c44aed
 ---
 mkspecs/common/g++-win32.conf      | 2 +-
 mkspecs/features/create_cmake.prf  | 4 ++--
@ -25,16 +27,16 @@ index 17d2a5efec..2975d371e3 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 346fbf2467..b8045753f0 100644
+index 4aa5dad467..fa8c142ec5 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -317,8 +317,8 @@ mac {
-     CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
+@@ -321,8 +321,8 @@ mac {
+         CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
+         CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
 
-     mingw {
-        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}d.a
+-        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a
 -        CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
-+        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
+        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a
 +        CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
 
         !isEmpty(CMAKE_STATIC_TYPE) {
@ -68,5 +70,5 @@ index 1f54c846ec..162e7a4b1b 100644
 
 CONFIG += static
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0016-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64-angle/0016-Enable-rpath-for-build-tools.patch
@ -1,4 +1,4 @@
-From b1cc2e7f3e091f244473b7d03494abcb1dacbbd6 Mon Sep 17 00:00:00 2001
+From be3b19afd1ebff11fa14ddf7d91accd06a35afbe Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
 Subject: [PATCH 16/31] Enable rpath for build tools
@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
 INSTALLS += target
 
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0017-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-angle/0017-Use-system-zlib-for-build-tools.patch
@ -1,4 +1,4 @@
-From 622132bfd075976303af986dae4d878eccc292ca Mon Sep 17 00:00:00 2001
+From e7c872f9a7e09ac30e4ea4b236630df96af1b601 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
 Subject: [PATCH 17/31] Use system zlib for build tools
@ -23,5 +23,5 @@ index 9863ff5e69..02329611bc 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0018-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-angle/0018-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From b3ea7d1e0a967a4c07bfefdf65803ae3087dda1b Mon Sep 17 00:00:00 2001
+From 56291bee2a83d3a267bb1dab7625afd37a17d178 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 18/31] Merge shared and static library trees
@ -17,7 +17,7 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d
 7 files changed, 74 insertions(+), 11 deletions(-)

 diff --git a/configure.pri b/configure.pri
-index 47882afeb6..05dc704cde 100644
+index 81c84b28ef..910e59188f 100644
 --- a/configure.pri
 +++ b/configure.pri
@@ -648,7 +648,12 @@ defineTest(qtConfOutput_machineTuple) {
@ -34,7 +34,7 @@ index 47882afeb6..05dc704cde 100644
 }
 
 # type (empty or 'host'), option name, default value
-@@ -1365,3 +1370,12 @@ defineTest(createConfigStatus) {
+@@ -1387,3 +1392,12 @@ defineTest(createConfigStatus) {
 
 QMAKE_POST_CONFIGURE += \
     "createConfigStatus()"
@ -139,10 +139,10 @@ index 51ea3a8321..275e080ae4 100644
 QMAKE_EXT_YACC          = .y
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 01d24418ce..914bb58f27 100644
+index 9c65f21ac0..f79512ca60 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3229,6 +3229,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3232,6 +3232,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
     if (project->isActiveConfig("debug")) {
         ret += "d";
     }
@ -152,7 +152,7 @@ index 01d24418ce..914bb58f27 100644
     ret += Option::pkgcfg_ext;
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
-@@ -3405,11 +3408,11 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3408,11 +3411,11 @@ MakefileGenerator::writePkgConfigFile()
     t << Qt::endl;
 
     // requires
@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
 INSTALLS += mkspecs
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-angle/0019-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From ca8a7fc78a4e88a58f96674104662c2306949dbf Mon Sep 17 00:00:00 2001
+From 9388b61efd236a365cf12218bfc24f2ba7b24e2f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 19/31] Use *.dll.a as import lib extension
@ -14,21 +14,21 @@ Change-Id: I1175feedd96ef4940af87dc3662fedc8f4d1d764
 3 files changed, 26 insertions(+), 9 deletions(-)

 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index b8045753f0..cb4e136ded 100644
+index fa8c142ec5..e023f39a5d 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -328,8 +328,9 @@ mac {
-             CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
+@@ -332,8 +332,9 @@ mac {
+             CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl
             CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
         } else {
-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a
+-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
 -            CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
 +            isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
-+            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.$${QMAKE_EXTENSION_IMPORTLIB}
+            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}
         }
     } else {
-         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
+         CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
 index bbada46c29..d6299d8eed 100644
 --- a/mkspecs/features/qt.prf
@ -94,5 +94,5 @@ index c1b28a52e9..3b4372ad05 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-angle/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From 7a38a4a01fd72504c0196bc100bbaaa7138f149b Mon Sep 17 00:00:00 2001
+From 987965be28fab78041880dfbede4be209e142b26 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 20/31] Pull dependencies of static libraries in CMake modules
@ -29,12 +29,12 @@ in favour of 'how it used to work'.

 Change-Id: I6566d42d7e27d4cd23d261a0eacca9efad9ce6df
 ---
- .../data/cmake/Qt5BasicConfig.cmake.in        | 223 ++++++++++--------
- .../data/cmake/Qt5PluginTarget.cmake.in       |  84 +------
- 2 files changed, 135 insertions(+), 172 deletions(-)
+ .../data/cmake/Qt5BasicConfig.cmake.in        | 241 ++++++++++--------
+ .../data/cmake/Qt5PluginTarget.cmake.in       |  84 +-----
+ 2 files changed, 135 insertions(+), 190 deletions(-)

 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 364c23e750..a2ceede0cf 100644
+index 50364765fb..357c8b9cba 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -53,6 +53,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
@ -59,16 +59,16 @@ index 364c23e750..a2ceede0cf 100644
 
         # file(STRINGS) replaces all semicolons read from the file with backslash semicolons.
         # We need to do a reverse transformation in CMake. For that we replace all backslash
-@@ -79,7 +87,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
-                 # Handle normal libraries passed as -lfoo
-                 set(_lib \"${CMAKE_MATCH_1}\")
-                 foreach(_standard_library ${_standard_libraries})
-                    if(_standard_library MATCHES \"^${_lib}(\\\\.lib)?$\")
-+                    if(_standard_library MATCHES \"^${_lib}(\\\\.lib|\\\\.a)?$\")
-                         set(_lib_is_default_linked TRUE)
-                         break()
-                     endif()
-@@ -120,6 +128,37 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
+@@ -92,7 +100,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
+                     # Handle normal libraries passed as -lfoo
+                     set(_lib \"${CMAKE_MATCH_1}\")
+                     foreach(_standard_library ${_standard_libraries})
+-                        if(_standard_library MATCHES \"^${_lib}(\\\\.lib)?$\")
+                        if(_standard_library MATCHES \"^${_lib}(\\\\.lib|\\\\.a)?$\")
+                             set(_lib_is_default_linked TRUE)
+                             break()
+                         endif()
+@@ -139,6 +147,37 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
     set(${lib_deps} ${_lib_deps} PARENT_SCOPE)
     set(${link_flags} \"SHELL:${_link_flags}\" PARENT_SCOPE)
 endfunction()
@ -106,7 +106,7 @@ index 364c23e750..a2ceede0cf 100644
 !!ENDIF
 
 !!IF !equals(TEMPLATE, aux)
-@@ -133,52 +172,39 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -152,61 +191,39 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
 !!ENDIF
     _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
@ -130,10 +130,10 @@ index 364c23e750..a2ceede0cf 100644
 !!ENDIF
 -        # For backward compatibility with CMake < 2.8.12
 -        \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps};${_static_deps}\"
-    )
+     )
 -    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
 -                 \"${_deps}\"
-     )
+-    )
 -
 -!!IF !isEmpty(CMAKE_STATIC_TYPE)
 -    if(NOT "${IsDebugAndRelease}")
@ -150,20 +150,29 @@ index 364c23e750..a2ceede0cf 100644
 -        set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\")
 -        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
 -                     \"${_static_deps_genex}\"
-        )
-    endif()
-
-    set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\")
-    if(NOT CMAKE_VERSION VERSION_LESS \"3.13\" AND _static_link_flags)
-        set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\")
-        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_OPTIONS
-            \"${_static_link_flags_genex}\"
 +    _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${Configuration}\" \"${_deps}\")
 +    if(NOT CMAKE_VERSION VERSION_LESS \"3.13\")
 +        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 +            \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\"
         )
     endif()
+-
+-    set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\")
+-    if(_static_link_flags)
+-        set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\")
+-        if(NOT CMAKE_VERSION VERSION_LESS \"3.13\")
+-            set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_OPTIONS
+-                \"${_static_link_flags_genex}\"
+-            )
+-        else()
+-            # Abuse INTERFACE_LINK_LIBRARIES to add link flags when CMake version is too low.
+-            # Strip out SHELL:, because it is not supported in this property. And hope for the best.
+-            string(REPLACE \"SHELL:\" \"\" _static_link_flags_genex \"${_static_link_flags_genex}\")
+-            set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+-                \"${_static_link_flags_genex}\"
+-            )
+-        endif()
+-    endif()
 +!!ELSE
 +    set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 +        \"INTERFACE_LINK_LIBRARIES_${Configuration}\" \"${_deps}\"
@ -177,7 +186,7 @@ index 364c23e750..a2ceede0cf 100644
 !!ENDIF
 
 !!IF !isEmpty(CMAKE_WINDOWS_BUILD)
-@@ -195,6 +221,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -223,6 +240,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
     endif()
 !!ENDIF
 endmacro()
@ -193,7 +202,7 @@ index 364c23e750..a2ceede0cf 100644
 !!ENDIF
 
 if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-@@ -380,13 +415,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -408,13 +434,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 
     add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
@ -211,7 +220,7 @@ index 364c23e750..a2ceede0cf 100644
 !!IF !equals(TEMPLATE, aux)
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-@@ -403,6 +440,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -431,6 +459,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_PLUGIN_TYPES \"$${CMAKE_MODULE_PLUGIN_TYPES}\")
 
@ -268,7 +277,7 @@ index 364c23e750..a2ceede0cf 100644
     set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
     foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
         if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
-@@ -421,9 +508,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -449,9 +527,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
                 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
             endif()
         endforeach()
@ -282,7 +291,7 @@ index 364c23e750..a2ceede0cf 100644
     endif()
 
 !!IF !equals(TEMPLATE, aux)
-@@ -493,9 +584,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -521,9 +603,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -296,7 +305,7 @@ index 364c23e750..a2ceede0cf 100644
 !!ENDIF // CMAKE_RELEASE_TYPE
 !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
 
-@@ -506,64 +599,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -534,73 +618,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     )
 !!ENDIF // TEMPLATE != aux
 
@ -340,11 +349,20 @@ index 364c23e750..a2ceede0cf 100644
 -        endif()
 -
 -        set(_static_link_flags \"${_Qt5${Plugin}_STATIC_${Configuration}_LINK_FLAGS}\")
-        if(NOT CMAKE_VERSION VERSION_LESS \"3.13\" AND _static_link_flags)
+-        if(_static_link_flags)
 -            set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\")
-            set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_OPTIONS
-                \"${_static_link_flags_genex}\"
-            )
+-            if(NOT CMAKE_VERSION VERSION_LESS \"3.13\")
+-                set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_OPTIONS
+-                    \"${_static_link_flags_genex}\"
+-                )
+-            else()
+-                # Abuse INTERFACE_LINK_LIBRARIES to add link flags when CMake version is too low.
+-                # Strip out SHELL:, because it is not supported in this property. And hope for the best.
+-                string(REPLACE \"SHELL:\" \"\" _static_link_flags_genex \"${_static_link_flags_genex}\")
+-                set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+-                    \"${_static_link_flags_genex}\"
+-                )
+-            endif()
 -        endif()
 -!!ENDIF
 -    endmacro()
@ -466,5 +484,5 @@ index 7b70cfed09..25f2162fe6 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\")
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-angle/0021-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From 79fd08a26dba663e22ea38d1ab0e59b20601c410 Mon Sep 17 00:00:00 2001
+From 5be3611a84819a60ac3cb3ad9dd440b7af07c34f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 21/31] Allow usage of static version with CMake
@ -24,7 +24,7 @@ Change-Id: Ib9411a9edbad2a82414b1af61075172a797f4318
 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 cb4e136ded..02e28211ac 100644
+index e023f39a5d..b2594d9921 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
@@ -68,7 +68,7 @@ split_incpath {
@ -45,39 +45,39 @@ index cb4e136ded..02e28211ac 100644
 
 internal_module {
     CMAKE_INTERNAL_MODULE = true
-@@ -212,23 +214,25 @@ contains(CONFIG, plugin) {
-     CMAKE_PLUGIN_TYPE_ESCAPED = $$replace(PLUGIN_TYPE, [-/], _)
- 
+@@ -214,23 +216,25 @@ contains(CONFIG, plugin) {
     win32 {
+         !mingw|qtConfig(debug_and_release): debug_suffix="d"
+ 
 -        isEmpty(CMAKE_STATIC_TYPE) {
 +        mingw {
             CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.dll
-             CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.dll
+             CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.dll
 +            CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a
-+            CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}d.a
+            CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a
             CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl
-             CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.prl
+             CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl
 -        } else:mingw {
 -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a
-            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}d.a
+-            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a
 -            CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.prl
-            CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}d.prl
+-            CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.prl
 +            CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.static.prl
-+            CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.static.prl
+            CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.static.prl
         } else {                         # MSVC static
             CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.lib
-             CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.lib
+             CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib
 +            CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.lib
-+            CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.lib
+            CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib
             CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl
-             CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.prl
+             CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl
         }
     } else {
 +        # this branch is broken by the patch, only apply when building for Windows
         mac {
             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PLUGIN_EXT = .dylib
             else: CMAKE_PLUGIN_EXT = .a
-@@ -248,9 +252,9 @@ contains(CONFIG, plugin) {
+@@ -250,9 +254,9 @@ contains(CONFIG, plugin) {
         }
     }
     cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
@ -89,7 +89,7 @@ index cb4e136ded..02e28211ac 100644
 
     !build_pass {
         QMAKE_SUBSTITUTES += cmake_target_file
-@@ -259,7 +263,7 @@ contains(CONFIG, plugin) {
+@@ -261,7 +265,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
@ -98,7 +98,7 @@ index cb4e136ded..02e28211ac 100644
     INSTALLS += cmake_qt5_plugin_file
 
     return()
-@@ -272,26 +276,34 @@ mod_deps =
+@@ -274,26 +278,34 @@ mod_deps =
 lib_deps =
 aux_mod_deps =
 aux_lib_deps =
@ -137,54 +137,57 @@ index cb4e136ded..02e28211ac 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
-@@ -320,35 +332,33 @@ mac {
-         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
+@@ -324,18 +336,17 @@ mac {
+         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a
         CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
 
 -        !isEmpty(CMAKE_STATIC_TYPE) {
 -            CMAKE_STATIC_WINDOWS_BUILD = "true"
-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a
+-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
 -            CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
 +        isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = dll.a
-+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.$${QMAKE_EXTENSION_IMPORTLIB}
+        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}
-+        CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.prl
+        CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl
 +        CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl
 +
-+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC = lib$${CMAKE_QT_STEM}d.a
+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
 +        CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = lib$${CMAKE_QT_STEM}.a
-+        CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}d.static.prl
+        CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl
 +        CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.static.prl
 
-            CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
+-            CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl
 -            CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
 -        } else {
 -            isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.$${QMAKE_EXTENSION_IMPORTLIB}
+-            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}
 -        }
     } else {
-         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
+         CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
+         CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
+@@ -343,19 +354,18 @@ mac {
+         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
         CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
 
 -        !isEmpty(CMAKE_STATIC_TYPE) {
 -            CMAKE_STATIC_WINDOWS_BUILD = "true"
-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.lib
+-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
 -            CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
-+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.lib
+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
 +        CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
-+        CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.prl
+        CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl
 +        CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl
 
-            CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.prl
+-            CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl
 -            CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl
 -        } else {
-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.lib
+-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
 -            CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
 -        }
-+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}d.lib
+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.lib
 +        CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.lib
-+        CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}d.static.prl
+        CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl
 +        CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.static.prl
     }
 } else {
@ -192,7 +195,7 @@ index cb4e136ded..02e28211ac 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
-@@ -368,12 +378,12 @@ mac {
+@@ -375,12 +385,12 @@ mac {
 INSTALLS += cmake_qt5_module_files
 
 cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@ -207,7 +210,7 @@ index cb4e136ded..02e28211ac 100644
 
 !build_pass:QMAKE_SUBSTITUTES += \
     cmake_config_file \
-@@ -383,11 +393,29 @@ cmake_qt5_module_files.files = \
+@@ -390,11 +400,29 @@ cmake_qt5_module_files.files = \
     $$cmake_config_file.output \
     $$cmake_config_version_file.output
 
@ -238,7 +241,7 @@ index cb4e136ded..02e28211ac 100644
 
     !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
 
-@@ -399,7 +427,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -406,7 +434,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
 exists($$cmake_macros_file.input) {
     CMAKE_MODULE_MACROS = "true"
 
@ -247,7 +250,7 @@ index cb4e136ded..02e28211ac 100644
     cmake_macros_file.CONFIG = verbatim
 
     !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -407,7 +435,7 @@ exists($$cmake_macros_file.input) {
+@@ -414,7 +442,7 @@ exists($$cmake_macros_file.input) {
     cmake_qt5_module_files.files += $$cmake_macros_file.output
 }
 
@ -257,7 +260,7 @@ index cb4e136ded..02e28211ac 100644
 # We are generating cmake files. Most developers of Qt are not aware of cmake,
 # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index a2ceede0cf..5883af96d3 100644
+index 357c8b9cba..38109b0182 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -3,6 +3,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
@ -320,7 +323,7 @@ index a2ceede0cf..5883af96d3 100644
 but this file does not exist.  Possible reasons include:
 * The file was deleted, renamed, or moved to another location.
 * An install or uninstall procedure did not complete successfully.
-@@ -159,19 +190,50 @@ if(NOT COMMAND _qt5_add_dependencies)
+@@ -178,19 +209,50 @@ if(NOT COMMAND _qt5_add_dependencies)
         endif()
     endfunction()
 endif()
@ -373,7 +376,7 @@ index a2ceede0cf..5883af96d3 100644
 
     set(_deps
         ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}
-@@ -183,15 +245,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -202,15 +264,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
     # FIXME: handle IsDebugAndRelease like in official version
 
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
@ -392,7 +395,7 @@ index a2ceede0cf..5883af96d3 100644
             \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\"
         )
     endif()
-@@ -213,9 +275,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -232,9 +294,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
 !!ELSE
     set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
 !!ENDIF
@ -407,7 +410,7 @@ index a2ceede0cf..5883af96d3 100644
         \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
         )
     endif()
-@@ -232,8 +298,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P
+@@ -251,8 +317,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P
 endmacro()
 !!ENDIF
 
@ -417,7 +420,7 @@ index a2ceede0cf..5883af96d3 100644
 !!IF !no_module_headers
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -241,46 +306,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -260,46 +325,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
       \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\"
     )
 !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
@ -482,7 +485,7 @@ index a2ceede0cf..5883af96d3 100644
     endforeach()
 
 !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -289,16 +358,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -308,16 +377,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private)
     if (NOT _check_private STREQUAL -1)
         foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
@ -506,7 +509,7 @@ index a2ceede0cf..5883af96d3 100644
 !!ENDIF // TEMPLATE != aux
     set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
 
-@@ -306,10 +379,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -325,10 +398,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\")
 !!ENDIF
 
@ -519,7 +522,7 @@ index a2ceede0cf..5883af96d3 100644
         set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
     endif()
     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
-@@ -317,17 +390,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -336,17 +409,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
     endif()
     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
@ -541,7 +544,7 @@ index a2ceede0cf..5883af96d3 100644
                 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
                 ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
                 ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
-@@ -335,25 +408,25 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -354,25 +427,25 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
             )
         endif()
 
@ -579,7 +582,7 @@ index a2ceede0cf..5883af96d3 100644
 !!ENDIF // TEMPLATE != aux
 
     # It can happen that the same FooConfig.cmake file is included when calling find_package()
-@@ -368,11 +441,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -387,11 +460,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     #
     # Make sure to return early in the original Config inclusion, because the target has already
     # been defined as part of the second inclusion.
@ -597,7 +600,7 @@ index a2ceede0cf..5883af96d3 100644
 
 !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
     list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\")
-@@ -383,13 +461,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -402,13 +480,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!IF !isEmpty(CMAKE_DEBUG_TYPE)
 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
         _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
@ -613,7 +616,7 @@ index a2ceede0cf..5883af96d3 100644
             _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES
             _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS
         )
-@@ -399,13 +477,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -418,13 +496,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!IF !isEmpty(CMAKE_RELEASE_TYPE)
 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
         _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
@ -629,7 +632,7 @@ index a2ceede0cf..5883af96d3 100644
             _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
             _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS
         )
-@@ -413,32 +491,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -432,32 +510,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ENDIF
     endif()
 
@ -686,7 +689,7 @@ index a2ceede0cf..5883af96d3 100644
 
     # Find plugin targets
     file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
-@@ -452,7 +543,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -471,7 +562,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         endforeach()
     endif()
 
@ -698,7 +701,7 @@ index a2ceede0cf..5883af96d3 100644
         set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
 
 !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-@@ -460,7 +555,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -479,7 +574,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
 !!ENDIF
@ -710,7 +713,7 @@ index a2ceede0cf..5883af96d3 100644
         set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
             \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
         )
-@@ -490,17 +589,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -509,17 +608,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         endforeach()
     endif()
 
@ -735,7 +738,7 @@ index a2ceede0cf..5883af96d3 100644
         )
         set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
         foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -509,69 +611,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -528,69 +630,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
             endif()
         endforeach()
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
@ -831,7 +834,7 @@ index a2ceede0cf..5883af96d3 100644
     if (EXISTS
 !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -584,7 +689,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -603,7 +708,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -840,7 +843,7 @@ index a2ceede0cf..5883af96d3 100644
     endif()
 !!ENDIF // CMAKE_STATIC_TYPE
 
-@@ -594,19 +699,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -613,19 +718,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 
 !!ENDIF // CMAKE_DEBUG_TYPE
 !!ELSE // TEMPLATE != aux
@ -1058,5 +1061,5 @@ index 2a575958ae..ca0e3be3b5 100644
     INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
 )
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-angle/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From 918b0fcbabce59d577fc50f20df512d58f49d975 Mon Sep 17 00:00:00 2001
+From 37aba0f5c23f1f71126e7472ad54ade6885137dc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 22/31] Adjust linker flags for static build with
@ -25,5 +25,5 @@ index 58d1d5b366..967dc64a19 100644
 +unset(_isExe)
 +!!ENDIF
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-angle/0023-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From c71d77d69a2b62bee1cd1b9dc704e2b56eef0c6e Mon Sep 17 00:00:00 2001
+From 623d8969b98de1c286aef4b94d54ddf38dbe6238 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 23/31] Use correct pkg-config --static flag
@ -8,7 +8,7 @@ Subject: [PATCH 23/31] Use correct pkg-config --static flag
 1 file changed, 3 insertions(+)

 diff --git a/configure.pri b/configure.pri
-index 05dc704cde..60d55eb569 100644
+index 910e59188f..aaa4123f4c 100644
 --- a/configure.pri
 +++ b/configure.pri
@@ -345,6 +345,9 @@ defineTest(qtConfTest_detectPkgConfig) {
@ -22,5 +22,5 @@ index 05dc704cde..60d55eb569 100644
     $$qtConfEvaluate("features.cross_compile") {
         # cross compiling, check that pkg-config is set up sanely
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64-angle/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,4 +1,4 @@
-From f2e043c1c3d6e268ac890062068ff4bb3306d2ff Mon Sep 17 00:00:00 2001
+From 27a3b8f6185d125e39267456483abdde1f53ba44 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
 Subject: [PATCH 24/31] Fix macro invoking moc, rcc and uic
@ -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 17cc19fc4e..29022697a4 100644
+index 84c75401b1..3a35e30777 100644
 --- a/src/corelib/Qt5CoreMacros.cmake
 +++ b/src/corelib/Qt5CoreMacros.cmake
@@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
           MAIN_DEPENDENCY ${infile} VERBATIM)
         set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64-angle/0025-Ignore-errors-about-missing-feature-static.patch
@ -1,4 +1,4 @@
-From 3b2e2f35716d183cba076dfea9de6ce73bd2ed1d Mon Sep 17 00:00:00 2001
+From 4da7840c0167fba67d57c7879291b996b094ca0b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
 Subject: [PATCH 25/31] Ignore errors about missing feature static
@ -21,10 +21,10 @@ index 8273ba3fe1..4cdb55d4b3 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
 }
 diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 661b7dd961..86c873e3fd 100644
+index 7777e615bd..5f30366660 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -359,5 +359,5 @@ defineTest(qtConfig) {
+@@ -370,5 +370,5 @@ defineTest(qtConfig) {
         contains(QT.$${module}.disabled_features, $$1): \
             return(false)
     }
@ -32,5 +32,5 @@ index 661b7dd961..86c873e3fd 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
 }
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0026-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64-angle/0026-Enable-and-fix-use-of-iconv.patch
@ -1,4 +1,4 @@
-From 14edd208b85c55eb5e313600752e769627199cde Mon Sep 17 00:00:00 2001
+From fe813fad22868934acf9f628d28eb9ebc8f1b944 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
 Subject: [PATCH 26/31] Enable and fix use of iconv
@ -74,5 +74,5 @@ index ae360239c6..5fd57a1a66 100644
         },
         "icu": {
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0027-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64-angle/0027-Ignore-failing-pkg-config-test.patch
@ -1,4 +1,4 @@
-From d608eb4d39293401ba8cdf887385c4231c1eaae4 Mon Sep 17 00:00:00 2001
+From 30363a160959be31f59f2b3a07f2a1b0d0295937 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
 Subject: [PATCH 27/31] Ignore failing pkg-config test
@ -9,7 +9,7 @@ Didn't investigate why it fails, let's hope for the best
 1 file changed, 1 deletion(-)

 diff --git a/configure.json b/configure.json
-index bf7c14906f..19221ba008 100644
+index 846cb678c9..c39adc981f 100644
 --- a/configure.json
 +++ b/configure.json
@@ -755,7 +755,6 @@
@ -21,5 +21,5 @@ index bf7c14906f..19221ba008 100644
                 "publicFeature",
                 { "type": "publicQtConfig", "negative": true },
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64-angle/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,4 +1,4 @@
-From 479bc0ec33883ccc56930eb0bf54530acd4bd2dc Mon Sep 17 00:00:00 2001
+From 818b881fa3b76f914565d61c77845bdf4607aa18 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
 Subject: [PATCH 28/31] Prevent qmake from messing static lib dependencies
@ -41,5 +41,5 @@ index 3b4372ad05..cd10225e99 100644
     int libidx = 0;
     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64-angle/0029-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,4 +1,4 @@
-From 6779a50c73ed1683dca19efc018b6f657c146a91 Mon Sep 17 00:00:00 2001
+From 5b7476e45f7ee7d513045582757d0de8874dcf17 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
 Subject: [PATCH 29/31] Hardcode linker flags for platform plugins
@ -152,5 +152,5 @@ index 50a3bb41a9..285d90c6d3 100644
 include(windows.pri)
 
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64-angle/0030-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,4 +1,4 @@
-From 2860688da70e78bbff63e0089d41364e528b73f4 Mon Sep 17 00:00:00 2001
+From 8138905dc5c2fa0dd00267fd5c8f26c2236d44b4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
 Subject: [PATCH 30/31] Fix linking against static plugins with qmake
@ -33,5 +33,5 @@ index d6299d8eed..5311748953 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.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/qt5-base/mingw-w64-angle/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@ -1,4 +1,4 @@
-From a56c12fc0a7428ca32dc7e7f4f54ed725ef288fa Mon Sep 17 00:00:00 2001
+From 7a33424a70724ff3a404d4f8a5d537fd6d6b4895 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 24 Jun 2019 13:51:02 +0200
 Subject: [PATCH 31/31] Prevent 'Cannot find feature windows_vulkan_sdk'
@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644
     LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
     for (nu, LD_USES) {
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-angle/PKGBUILD
+++ b/qt5-base/mingw-w64-angle/PKGBUILD
@ -32,7 +32,7 @@ isNoOpenGL() {
 }

 pkgname=mingw-w64-qt5-base-angle
-pkgver=5.14.0
+pkgver=5.14.1
 pkgrel=1
 pkgdesc='A cross-platform application and UI framework (mingw-w64)'
 # The static variant doesn't contain any executables which need to be executed on the build machine
@ -86,38 +86,38 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
        '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')
-sha256sums=('4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463'
-            '1f4fd0f8518160f3ec0e5bc39226d857387aa4caec897201999d8eada2b328ef'
-            '450aba36cf8c60a8659406f9367a85e2055a40e1cf0a8711c6de44de1927d857'
-            '7899cdcd3450f5f0bb9cb4cd71ac6529285d4368586e1a2fabb4e14d7b3dee67'
-            '579595a48fa45191941f393defe155c57d02426e6eba1296f3f7f501f6f32576'
-            '1d233841e73c8f69a1d09b666438b26299530b23ac354e6e1e0ccbe58f3ed54c'
-            '56bdecf98463853875e257cc347141967d1edd48e21b0724d16012dd1cc8ef90'
-            '28155531ed86617a074c7a2ac8d753c052707034009ad5dcbf0f2c6dc00ee977'
-            '8f5c7da6b4ae5ce95d887372398fb147678748bca1b8970901bb0417b3440423'
-            'f1f71a736d2cbe9aa3ac04343ae171ef3fda32b5db93bd189c9fc5510c9210e4'
-            'c4b45dd1d19331caaa7ac89cb0d276cb6ec53ee1d2ed2f72fb119d1af000e907'
-            '2d74d87a8da273ed296890a7a717ea8c84242a2af534830ba07a44be88d90d70'
-            '37f11888ee60b68570b759ec66e1ab49e0bb0df0663b808380df5b34f054b5fe'
-            '68d3eeea07f398133d068151ca5ba65d5bf4e1396a7db739cdd77377e261a785'
-            '6e5ab1df1c7aac94259aca4bb8c8469939a944104cc847ddf4fdaf7f278dd225'
-            '4e421ed2b892911725a4a3e6aad9803339dc6d27af9a5caba0dcf082f5a08fa7'
-            'f0629049a60362f83ebd3e9a6a67d71274e9c2f2eae21ba97062b8d5b11d759a'
-            '31d08dbfde790dd702d87f3b995322118919fc9828f22c9b1c044e912ae6f870'
-            '8ab7f64f5d017b650c39aa6e845252be71e4f37a1bfdfeee0f17aec65e233728'
-            '6c95b8fa7ed5a2c8fb48a237d172916c6b1f3197f32b3e627216d6c9759bce14'
-            '74a4fe7f163bba1312cda135c983644260cc8794cdd950385212911eb27d985c'
-            '7e415f8aad7d950add53466406ea3e0cb67180ce6493ea768937bb96ff8de33d'
-            'eb02f4a52b712dcf8bffe57cec420b77bea060e8227f28239056b0721c494075'
-            '62a99e8e345fe776619fb5928334c40d4116e7fae59c773de70ef690dfec1d5f'
-            '87e271140d4a831a9feac53a7d0d7fae0fee9a1c20040a3181a43472c3e6f15a'
-            'c5162eac72b87e34fcbc64c53f38c0a3dd2b174cdb049db258d899510c4febfb'
-            '1d4956c53a0759988d68ebfcae12d74f1332db075efdd85d762629d12421678c'
-            'fd2eeb783fcc83fa7951b7fd07a87033f0229827282b4142047378297688a4b9'
-            'c9cb158dbc2d5446f36f031478e7174188660150a1b7bcb94d7f761a51aa7342'
-            '7611dcb33265962ecfab480771db0360f1083c7672ba874b83b335e18d8909a5'
-            'f5b2a9a54eacc2d86531005b222dff7a3313430baa55d5bae407a5fdb6028d07'
-            '65889bbb2ed14dd9e7a884a6a9015b883bbfc0d558210cc296bb3d41bee4212e')
+sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
+            '4a57615e58ba06eb42d3723fd18e834cb8e5bd75e43bc855d17b553844490f4b'
+            '41bb9278778ea4b8115ce4aa0472435d5499c537fd9dc7d1faf99fed3c25ac07'
+            '91bc8d8e8eac2dddec9cac471f058f451d44bb0b8d45b6228b86d6e9de97f0a6'
+            '350321acfb5bc2c5e6cc78672728be35f223cbc7b632b389d799bdba9160eab7'
+            '5b8287a017d9397ffd1f60865bd8ba758ef340945f62c87ad2aafc9fbeb3b4b2'
+            'cf2a2b1e9c685592d059009aa8ffa3c834019213575ce7afed57037ea45dda3c'
+            'd9a11c90f9b0bbf82d1b9f7733b9fab1b33f3ddb4ffd7edf721c692538aa2649'
+            'd0965fa68ef531dea7e92328912e210cbe678a84b0447ecc86f2c259bd819615'
+            '9a23154796e229b0f25994a191cf0eca916d2b2cafd9a1e77915a1157ef02ad2'
+            '146648c3dcff2537661b2cef9d092e0c9105deb185cf3d7f367c45c0e46df566'
+            'ba29f00bec8bfb3467168b824efd729bd942d34c8da6ac3e428bd11f889da646'
+            '934998c9cb40896d41ce4e15b50d5705183da6aaca3ad65750b43984ccf12c10'
+            'ad3f2deb37b057a85a3897a283515c8e2a9336cd3a1d9dbca463b9a74806c4f9'
+            'e1662059f05f4caa744224fb8cbc02671983dd333227c9499307720e24be9ba1'
+            '4fd714fea42b27b763c7af8e1135b6e54b2b46b7d2cc8c71d2798c9c4fafd407'
+            'dce71cf64d40481a16b08395a5e01aa80938a08e358da18d010add9606da29a8'
+            'e787db710bd5e3ab77f173d5160fe879b971d3586bc88ed9f94d36d537e805db'
+            'c75152ebecdeb94e59c9471944fe800805086f98ae6c54392542686aae9ed7c4'
+            '1910adf8ddba8b81a6dab9231752bbf0d391419241611ad903441f9d1f968340'
+            '6c9d9164b24222ea63e2bb98254dd66a9eb1ad377589a91437f8bccbb149e757'
+            '1e587e871fc6b8fbc5e47e73eaa4b8b484823c771d5d2ebc67396730d7deffe7'
+            '4f45f035d0c12e30cabcf57058d206458999f09582486f79c485d00f3b57f53b'
+            'bd659e9867b1ec6c96c9602d9bb022b78a29e87f9690e9190c44a25967ede298'
+            '3204a14c839c2e37a46688e93ba0e3f00f32995a6b8fbf53dbff6d7e48040775'
+            '6745e3e157d6fb9db2f7147b5ab6cd40eb7ef4654cf0f9e0b59d2f90fc0abbbc'
+            '214fa36eccef5a3a1b448ac9c8a2ddc230e3ef21638e424cfeff25d705e45cb9'
+            '4d1ab6a03b65dddc2028177699e0cb5278d4a481a10a28690ec2347b3e7fa46e'
+            '85c32d151741f2fa42ab5ed16c2c85dd9e2f373dad2c8d09f7a22fbd1e1e3d72'
+            '6c163ddc1912544930d9984adcb54b6d50deb7c4a6d5bd26f6dad252748e5b92'
+            '73fa679c14c9976923cd9605ab3b838a5bce4f23d3d61f47266915296346a771'
+            'd006ec483d8d7ab0e42e086f3827e4074b78dad8a098aa98aa90dcfe0e6d300c')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

@ -376,6 +376,10 @@ package() {
      for tool in qmake moc rcc uic qdbuscpp2xml qdbusxml2cpp qdoc syncqt.pl; do
        ln -s "../${_arch}/lib/qt/bin/${tool}" "${pkgdir}/usr/bin/${_arch}-${tool}-qt5"
      done
+
+      # create qt.conf containing plugin path, see https://github.com/Martchus/PKGBUILDs/issues/109
+      echo "[Paths]
+Plugins = /usr/${_arch}/lib/qt/plugins" > "${pkgdir}/usr/${_arch}/bin/qt.conf"
    fi

    # drop QMAKE_PRL_BUILD_DIR because reference the build dir
--- a/qt5-base/mingw-w64-angle/qtbase-sha256.txt
+++ b/qt5-base/mingw-w64-angle/qtbase-sha256.txt
@ -0,0 +1 @@
+d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7
--- a/qt5-base/mingw-w64-dynamic/PKGBUILD
+++ b/qt5-base/mingw-w64-dynamic/PKGBUILD
@ -32,7 +32,7 @@ isNoOpenGL() {
 }

 pkgname=mingw-w64-qt5-base-dynamic
-pkgver=5.14.0
+pkgver=5.14.1
 pkgrel=1
 pkgdesc='A cross-platform application and UI framework (mingw-w64)'
 # The static variant doesn't contain any executables which need to be executed on the build machine
--- a/qt5-base/mingw-w64-opengl/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64-opengl/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@ -1,4 +1,4 @@
-From b9877c6af8be840543ce928bf0a54bd3dc5f186e Mon Sep 17 00:00:00 2001
+From 5a6b36b853699f49504173ca35a1c47c9a54d56f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/31] Adjust win32-g++ profile for cross compilation with
@ -163,5 +163,5 @@ index 5de482f23b..3c3d22c699 100644
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64-opengl/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@ -1,4 +1,4 @@
-From be14c1951af73ccc2e7a9bbde0db332a0aa3fe6f Mon Sep 17 00:00:00 2001
+From 236c97172a05e530ab98153c0d16a4ddf59cd33c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
 Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL
@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-opengl/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -1,4 +1,4 @@
-From 982428d4be89771ffcafc850d30b47ecfdeebcc5 Mon Sep 17 00:00:00 2001
+From 160ef19acaa0504bb04a8f5ffc22229102c3ec9b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
 Subject: [PATCH 03/31] Fix too many sections assemler error in OpenGL factory
@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
     HEADERS += opengl/qopengl.h \
                opengl/qopengl_p.h \
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-opengl/0004-Make-sure-.pc-files-are-installed-correctly.patch
@ -1,4 +1,4 @@
-From 499284b7e311cd91dc674ae924d49ceb86c36809 Mon Sep 17 00:00:00 2001
+From d758e71cb38b4fec2f012121605185bf395206cf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
 Subject: [PATCH 04/31] Make sure *.pc files are installed correctly
@ -10,10 +10,10 @@ Subject: [PATCH 04/31] Make sure *.pc files are installed correctly
 3 files changed, 8 insertions(+), 4 deletions(-)

 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index ed7d057a88..1694dea086 100644
+index 7e471f126c..f9532e0db9 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3212,7 +3212,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3215,7 +3215,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
 }
 
 QString
@ -22,7 +22,7 @@ index ed7d057a88..1694dea086 100644
 {
     QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
     if (ret.isEmpty()) {
-@@ -3237,7 +3237,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3240,7 +3240,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
     if(fixify) {
         if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
             ret.prepend(project->first("DESTDIR").toQString());
@ -36,10 +36,10 @@ index ed7d057a88..1694dea086 100644
     return ret;
 }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index 47e4c7531c..057853a4ce 100644
+index ab970c966f..01f97c61d4 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
-@@ -95,7 +95,7 @@ protected:
+@@ -96,7 +96,7 @@ protected:
     virtual void writeDefaultVariables(QTextStream &t);
 
     QString pkgConfigPrefix() const;
@ -62,5 +62,5 @@ index 86d10c213c..c1b28a52e9 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-opengl/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -1,4 +1,4 @@
-From 0b7f7b8e98ade7ba816c2439e35cd60d9a5c67ac Mon Sep 17 00:00:00 2001
+From c38954b7d8c29530a5290c52f7981d7a784e7a4f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
 Subject: [PATCH 05/31] Don't add resource files to LIBS parameter
@ -24,5 +24,5 @@ index 096b041056..eb498b28e8 100644
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-opengl/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@ -1,4 +1,4 @@
-From 8a7e29949e5fbbcd2ce02def5f0146786ffe3f59 Mon Sep 17 00:00:00 2001
+From 8b73190855f699bd7c1ff67c753fe3d17996f43b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
 Subject: [PATCH 06/31] Prevent debug library names in pkg-config files
@ -15,10 +15,10 @@ files for the debug build an unique file name.
 1 file changed, 3 insertions(+)

 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 1694dea086..01d24418ce 100644
+index f9532e0db9..9c65f21ac0 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3226,6 +3226,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3229,6 +3229,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
         if (dot != -1)
             ret = ret.left(dot);
     }
@ -29,5 +29,5 @@ index 1694dea086..01d24418ce 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64-opengl/0007-Fix-linking-against-shared-static-libpng.patch
@ -1,4 +1,4 @@
-From a623fd18b4613f907ddf7cdd3cd1fa3bf0b4eac0 Mon Sep 17 00:00:00 2001
+From 99c07cf7413a04cd7297a4c18e4ebf73351c8720 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
 Subject: [PATCH 07/31] Fix linking against shared/static libpng
@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 1 file changed, 4 insertions(+), 2 deletions(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 19312d245d..c89831c404 100644
+index 0202f17b21..099c11da95 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -399,8 +399,10 @@
+@@ -400,8 +400,10 @@
                 { "type": "pkgConfig", "args": "libpng" },
                 { "libs": "-llibpng16", "condition": "config.msvc" },
                 { "libs": "-llibpng", "condition": "config.msvc" },
@ -26,5 +26,5 @@ index 19312d245d..c89831c404 100644
             ],
             "use": [
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0008-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-opengl/0008-Fix-linking-against-static-D-Bus.patch
@ -1,4 +1,4 @@
-From 8d4aa856026bbb9f87024cbea65eb482a2fef4a9 Mon Sep 17 00:00:00 2001
+From 3a5c4c981dade3223099630a16a874ba083ecd55 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
 Subject: [PATCH 08/31] Fix linking against static D-Bus
@ -9,7 +9,7 @@ Subject: [PATCH 08/31] Fix linking against static D-Bus
 2 files changed, 11 insertions(+), 2 deletions(-)

 diff --git a/configure.json b/configure.json
-index 159fdf12fa..4aa1221395 100644
+index 62d78f8dc6..f7d169f053 100644
 --- a/configure.json
 +++ b/configure.json
@@ -188,18 +188,23 @@
@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64-opengl/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@ -1,4 +1,4 @@
-From 0f69c4775ad5f7f145e924330bffb7b351839eed Mon Sep 17 00:00:00 2001
+From e1a1979b15712954adfca6d44f45dad99357286e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
 Subject: [PATCH 09/31] Don't try to use debug version of D-Bus library
@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/configure.json b/configure.json
-index 4aa1221395..bf7c14906f 100644
+index f7d169f053..846cb678c9 100644
 --- a/configure.json
 +++ b/configure.json
@@ -201,7 +201,7 @@
@ -25,5 +25,5 @@ index 4aa1221395..bf7c14906f 100644
                     },
                     "condition": "config.win32 && features.shared"
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0010-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64-opengl/0010-Fix-linking-against-static-freetype2.patch
@ -1,4 +1,4 @@
-From 6e50cb934d6293f26e6b2b403da5a62cfa7b6342 Mon Sep 17 00:00:00 2001
+From 3c9bf1e7fcd5f965d9f3a91d05d762d6f4061a5e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
 Subject: [PATCH 10/31] Fix linking against static freetype2
@ -8,7 +8,7 @@ Subject: [PATCH 10/31] Fix linking against static freetype2
 1 file changed, 5 insertions(+), 2 deletions(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index c89831c404..c51a1b0ce1 100644
+index 099c11da95..872deb3ad3 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
@@ -239,8 +239,11 @@
@ -26,5 +26,5 @@ index c89831c404..c51a1b0ce1 100644
                 { "libs": "-lfreetype" }
             ],
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64-opengl/0011-Fix-linking-against-static-harfbuzz.patch
@ -1,4 +1,4 @@
-From 47cfe60f65a7a3dc8e300b72cd4df1aa5c7952c6 Mon Sep 17 00:00:00 2001
+From c7515aea498a46c8d2291b8590989d6092ab3404 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
 Subject: [PATCH 11/31] Fix linking against static harfbuzz
@ -8,7 +8,7 @@ Subject: [PATCH 11/31] Fix linking against static harfbuzz
 1 file changed, 5 insertions(+), 1 deletion(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index c51a1b0ce1..06becdaa41 100644
+index 872deb3ad3..7daaaa5a11 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
@@ -307,7 +307,11 @@
@ -25,5 +25,5 @@ index c51a1b0ce1..06becdaa41 100644
         },
         "imf": {
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0012-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-opengl/0012-Fix-linking-against-static-pcre.patch
@ -1,4 +1,4 @@
-From 3b7985bd23118f396645b86a1ccc414540a1c148 Mon Sep 17 00:00:00 2001
+From d3f6ecda90e28aabf58cbb4a92f22e803551ac05 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
 Subject: [PATCH 12/31] Fix linking against static pcre
@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 1 file changed, 4 insertions(+)

 diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
-index 8d2187eb28..aaafb43039 100644
+index 67be67c243..0bc4c5157c 100644
 --- a/src/corelib/text/qregularexpression.cpp
 +++ b/src/corelib/text/qregularexpression.cpp
@@ -53,6 +53,10 @@
@ -24,5 +24,5 @@ index 8d2187eb28..aaafb43039 100644
 #include <pcre2.h>
 
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64-opengl/0013-Fix-linking-against-shared-static-MariaDB.patch
@ -1,4 +1,4 @@
-From 2ab64206b307901607110d750e17cadff1a337d4 Mon Sep 17 00:00:00 2001
+From e6dde84ed7cc286a9e195b96e609f244654b4540 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 13/31] Fix linking against shared/static MariaDB
@ -22,5 +22,5 @@ index cd20eef1df..babd0465ce 100644
                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-opengl/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@ -1,4 +1,4 @@
-From 9032e7d6eef20df7722f49d4e6f6ad060d8a6755 Mon Sep 17 00:00:00 2001
+From 44ddb94b2cab4338b0c4c941f5e3f8130a076530 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL
@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644
             ]
         },
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-opengl/0015-Rename-qtmain-to-qt5main.patch
@ -1,9 +1,11 @@
-From dd827f5dae7363c5bab406e8cd2291b6d623b2b9 Mon Sep 17 00:00:00 2001
+From 27a910a4727d8d33ea9f2f70d572512365dde3e9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
 Subject: [PATCH 15/31] Rename qtmain to qt5main

 Prevents conflict with mingw-w64-qt4 package
+
+Change-Id: I1a1533bb37d5c87b3f8e9534f67aa76026c44aed
 ---
 mkspecs/common/g++-win32.conf      | 2 +-
 mkspecs/features/create_cmake.prf  | 4 ++--
@ -25,16 +27,16 @@ index 17d2a5efec..2975d371e3 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 346fbf2467..b8045753f0 100644
+index 4aa5dad467..fa8c142ec5 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -317,8 +317,8 @@ mac {
-     CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
+@@ -321,8 +321,8 @@ mac {
+         CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
+         CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
 
-     mingw {
-        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}d.a
+-        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a
 -        CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
-+        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
+        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a
 +        CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
 
         !isEmpty(CMAKE_STATIC_TYPE) {
@ -68,5 +70,5 @@ index 1f54c846ec..162e7a4b1b 100644
 
 CONFIG += static
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0016-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64-opengl/0016-Enable-rpath-for-build-tools.patch
@ -1,4 +1,4 @@
-From b1cc2e7f3e091f244473b7d03494abcb1dacbbd6 Mon Sep 17 00:00:00 2001
+From be3b19afd1ebff11fa14ddf7d91accd06a35afbe Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
 Subject: [PATCH 16/31] Enable rpath for build tools
@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
 INSTALLS += target
 
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0017-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-opengl/0017-Use-system-zlib-for-build-tools.patch
@ -1,4 +1,4 @@
-From 622132bfd075976303af986dae4d878eccc292ca Mon Sep 17 00:00:00 2001
+From e7c872f9a7e09ac30e4ea4b236630df96af1b601 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
 Subject: [PATCH 17/31] Use system zlib for build tools
@ -23,5 +23,5 @@ index 9863ff5e69..02329611bc 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0018-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-opengl/0018-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From b3ea7d1e0a967a4c07bfefdf65803ae3087dda1b Mon Sep 17 00:00:00 2001
+From 56291bee2a83d3a267bb1dab7625afd37a17d178 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 18/31] Merge shared and static library trees
@ -17,7 +17,7 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d
 7 files changed, 74 insertions(+), 11 deletions(-)

 diff --git a/configure.pri b/configure.pri
-index 47882afeb6..05dc704cde 100644
+index 81c84b28ef..910e59188f 100644
 --- a/configure.pri
 +++ b/configure.pri
@@ -648,7 +648,12 @@ defineTest(qtConfOutput_machineTuple) {
@ -34,7 +34,7 @@ index 47882afeb6..05dc704cde 100644
 }
 
 # type (empty or 'host'), option name, default value
-@@ -1365,3 +1370,12 @@ defineTest(createConfigStatus) {
+@@ -1387,3 +1392,12 @@ defineTest(createConfigStatus) {
 
 QMAKE_POST_CONFIGURE += \
     "createConfigStatus()"
@ -139,10 +139,10 @@ index 51ea3a8321..275e080ae4 100644
 QMAKE_EXT_YACC          = .y
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 01d24418ce..914bb58f27 100644
+index 9c65f21ac0..f79512ca60 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3229,6 +3229,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3232,6 +3232,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
     if (project->isActiveConfig("debug")) {
         ret += "d";
     }
@ -152,7 +152,7 @@ index 01d24418ce..914bb58f27 100644
     ret += Option::pkgcfg_ext;
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
-@@ -3405,11 +3408,11 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3408,11 +3411,11 @@ MakefileGenerator::writePkgConfigFile()
     t << Qt::endl;
 
     // requires
@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
 INSTALLS += mkspecs
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-opengl/0019-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From ca8a7fc78a4e88a58f96674104662c2306949dbf Mon Sep 17 00:00:00 2001
+From 9388b61efd236a365cf12218bfc24f2ba7b24e2f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 19/31] Use *.dll.a as import lib extension
@ -14,21 +14,21 @@ Change-Id: I1175feedd96ef4940af87dc3662fedc8f4d1d764
 3 files changed, 26 insertions(+), 9 deletions(-)

 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index b8045753f0..cb4e136ded 100644
+index fa8c142ec5..e023f39a5d 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -328,8 +328,9 @@ mac {
-             CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
+@@ -332,8 +332,9 @@ mac {
+             CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl
             CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
         } else {
-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a
+-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
 -            CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
 +            isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
-+            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.$${QMAKE_EXTENSION_IMPORTLIB}
+            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}
         }
     } else {
-         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
+         CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
 index bbada46c29..d6299d8eed 100644
 --- a/mkspecs/features/qt.prf
@ -94,5 +94,5 @@ index c1b28a52e9..3b4372ad05 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-opengl/0020-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From 7a38a4a01fd72504c0196bc100bbaaa7138f149b Mon Sep 17 00:00:00 2001
+From 987965be28fab78041880dfbede4be209e142b26 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 20/31] Pull dependencies of static libraries in CMake modules
@ -29,12 +29,12 @@ in favour of 'how it used to work'.

 Change-Id: I6566d42d7e27d4cd23d261a0eacca9efad9ce6df
 ---
- .../data/cmake/Qt5BasicConfig.cmake.in        | 223 ++++++++++--------
- .../data/cmake/Qt5PluginTarget.cmake.in       |  84 +------
- 2 files changed, 135 insertions(+), 172 deletions(-)
+ .../data/cmake/Qt5BasicConfig.cmake.in        | 241 ++++++++++--------
+ .../data/cmake/Qt5PluginTarget.cmake.in       |  84 +-----
+ 2 files changed, 135 insertions(+), 190 deletions(-)

 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 364c23e750..a2ceede0cf 100644
+index 50364765fb..357c8b9cba 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -53,6 +53,10 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
@ -59,16 +59,16 @@ index 364c23e750..a2ceede0cf 100644
 
         # file(STRINGS) replaces all semicolons read from the file with backslash semicolons.
         # We need to do a reverse transformation in CMake. For that we replace all backslash
-@@ -79,7 +87,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
-                 # Handle normal libraries passed as -lfoo
-                 set(_lib \"${CMAKE_MATCH_1}\")
-                 foreach(_standard_library ${_standard_libraries})
-                    if(_standard_library MATCHES \"^${_lib}(\\\\.lib)?$\")
-+                    if(_standard_library MATCHES \"^${_lib}(\\\\.lib|\\\\.a)?$\")
-                         set(_lib_is_default_linked TRUE)
-                         break()
-                     endif()
-@@ -120,6 +128,37 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
+@@ -92,7 +100,7 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
+                     # Handle normal libraries passed as -lfoo
+                     set(_lib \"${CMAKE_MATCH_1}\")
+                     foreach(_standard_library ${_standard_libraries})
+-                        if(_standard_library MATCHES \"^${_lib}(\\\\.lib)?$\")
+                        if(_standard_library MATCHES \"^${_lib}(\\\\.lib|\\\\.a)?$\")
+                             set(_lib_is_default_linked TRUE)
+                             break()
+                         endif()
+@@ -139,6 +147,37 @@ function(_qt5_$${CMAKE_MODULE_NAME}_process_prl_file prl_file_location Configura
     set(${lib_deps} ${_lib_deps} PARENT_SCOPE)
     set(${link_flags} \"SHELL:${_link_flags}\" PARENT_SCOPE)
 endfunction()
@ -106,7 +106,7 @@ index 364c23e750..a2ceede0cf 100644
 !!ENDIF
 
 !!IF !equals(TEMPLATE, aux)
-@@ -133,52 +172,39 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -152,61 +191,39 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
     set(imported_location \"$${CMAKE_DLL_DIR}${LIB_LOCATION}\")
 !!ENDIF
     _qt5_$${CMAKE_MODULE_NAME}_check_file_exists(${imported_location})
@ -130,10 +130,10 @@ index 364c23e750..a2ceede0cf 100644
 !!ENDIF
 -        # For backward compatibility with CMake < 2.8.12
 -        \"IMPORTED_LINK_INTERFACE_LIBRARIES_${Configuration}\" \"${_deps};${_static_deps}\"
-    )
+     )
 -    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
 -                 \"${_deps}\"
-     )
+-    )
 -
 -!!IF !isEmpty(CMAKE_STATIC_TYPE)
 -    if(NOT "${IsDebugAndRelease}")
@ -150,20 +150,29 @@ index 364c23e750..a2ceede0cf 100644
 -        set(_static_deps_genex \"$<${_genex_condition}:${_static_deps}>\")
 -        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
 -                     \"${_static_deps_genex}\"
-        )
-    endif()
-
-    set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\")
-    if(NOT CMAKE_VERSION VERSION_LESS \"3.13\" AND _static_link_flags)
-        set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\")
-        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_OPTIONS
-            \"${_static_link_flags_genex}\"
 +    _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${Configuration}\" \"${_deps}\")
 +    if(NOT CMAKE_VERSION VERSION_LESS \"3.13\")
 +        set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 +            \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\"
         )
     endif()
+-
+-    set(_static_link_flags \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\")
+-    if(_static_link_flags)
+-        set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\")
+-        if(NOT CMAKE_VERSION VERSION_LESS \"3.13\")
+-            set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_OPTIONS
+-                \"${_static_link_flags_genex}\"
+-            )
+-        else()
+-            # Abuse INTERFACE_LINK_LIBRARIES to add link flags when CMake version is too low.
+-            # Strip out SHELL:, because it is not supported in this property. And hope for the best.
+-            string(REPLACE \"SHELL:\" \"\" _static_link_flags_genex \"${_static_link_flags_genex}\")
+-            set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+-                \"${_static_link_flags_genex}\"
+-            )
+-        endif()
+-    endif()
 +!!ELSE
 +    set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 +        \"INTERFACE_LINK_LIBRARIES_${Configuration}\" \"${_deps}\"
@ -177,7 +186,7 @@ index 364c23e750..a2ceede0cf 100644
 !!ENDIF
 
 !!IF !isEmpty(CMAKE_WINDOWS_BUILD)
-@@ -195,6 +221,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -223,6 +240,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
     endif()
 !!ENDIF
 endmacro()
@ -193,7 +202,7 @@ index 364c23e750..a2ceede0cf 100644
 !!ENDIF
 
 if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-@@ -380,13 +415,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -408,13 +434,15 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 
     add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
@ -211,7 +220,7 @@ index 364c23e750..a2ceede0cf 100644
 !!IF !equals(TEMPLATE, aux)
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-@@ -403,6 +440,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -431,6 +459,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_PLUGIN_TYPES \"$${CMAKE_MODULE_PLUGIN_TYPES}\")
 
@ -268,7 +277,7 @@ index 364c23e750..a2ceede0cf 100644
     set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
     foreach (_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR ${Qt5$${CMAKE_MODULE_NAME}_OWN_PRIVATE_INCLUDE_DIRS})
         if (NOT EXISTS ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIR})
-@@ -421,9 +508,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -449,9 +527,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
                 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
             endif()
         endforeach()
@ -282,7 +291,7 @@ index 364c23e750..a2ceede0cf 100644
     endif()
 
 !!IF !equals(TEMPLATE, aux)
-@@ -493,9 +584,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -521,9 +603,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -296,7 +305,7 @@ index 364c23e750..a2ceede0cf 100644
 !!ENDIF // CMAKE_RELEASE_TYPE
 !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
 
-@@ -506,64 +599,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -534,73 +618,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     )
 !!ENDIF // TEMPLATE != aux
 
@ -340,11 +349,20 @@ index 364c23e750..a2ceede0cf 100644
 -        endif()
 -
 -        set(_static_link_flags \"${_Qt5${Plugin}_STATIC_${Configuration}_LINK_FLAGS}\")
-        if(NOT CMAKE_VERSION VERSION_LESS \"3.13\" AND _static_link_flags)
+-        if(_static_link_flags)
 -            set(_static_link_flags_genex \"$<${_genex_condition}:${_static_link_flags}>\")
-            set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_OPTIONS
-                \"${_static_link_flags_genex}\"
-            )
+-            if(NOT CMAKE_VERSION VERSION_LESS \"3.13\")
+-                set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_OPTIONS
+-                    \"${_static_link_flags_genex}\"
+-                )
+-            else()
+-                # Abuse INTERFACE_LINK_LIBRARIES to add link flags when CMake version is too low.
+-                # Strip out SHELL:, because it is not supported in this property. And hope for the best.
+-                string(REPLACE \"SHELL:\" \"\" _static_link_flags_genex \"${_static_link_flags_genex}\")
+-                set_property(TARGET Qt5::${Plugin} APPEND PROPERTY INTERFACE_LINK_LIBRARIES
+-                    \"${_static_link_flags_genex}\"
+-                )
+-            endif()
 -        endif()
 -!!ENDIF
 -    endmacro()
@ -466,5 +484,5 @@ index 7b70cfed09..25f2162fe6 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\")
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0021-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-opengl/0021-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From 79fd08a26dba663e22ea38d1ab0e59b20601c410 Mon Sep 17 00:00:00 2001
+From 5be3611a84819a60ac3cb3ad9dd440b7af07c34f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 21/31] Allow usage of static version with CMake
@ -24,7 +24,7 @@ Change-Id: Ib9411a9edbad2a82414b1af61075172a797f4318
 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 cb4e136ded..02e28211ac 100644
+index e023f39a5d..b2594d9921 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
@@ -68,7 +68,7 @@ split_incpath {
@ -45,39 +45,39 @@ index cb4e136ded..02e28211ac 100644
 
 internal_module {
     CMAKE_INTERNAL_MODULE = true
-@@ -212,23 +214,25 @@ contains(CONFIG, plugin) {
-     CMAKE_PLUGIN_TYPE_ESCAPED = $$replace(PLUGIN_TYPE, [-/], _)
- 
+@@ -214,23 +216,25 @@ contains(CONFIG, plugin) {
     win32 {
+         !mingw|qtConfig(debug_and_release): debug_suffix="d"
+ 
 -        isEmpty(CMAKE_STATIC_TYPE) {
 +        mingw {
             CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.dll
-             CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.dll
+             CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.dll
 +            CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a
-+            CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}d.a
+            CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a
             CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl
-             CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.prl
+             CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl
 -        } else:mingw {
 -            CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.a
-            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}d.a
+-            CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.a
 -            CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}.prl
-            CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}d.prl
+-            CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/lib$${CMAKE_QT_STEM}$${debug_suffix}.prl
 +            CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.static.prl
-+            CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.static.prl
+            CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.static.prl
         } else {                         # MSVC static
             CMAKE_PLUGIN_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.lib
-             CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.lib
+             CMAKE_PLUGIN_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib
 +            CMAKE_PLUGIN_LOCATION_RELEASE_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.lib
-+            CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.lib
+            CMAKE_PLUGIN_LOCATION_DEBUG_STATIC = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.lib
             CMAKE_PRL_FILE_LOCATION_RELEASE = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}.prl
-             CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}d.prl
+             CMAKE_PRL_FILE_LOCATION_DEBUG = $$PLUGIN_TYPE/$${CMAKE_QT_STEM}$${debug_suffix}.prl
         }
     } else {
 +        # this branch is broken by the patch, only apply when building for Windows
         mac {
             isEmpty(CMAKE_STATIC_TYPE): CMAKE_PLUGIN_EXT = .dylib
             else: CMAKE_PLUGIN_EXT = .a
-@@ -248,9 +252,9 @@ contains(CONFIG, plugin) {
+@@ -250,9 +254,9 @@ contains(CONFIG, plugin) {
         }
     }
     cmake_target_file.input = $$PWD/data/cmake/Qt5PluginTarget.cmake.in
@ -89,7 +89,7 @@ index cb4e136ded..02e28211ac 100644
 
     !build_pass {
         QMAKE_SUBSTITUTES += cmake_target_file
-@@ -259,7 +263,7 @@ contains(CONFIG, plugin) {
+@@ -261,7 +265,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
@ -98,7 +98,7 @@ index cb4e136ded..02e28211ac 100644
     INSTALLS += cmake_qt5_plugin_file
 
     return()
-@@ -272,26 +276,34 @@ mod_deps =
+@@ -274,26 +278,34 @@ mod_deps =
 lib_deps =
 aux_mod_deps =
 aux_lib_deps =
@ -137,54 +137,57 @@ index cb4e136ded..02e28211ac 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
-@@ -320,35 +332,33 @@ mac {
-         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
+@@ -324,18 +336,17 @@ mac {
+         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a
         CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
 
 -        !isEmpty(CMAKE_STATIC_TYPE) {
 -            CMAKE_STATIC_WINDOWS_BUILD = "true"
-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a
+-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
 -            CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
 +        isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = dll.a
-+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.$${QMAKE_EXTENSION_IMPORTLIB}
+        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}
-+        CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.prl
+        CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl
 +        CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl
 +
-+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC = lib$${CMAKE_QT_STEM}d.a
+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
 +        CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = lib$${CMAKE_QT_STEM}.a
-+        CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}d.static.prl
+        CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl
 +        CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.static.prl
 
-            CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
+-            CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl
 -            CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
 -        } else {
 -            isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.$${QMAKE_EXTENSION_IMPORTLIB}
+-            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}
 -        }
     } else {
-         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
+         CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
+         CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
+@@ -343,19 +354,18 @@ mac {
+         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}$${debug_suffix}.lib
         CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qtmain$${QT_LIBINFIX}.lib
 
 -        !isEmpty(CMAKE_STATIC_TYPE) {
 -            CMAKE_STATIC_WINDOWS_BUILD = "true"
-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.lib
+-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
 -            CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
-+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.lib
+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
 +        CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
-+        CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.prl
+        CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl
 +        CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl
 
-            CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.prl
+-            CMAKE_PRL_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.prl
 -            CMAKE_PRL_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.prl
 -        } else {
-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.lib
+-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.lib
 -            CMAKE_IMPLIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.lib
 -        }
-+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}d.lib
+        CMAKE_IMPLIB_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.lib
 +        CMAKE_IMPLIB_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.lib
-+        CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}d.static.prl
+        CMAKE_PRL_FILE_LOCATION_DEBUG_STATIC = $${CMAKE_QT_STEM}$${debug_suffix}.static.prl
 +        CMAKE_PRL_FILE_LOCATION_RELEASE_STATIC = $${CMAKE_QT_STEM}.static.prl
     }
 } else {
@ -192,7 +195,7 @@ index cb4e136ded..02e28211ac 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
-@@ -368,12 +378,12 @@ mac {
+@@ -375,12 +385,12 @@ mac {
 INSTALLS += cmake_qt5_module_files
 
 cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@ -207,7 +210,7 @@ index cb4e136ded..02e28211ac 100644
 
 !build_pass:QMAKE_SUBSTITUTES += \
     cmake_config_file \
-@@ -383,11 +393,29 @@ cmake_qt5_module_files.files = \
+@@ -390,11 +400,29 @@ cmake_qt5_module_files.files = \
     $$cmake_config_file.output \
     $$cmake_config_version_file.output
 
@ -238,7 +241,7 @@ index cb4e136ded..02e28211ac 100644
 
     !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
 
-@@ -399,7 +427,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -406,7 +434,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
 exists($$cmake_macros_file.input) {
     CMAKE_MODULE_MACROS = "true"
 
@ -247,7 +250,7 @@ index cb4e136ded..02e28211ac 100644
     cmake_macros_file.CONFIG = verbatim
 
     !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -407,7 +435,7 @@ exists($$cmake_macros_file.input) {
+@@ -414,7 +442,7 @@ exists($$cmake_macros_file.input) {
     cmake_qt5_module_files.files += $$cmake_macros_file.output
 }
 
@ -257,7 +260,7 @@ index cb4e136ded..02e28211ac 100644
 # We are generating cmake files. Most developers of Qt are not aware of cmake,
 # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index a2ceede0cf..5883af96d3 100644
+index 357c8b9cba..38109b0182 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -3,6 +3,33 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
@ -320,7 +323,7 @@ index a2ceede0cf..5883af96d3 100644
 but this file does not exist.  Possible reasons include:
 * The file was deleted, renamed, or moved to another location.
 * An install or uninstall procedure did not complete successfully.
-@@ -159,19 +190,50 @@ if(NOT COMMAND _qt5_add_dependencies)
+@@ -178,19 +209,50 @@ if(NOT COMMAND _qt5_add_dependencies)
         endif()
     endfunction()
 endif()
@ -373,7 +376,7 @@ index a2ceede0cf..5883af96d3 100644
 
     set(_deps
         ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}
-@@ -183,15 +245,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -202,15 +264,15 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
     # FIXME: handle IsDebugAndRelease like in official version
 
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
@ -392,7 +395,7 @@ index a2ceede0cf..5883af96d3 100644
             \"INTERFACE_LINK_OPTIONS\" \"${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${Configuration}_LINK_FLAGS}\"
         )
     endif()
-@@ -213,9 +275,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
+@@ -232,9 +294,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATI
 !!ELSE
     set(imported_implib \"IMPORTED_IMPLIB_${Configuration}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
 !!ENDIF
@ -407,7 +410,7 @@ index a2ceede0cf..5883af96d3 100644
         \"IMPORTED_IMPLIB_${Configuration}\" ${imported_implib}
         )
     endif()
-@@ -232,8 +298,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P
+@@ -251,8 +317,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_plugin_target_dependencies_from_prl_file P
 endmacro()
 !!ENDIF
 
@ -417,7 +420,7 @@ index a2ceede0cf..5883af96d3 100644
 !!IF !no_module_headers
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -241,46 +306,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -260,46 +325,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
       \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_QT_STEM}.framework/Headers\"
     )
 !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
@ -482,7 +485,7 @@ index a2ceede0cf..5883af96d3 100644
     endforeach()
 
 !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -289,16 +358,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -308,16 +377,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     list(FIND Qt5$${CMAKE_MODULE_NAME}_FIND_COMPONENTS Private _check_private)
     if (NOT _check_private STREQUAL -1)
         foreach(_dir ${Qt5$${CMAKE_MODULE_NAME}_PRIVATE_INCLUDE_DIRS})
@ -506,7 +509,7 @@ index a2ceede0cf..5883af96d3 100644
 !!ENDIF // TEMPLATE != aux
     set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
 
-@@ -306,10 +379,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -325,10 +398,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\")
 !!ENDIF
 
@ -519,7 +522,7 @@ index a2ceede0cf..5883af96d3 100644
         set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
     endif()
     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
-@@ -317,17 +390,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -336,17 +409,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         set(_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET QUIET)
     endif()
     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT)
@ -541,7 +544,7 @@ index a2ceede0cf..5883af96d3 100644
                 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
                 ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
                 ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
-@@ -335,25 +408,25 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -354,25 +427,25 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
             )
         endif()
 
@ -579,7 +582,7 @@ index a2ceede0cf..5883af96d3 100644
 !!ENDIF // TEMPLATE != aux
 
     # It can happen that the same FooConfig.cmake file is included when calling find_package()
-@@ -368,11 +441,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -387,11 +460,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     #
     # Make sure to return early in the original Config inclusion, because the target has already
     # been defined as part of the second inclusion.
@ -597,7 +600,7 @@ index a2ceede0cf..5883af96d3 100644
 
 !!IF !isEmpty(CMAKE_INTERFACE_QT5_MODULE_DEPS)
     list(APPEND _Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES \"$${CMAKE_INTERFACE_QT5_MODULE_DEPS}\")
-@@ -383,13 +461,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -402,13 +480,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!IF !isEmpty(CMAKE_DEBUG_TYPE)
 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
         _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
@ -613,7 +616,7 @@ index a2ceede0cf..5883af96d3 100644
             _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LIB_DEPENDENCIES
             _Qt5$${CMAKE_MODULE_NAME}_STATIC_DEBUG_LINK_FLAGS
         )
-@@ -399,13 +477,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -418,13 +496,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!IF !isEmpty(CMAKE_RELEASE_TYPE)
 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
         _qt5_$${CMAKE_MODULE_NAME}_process_prl_file(
@ -629,7 +632,7 @@ index a2ceede0cf..5883af96d3 100644
             _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LIB_DEPENDENCIES
             _Qt5$${CMAKE_MODULE_NAME}_STATIC_RELEASE_LINK_FLAGS
         )
-@@ -413,32 +491,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -432,32 +510,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ENDIF
     endif()
 
@ -686,7 +689,7 @@ index a2ceede0cf..5883af96d3 100644
 
     # Find plugin targets
     file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
-@@ -452,7 +543,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -471,7 +562,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         endforeach()
     endif()
 
@ -698,7 +701,7 @@ index a2ceede0cf..5883af96d3 100644
         set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
 
 !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-@@ -460,7 +555,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -479,7 +574,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
 !!ENDIF
@ -710,7 +713,7 @@ index a2ceede0cf..5883af96d3 100644
         set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
             \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
         )
-@@ -490,17 +589,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -509,17 +608,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         endforeach()
     endif()
 
@ -735,7 +738,7 @@ index a2ceede0cf..5883af96d3 100644
         )
         set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
         foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -509,69 +611,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -528,69 +630,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
             endif()
         endforeach()
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
@ -831,7 +834,7 @@ index a2ceede0cf..5883af96d3 100644
     if (EXISTS
 !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -584,7 +689,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -603,7 +708,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -840,7 +843,7 @@ index a2ceede0cf..5883af96d3 100644
     endif()
 !!ENDIF // CMAKE_STATIC_TYPE
 
-@@ -594,19 +699,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -613,19 +718,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 
 !!ENDIF // CMAKE_DEBUG_TYPE
 !!ELSE // TEMPLATE != aux
@ -1058,5 +1061,5 @@ index 2a575958ae..ca0e3be3b5 100644
     INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
 )
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-opengl/0022-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From 918b0fcbabce59d577fc50f20df512d58f49d975 Mon Sep 17 00:00:00 2001
+From 37aba0f5c23f1f71126e7472ad54ade6885137dc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 22/31] Adjust linker flags for static build with
@ -25,5 +25,5 @@ index 58d1d5b366..967dc64a19 100644
 +unset(_isExe)
 +!!ENDIF
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0023-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-opengl/0023-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From c71d77d69a2b62bee1cd1b9dc704e2b56eef0c6e Mon Sep 17 00:00:00 2001
+From 623d8969b98de1c286aef4b94d54ddf38dbe6238 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 23/31] Use correct pkg-config --static flag
@ -8,7 +8,7 @@ Subject: [PATCH 23/31] Use correct pkg-config --static flag
 1 file changed, 3 insertions(+)

 diff --git a/configure.pri b/configure.pri
-index 05dc704cde..60d55eb569 100644
+index 910e59188f..aaa4123f4c 100644
 --- a/configure.pri
 +++ b/configure.pri
@@ -345,6 +345,9 @@ defineTest(qtConfTest_detectPkgConfig) {
@ -22,5 +22,5 @@ index 05dc704cde..60d55eb569 100644
     $$qtConfEvaluate("features.cross_compile") {
         # cross compiling, check that pkg-config is set up sanely
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64-opengl/0024-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,4 +1,4 @@
-From f2e043c1c3d6e268ac890062068ff4bb3306d2ff Mon Sep 17 00:00:00 2001
+From 27a3b8f6185d125e39267456483abdde1f53ba44 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
 Subject: [PATCH 24/31] Fix macro invoking moc, rcc and uic
@ -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 17cc19fc4e..29022697a4 100644
+index 84c75401b1..3a35e30777 100644
 --- a/src/corelib/Qt5CoreMacros.cmake
 +++ b/src/corelib/Qt5CoreMacros.cmake
@@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
           MAIN_DEPENDENCY ${infile} VERBATIM)
         set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0025-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64-opengl/0025-Ignore-errors-about-missing-feature-static.patch
@ -1,4 +1,4 @@
-From 3b2e2f35716d183cba076dfea9de6ce73bd2ed1d Mon Sep 17 00:00:00 2001
+From 4da7840c0167fba67d57c7879291b996b094ca0b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
 Subject: [PATCH 25/31] Ignore errors about missing feature static
@ -21,10 +21,10 @@ index 8273ba3fe1..4cdb55d4b3 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
 }
 diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
-index 661b7dd961..86c873e3fd 100644
+index 7777e615bd..5f30366660 100644
 --- a/mkspecs/features/qt_functions.prf
 +++ b/mkspecs/features/qt_functions.prf
-@@ -359,5 +359,5 @@ defineTest(qtConfig) {
+@@ -370,5 +370,5 @@ defineTest(qtConfig) {
         contains(QT.$${module}.disabled_features, $$1): \
             return(false)
     }
@ -32,5 +32,5 @@ index 661b7dd961..86c873e3fd 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
 }
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0026-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64-opengl/0026-Enable-and-fix-use-of-iconv.patch
@ -1,4 +1,4 @@
-From 14edd208b85c55eb5e313600752e769627199cde Mon Sep 17 00:00:00 2001
+From fe813fad22868934acf9f628d28eb9ebc8f1b944 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
 Subject: [PATCH 26/31] Enable and fix use of iconv
@ -74,5 +74,5 @@ index ae360239c6..5fd57a1a66 100644
         },
         "icu": {
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0027-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64-opengl/0027-Ignore-failing-pkg-config-test.patch
@ -1,4 +1,4 @@
-From d608eb4d39293401ba8cdf887385c4231c1eaae4 Mon Sep 17 00:00:00 2001
+From 30363a160959be31f59f2b3a07f2a1b0d0295937 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
 Subject: [PATCH 27/31] Ignore failing pkg-config test
@ -9,7 +9,7 @@ Didn't investigate why it fails, let's hope for the best
 1 file changed, 1 deletion(-)

 diff --git a/configure.json b/configure.json
-index bf7c14906f..19221ba008 100644
+index 846cb678c9..c39adc981f 100644
 --- a/configure.json
 +++ b/configure.json
@@ -755,7 +755,6 @@
@ -21,5 +21,5 @@ index bf7c14906f..19221ba008 100644
                 "publicFeature",
                 { "type": "publicQtConfig", "negative": true },
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64-opengl/0028-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,4 +1,4 @@
-From 479bc0ec33883ccc56930eb0bf54530acd4bd2dc Mon Sep 17 00:00:00 2001
+From 818b881fa3b76f914565d61c77845bdf4607aa18 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
 Subject: [PATCH 28/31] Prevent qmake from messing static lib dependencies
@ -41,5 +41,5 @@ index 3b4372ad05..cd10225e99 100644
     int libidx = 0;
     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0029-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64-opengl/0029-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,4 +1,4 @@
-From 6779a50c73ed1683dca19efc018b6f657c146a91 Mon Sep 17 00:00:00 2001
+From 5b7476e45f7ee7d513045582757d0de8874dcf17 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
 Subject: [PATCH 29/31] Hardcode linker flags for platform plugins
@ -152,5 +152,5 @@ index 50a3bb41a9..285d90c6d3 100644
 include(windows.pri)
 
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0030-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64-opengl/0030-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,4 +1,4 @@
-From 2860688da70e78bbff63e0089d41364e528b73f4 Mon Sep 17 00:00:00 2001
+From 8138905dc5c2fa0dd00267fd5c8f26c2236d44b4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
 Subject: [PATCH 30/31] Fix linking against static plugins with qmake
@ -33,5 +33,5 @@ index d6299d8eed..5311748953 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.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
+++ b/qt5-base/mingw-w64-opengl/0031-Prevent-Cannot-find-feature-windows_vulkan_sdk.patch
@ -1,4 +1,4 @@
-From a56c12fc0a7428ca32dc7e7f4f54ed725ef288fa Mon Sep 17 00:00:00 2001
+From 7a33424a70724ff3a404d4f8a5d537fd6d6b4895 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 24 Jun 2019 13:51:02 +0200
 Subject: [PATCH 31/31] Prevent 'Cannot find feature windows_vulkan_sdk'
@ -33,5 +33,5 @@ index 8475e4111a..c0eb8faa17 100644
     LD_USES = $$resolve_depends(LD_USES, QMAKE_DEPENDS_, _LD)
     for (nu, LD_USES) {
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-opengl/PKGBUILD
+++ b/qt5-base/mingw-w64-opengl/PKGBUILD
@ -32,7 +32,7 @@ isNoOpenGL() {
 }

 pkgname=mingw-w64-qt5-base-opengl
-pkgver=5.14.0
+pkgver=5.14.1
 pkgrel=1
 pkgdesc='A cross-platform application and UI framework (mingw-w64)'
 # The static variant doesn't contain any executables which need to be executed on the build machine
@ -86,38 +86,38 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
        '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')
-sha256sums=('4ef921c0f208a1624439801da8b3f4344a3793b660ce1095f2b7f5c4246b9463'
-            '1f4fd0f8518160f3ec0e5bc39226d857387aa4caec897201999d8eada2b328ef'
-            '450aba36cf8c60a8659406f9367a85e2055a40e1cf0a8711c6de44de1927d857'
-            '7899cdcd3450f5f0bb9cb4cd71ac6529285d4368586e1a2fabb4e14d7b3dee67'
-            '579595a48fa45191941f393defe155c57d02426e6eba1296f3f7f501f6f32576'
-            '1d233841e73c8f69a1d09b666438b26299530b23ac354e6e1e0ccbe58f3ed54c'
-            '56bdecf98463853875e257cc347141967d1edd48e21b0724d16012dd1cc8ef90'
-            '28155531ed86617a074c7a2ac8d753c052707034009ad5dcbf0f2c6dc00ee977'
-            '8f5c7da6b4ae5ce95d887372398fb147678748bca1b8970901bb0417b3440423'
-            'f1f71a736d2cbe9aa3ac04343ae171ef3fda32b5db93bd189c9fc5510c9210e4'
-            'c4b45dd1d19331caaa7ac89cb0d276cb6ec53ee1d2ed2f72fb119d1af000e907'
-            '2d74d87a8da273ed296890a7a717ea8c84242a2af534830ba07a44be88d90d70'
-            '37f11888ee60b68570b759ec66e1ab49e0bb0df0663b808380df5b34f054b5fe'
-            '68d3eeea07f398133d068151ca5ba65d5bf4e1396a7db739cdd77377e261a785'
-            '6e5ab1df1c7aac94259aca4bb8c8469939a944104cc847ddf4fdaf7f278dd225'
-            '4e421ed2b892911725a4a3e6aad9803339dc6d27af9a5caba0dcf082f5a08fa7'
-            'f0629049a60362f83ebd3e9a6a67d71274e9c2f2eae21ba97062b8d5b11d759a'
-            '31d08dbfde790dd702d87f3b995322118919fc9828f22c9b1c044e912ae6f870'
-            '8ab7f64f5d017b650c39aa6e845252be71e4f37a1bfdfeee0f17aec65e233728'
-            '6c95b8fa7ed5a2c8fb48a237d172916c6b1f3197f32b3e627216d6c9759bce14'
-            '74a4fe7f163bba1312cda135c983644260cc8794cdd950385212911eb27d985c'
-            '7e415f8aad7d950add53466406ea3e0cb67180ce6493ea768937bb96ff8de33d'
-            'eb02f4a52b712dcf8bffe57cec420b77bea060e8227f28239056b0721c494075'
-            '62a99e8e345fe776619fb5928334c40d4116e7fae59c773de70ef690dfec1d5f'
-            '87e271140d4a831a9feac53a7d0d7fae0fee9a1c20040a3181a43472c3e6f15a'
-            'c5162eac72b87e34fcbc64c53f38c0a3dd2b174cdb049db258d899510c4febfb'
-            '1d4956c53a0759988d68ebfcae12d74f1332db075efdd85d762629d12421678c'
-            'fd2eeb783fcc83fa7951b7fd07a87033f0229827282b4142047378297688a4b9'
-            'c9cb158dbc2d5446f36f031478e7174188660150a1b7bcb94d7f761a51aa7342'
-            '7611dcb33265962ecfab480771db0360f1083c7672ba874b83b335e18d8909a5'
-            'f5b2a9a54eacc2d86531005b222dff7a3313430baa55d5bae407a5fdb6028d07'
-            '65889bbb2ed14dd9e7a884a6a9015b883bbfc0d558210cc296bb3d41bee4212e')
+sha256sums=('d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7'
+            '4a57615e58ba06eb42d3723fd18e834cb8e5bd75e43bc855d17b553844490f4b'
+            '41bb9278778ea4b8115ce4aa0472435d5499c537fd9dc7d1faf99fed3c25ac07'
+            '91bc8d8e8eac2dddec9cac471f058f451d44bb0b8d45b6228b86d6e9de97f0a6'
+            '350321acfb5bc2c5e6cc78672728be35f223cbc7b632b389d799bdba9160eab7'
+            '5b8287a017d9397ffd1f60865bd8ba758ef340945f62c87ad2aafc9fbeb3b4b2'
+            'cf2a2b1e9c685592d059009aa8ffa3c834019213575ce7afed57037ea45dda3c'
+            'd9a11c90f9b0bbf82d1b9f7733b9fab1b33f3ddb4ffd7edf721c692538aa2649'
+            'd0965fa68ef531dea7e92328912e210cbe678a84b0447ecc86f2c259bd819615'
+            '9a23154796e229b0f25994a191cf0eca916d2b2cafd9a1e77915a1157ef02ad2'
+            '146648c3dcff2537661b2cef9d092e0c9105deb185cf3d7f367c45c0e46df566'
+            'ba29f00bec8bfb3467168b824efd729bd942d34c8da6ac3e428bd11f889da646'
+            '934998c9cb40896d41ce4e15b50d5705183da6aaca3ad65750b43984ccf12c10'
+            'ad3f2deb37b057a85a3897a283515c8e2a9336cd3a1d9dbca463b9a74806c4f9'
+            'e1662059f05f4caa744224fb8cbc02671983dd333227c9499307720e24be9ba1'
+            '4fd714fea42b27b763c7af8e1135b6e54b2b46b7d2cc8c71d2798c9c4fafd407'
+            'dce71cf64d40481a16b08395a5e01aa80938a08e358da18d010add9606da29a8'
+            'e787db710bd5e3ab77f173d5160fe879b971d3586bc88ed9f94d36d537e805db'
+            'c75152ebecdeb94e59c9471944fe800805086f98ae6c54392542686aae9ed7c4'
+            '1910adf8ddba8b81a6dab9231752bbf0d391419241611ad903441f9d1f968340'
+            '6c9d9164b24222ea63e2bb98254dd66a9eb1ad377589a91437f8bccbb149e757'
+            '1e587e871fc6b8fbc5e47e73eaa4b8b484823c771d5d2ebc67396730d7deffe7'
+            '4f45f035d0c12e30cabcf57058d206458999f09582486f79c485d00f3b57f53b'
+            'bd659e9867b1ec6c96c9602d9bb022b78a29e87f9690e9190c44a25967ede298'
+            '3204a14c839c2e37a46688e93ba0e3f00f32995a6b8fbf53dbff6d7e48040775'
+            '6745e3e157d6fb9db2f7147b5ab6cd40eb7ef4654cf0f9e0b59d2f90fc0abbbc'
+            '214fa36eccef5a3a1b448ac9c8a2ddc230e3ef21638e424cfeff25d705e45cb9'
+            '4d1ab6a03b65dddc2028177699e0cb5278d4a481a10a28690ec2347b3e7fa46e'
+            '85c32d151741f2fa42ab5ed16c2c85dd9e2f373dad2c8d09f7a22fbd1e1e3d72'
+            '6c163ddc1912544930d9984adcb54b6d50deb7c4a6d5bd26f6dad252748e5b92'
+            '73fa679c14c9976923cd9605ab3b838a5bce4f23d3d61f47266915296346a771'
+            'd006ec483d8d7ab0e42e086f3827e4074b78dad8a098aa98aa90dcfe0e6d300c')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'

@ -376,6 +376,10 @@ package() {
      for tool in qmake moc rcc uic qdbuscpp2xml qdbusxml2cpp qdoc syncqt.pl; do
        ln -s "../${_arch}/lib/qt/bin/${tool}" "${pkgdir}/usr/bin/${_arch}-${tool}-qt5"
      done
+
+      # create qt.conf containing plugin path, see https://github.com/Martchus/PKGBUILDs/issues/109
+      echo "[Paths]
+Plugins = /usr/${_arch}/lib/qt/plugins" > "${pkgdir}/usr/${_arch}/bin/qt.conf"
    fi

    # drop QMAKE_PRL_BUILD_DIR because reference the build dir
--- a/qt5-base/mingw-w64-opengl/qtbase-sha256.txt
+++ b/qt5-base/mingw-w64-opengl/qtbase-sha256.txt
@ -0,0 +1 @@
+d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7
--- a/qt5-base/mingw-w64-static/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64-static/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@ -1,4 +1,4 @@
-From b9877c6af8be840543ce928bf0a54bd3dc5f186e Mon Sep 17 00:00:00 2001
+From 5a6b36b853699f49504173ca35a1c47c9a54d56f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/31] Adjust win32-g++ profile for cross compilation with
@ -163,5 +163,5 @@ index 5de482f23b..3c3d22c699 100644
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64-static/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@ -1,4 +1,4 @@
-From be14c1951af73ccc2e7a9bbde0db332a0aa3fe6f Mon Sep 17 00:00:00 2001
+From 236c97172a05e530ab98153c0d16a4ddf59cd33c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
 Subject: [PATCH 02/31] Ensure GLdouble is defined when using dynamic OpenGL
@ -23,5 +23,5 @@ index 4554291bbd..23d55bddeb 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-static/0003-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -1,4 +1,4 @@
-From 982428d4be89771ffcafc850d30b47ecfdeebcc5 Mon Sep 17 00:00:00 2001
+From 160ef19acaa0504bb04a8f5ffc22229102c3ec9b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
 Subject: [PATCH 03/31] Fix too many sections assemler error in OpenGL factory
@ -25,5 +25,5 @@ index 24758afdeb..aa04b4a672 100644
     HEADERS += opengl/qopengl.h \
                opengl/qopengl_p.h \
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0004-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-static/0004-Make-sure-.pc-files-are-installed-correctly.patch
@ -1,4 +1,4 @@
-From 499284b7e311cd91dc674ae924d49ceb86c36809 Mon Sep 17 00:00:00 2001
+From d758e71cb38b4fec2f012121605185bf395206cf Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
 Subject: [PATCH 04/31] Make sure *.pc files are installed correctly
@ -10,10 +10,10 @@ Subject: [PATCH 04/31] Make sure *.pc files are installed correctly
 3 files changed, 8 insertions(+), 4 deletions(-)

 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index ed7d057a88..1694dea086 100644
+index 7e471f126c..f9532e0db9 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3212,7 +3212,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3215,7 +3215,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
 }
 
 QString
@ -22,7 +22,7 @@ index ed7d057a88..1694dea086 100644
 {
     QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
     if (ret.isEmpty()) {
-@@ -3237,7 +3237,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3240,7 +3240,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
     if(fixify) {
         if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
             ret.prepend(project->first("DESTDIR").toQString());
@ -36,10 +36,10 @@ index ed7d057a88..1694dea086 100644
     return ret;
 }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index 47e4c7531c..057853a4ce 100644
+index ab970c966f..01f97c61d4 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
-@@ -95,7 +95,7 @@ protected:
+@@ -96,7 +96,7 @@ protected:
     virtual void writeDefaultVariables(QTextStream &t);
 
     QString pkgConfigPrefix() const;
@ -62,5 +62,5 @@ index 86d10c213c..c1b28a52e9 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-static/0005-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -1,4 +1,4 @@
-From 0b7f7b8e98ade7ba816c2439e35cd60d9a5c67ac Mon Sep 17 00:00:00 2001
+From c38954b7d8c29530a5290c52f7981d7a784e7a4f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
 Subject: [PATCH 05/31] Don't add resource files to LIBS parameter
@ -24,5 +24,5 @@ index 096b041056..eb498b28e8 100644
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0006-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-static/0006-Prevent-debug-library-names-in-pkg-config-files.patch
@ -1,4 +1,4 @@
-From 8a7e29949e5fbbcd2ce02def5f0146786ffe3f59 Mon Sep 17 00:00:00 2001
+From 8b73190855f699bd7c1ff67c753fe3d17996f43b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
 Subject: [PATCH 06/31] Prevent debug library names in pkg-config files
@ -15,10 +15,10 @@ files for the debug build an unique file name.
 1 file changed, 3 insertions(+)

 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 1694dea086..01d24418ce 100644
+index f9532e0db9..9c65f21ac0 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3226,6 +3226,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3229,6 +3229,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
         if (dot != -1)
             ret = ret.left(dot);
     }
@ -29,5 +29,5 @@ index 1694dea086..01d24418ce 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0007-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64-static/0007-Fix-linking-against-shared-static-libpng.patch
@ -1,4 +1,4 @@
-From a623fd18b4613f907ddf7cdd3cd1fa3bf0b4eac0 Mon Sep 17 00:00:00 2001
+From 99c07cf7413a04cd7297a4c18e4ebf73351c8720 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
 Subject: [PATCH 07/31] Fix linking against shared/static libpng
@ -9,10 +9,10 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 1 file changed, 4 insertions(+), 2 deletions(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 19312d245d..c89831c404 100644
+index 0202f17b21..099c11da95 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -399,8 +399,10 @@
+@@ -400,8 +400,10 @@
                 { "type": "pkgConfig", "args": "libpng" },
                 { "libs": "-llibpng16", "condition": "config.msvc" },
                 { "libs": "-llibpng", "condition": "config.msvc" },
@ -26,5 +26,5 @@ index 19312d245d..c89831c404 100644
             ],
             "use": [
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0008-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-static/0008-Fix-linking-against-static-D-Bus.patch
@ -1,4 +1,4 @@
-From 8d4aa856026bbb9f87024cbea65eb482a2fef4a9 Mon Sep 17 00:00:00 2001
+From 3a5c4c981dade3223099630a16a874ba083ecd55 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
 Subject: [PATCH 08/31] Fix linking against static D-Bus
@ -9,7 +9,7 @@ Subject: [PATCH 08/31] Fix linking against static D-Bus
 2 files changed, 11 insertions(+), 2 deletions(-)

 diff --git a/configure.json b/configure.json
-index 159fdf12fa..4aa1221395 100644
+index 62d78f8dc6..f7d169f053 100644
 --- a/configure.json
 +++ b/configure.json
@@ -188,18 +188,23 @@
@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64-static/0009-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@ -1,4 +1,4 @@
-From 0f69c4775ad5f7f145e924330bffb7b351839eed Mon Sep 17 00:00:00 2001
+From e1a1979b15712954adfca6d44f45dad99357286e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
 Subject: [PATCH 09/31] Don't try to use debug version of D-Bus library
@ -12,7 +12,7 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/configure.json b/configure.json
-index 4aa1221395..bf7c14906f 100644
+index f7d169f053..846cb678c9 100644
 --- a/configure.json
 +++ b/configure.json
@@ -201,7 +201,7 @@
@ -25,5 +25,5 @@ index 4aa1221395..bf7c14906f 100644
                     },
                     "condition": "config.win32 && features.shared"
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0010-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64-static/0010-Fix-linking-against-static-freetype2.patch
@ -1,4 +1,4 @@
-From 6e50cb934d6293f26e6b2b403da5a62cfa7b6342 Mon Sep 17 00:00:00 2001
+From 3c9bf1e7fcd5f965d9f3a91d05d762d6f4061a5e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
 Subject: [PATCH 10/31] Fix linking against static freetype2
@ -8,7 +8,7 @@ Subject: [PATCH 10/31] Fix linking against static freetype2
 1 file changed, 5 insertions(+), 2 deletions(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index c89831c404..c51a1b0ce1 100644
+index 099c11da95..872deb3ad3 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
@@ -239,8 +239,11 @@
@ -26,5 +26,5 @@ index c89831c404..c51a1b0ce1 100644
                 { "libs": "-lfreetype" }
             ],
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-harfbuzz.patch
@ -1,4 +1,4 @@
-From 47cfe60f65a7a3dc8e300b72cd4df1aa5c7952c6 Mon Sep 17 00:00:00 2001
+From c7515aea498a46c8d2291b8590989d6092ab3404 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
 Subject: [PATCH 11/31] Fix linking against static harfbuzz
@ -8,7 +8,7 @@ Subject: [PATCH 11/31] Fix linking against static harfbuzz
 1 file changed, 5 insertions(+), 1 deletion(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index c51a1b0ce1..06becdaa41 100644
+index 872deb3ad3..7daaaa5a11 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
@@ -307,7 +307,11 @@
@ -25,5 +25,5 @@ index c51a1b0ce1..06becdaa41 100644
         },
         "imf": {
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-pcre.patch
@ -1,4 +1,4 @@
-From 3b7985bd23118f396645b86a1ccc414540a1c148 Mon Sep 17 00:00:00 2001
+From d3f6ecda90e28aabf58cbb4a92f22e803551ac05 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
 Subject: [PATCH 12/31] Fix linking against static pcre
@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 1 file changed, 4 insertions(+)

 diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp
-index 8d2187eb28..aaafb43039 100644
+index 67be67c243..0bc4c5157c 100644
 --- a/src/corelib/text/qregularexpression.cpp
 +++ b/src/corelib/text/qregularexpression.cpp
@@ -53,6 +53,10 @@
@ -24,5 +24,5 @@ index 8d2187eb28..aaafb43039 100644
 #include <pcre2.h>
 
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0013-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64-static/0013-Fix-linking-against-shared-static-MariaDB.patch
@ -1,4 +1,4 @@
-From 2ab64206b307901607110d750e17cadff1a337d4 Mon Sep 17 00:00:00 2001
+From e6dde84ed7cc286a9e195b96e609f244654b4540 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 13/31] Fix linking against shared/static MariaDB
@ -22,5 +22,5 @@ index cd20eef1df..babd0465ce 100644
                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-PostgreSQL.patch
@ -1,4 +1,4 @@
-From 9032e7d6eef20df7722f49d4e6f6ad060d8a6755 Mon Sep 17 00:00:00 2001
+From 44ddb94b2cab4338b0c4c941f5e3f8130a076530 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 14/31] Fix linking against shared/static PostgreSQL
@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644
             ]
         },
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-static/0015-Rename-qtmain-to-qt5main.patch
@ -1,9 +1,11 @@
-From dd827f5dae7363c5bab406e8cd2291b6d623b2b9 Mon Sep 17 00:00:00 2001
+From 27a910a4727d8d33ea9f2f70d572512365dde3e9 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
 Subject: [PATCH 15/31] Rename qtmain to qt5main

 Prevents conflict with mingw-w64-qt4 package
+
+Change-Id: I1a1533bb37d5c87b3f8e9534f67aa76026c44aed
 ---
 mkspecs/common/g++-win32.conf      | 2 +-
 mkspecs/features/create_cmake.prf  | 4 ++--
@ -25,16 +27,16 @@ index 17d2a5efec..2975d371e3 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 346fbf2467..b8045753f0 100644
+index 4aa5dad467..fa8c142ec5 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -317,8 +317,8 @@ mac {
-     CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
+@@ -321,8 +321,8 @@ mac {
+         CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
+         CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
 
-     mingw {
-        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}d.a
+-        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}$${debug_suffix}.a
 -        CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a
-+        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
+        CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a
 +        CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
 
         !isEmpty(CMAKE_STATIC_TYPE) {
@ -68,5 +70,5 @@ index 1f54c846ec..162e7a4b1b 100644
 
 CONFIG += static
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0016-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64-static/0016-Enable-rpath-for-build-tools.patch
@ -1,4 +1,4 @@
-From b1cc2e7f3e091f244473b7d03494abcb1dacbbd6 Mon Sep 17 00:00:00 2001
+From be3b19afd1ebff11fa14ddf7d91accd06a35afbe Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
 Subject: [PATCH 16/31] Enable rpath for build tools
@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
 INSTALLS += target
 
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0017-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-static/0017-Use-system-zlib-for-build-tools.patch
@ -1,4 +1,4 @@
-From 622132bfd075976303af986dae4d878eccc292ca Mon Sep 17 00:00:00 2001
+From e7c872f9a7e09ac30e4ea4b236630df96af1b601 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
 Subject: [PATCH 17/31] Use system zlib for build tools
@ -23,5 +23,5 @@ index 9863ff5e69..02329611bc 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0018-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-static/0018-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From b3ea7d1e0a967a4c07bfefdf65803ae3087dda1b Mon Sep 17 00:00:00 2001
+From 56291bee2a83d3a267bb1dab7625afd37a17d178 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 18/31] Merge shared and static library trees
@ -17,7 +17,7 @@ Change-Id: I1de08df42d83d411aae519691cd3cde1fd6f3d1d
 7 files changed, 74 insertions(+), 11 deletions(-)

 diff --git a/configure.pri b/configure.pri
-index 47882afeb6..05dc704cde 100644
+index 81c84b28ef..910e59188f 100644
 --- a/configure.pri
 +++ b/configure.pri
@@ -648,7 +648,12 @@ defineTest(qtConfOutput_machineTuple) {
@ -34,7 +34,7 @@ index 47882afeb6..05dc704cde 100644
 }
 
 # type (empty or 'host'), option name, default value
-@@ -1365,3 +1370,12 @@ defineTest(createConfigStatus) {
+@@ -1387,3 +1392,12 @@ defineTest(createConfigStatus) {
 
 QMAKE_POST_CONFIGURE += \
     "createConfigStatus()"
@ -139,10 +139,10 @@ index 51ea3a8321..275e080ae4 100644
 QMAKE_EXT_YACC          = .y
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 01d24418ce..914bb58f27 100644
+index 9c65f21ac0..f79512ca60 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3229,6 +3229,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3232,6 +3232,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
     if (project->isActiveConfig("debug")) {
         ret += "d";
     }
@ -152,7 +152,7 @@ index 01d24418ce..914bb58f27 100644
     ret += Option::pkgcfg_ext;
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
-@@ -3405,11 +3408,11 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3408,11 +3411,11 @@ MakefileGenerator::writePkgConfigFile()
     t << Qt::endl;
 
     // requires
@ -204,5 +204,5 @@ index c0ce0972ef..5a2deaf31d 100644
 mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
 INSTALLS += mkspecs
 -- 
-2.24.1
+2.25.0

--- a/qt5-base/mingw-w64-static/0019-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-static/0019-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From ca8a7fc78a4e88a58f96674104662c2306949dbf Mon Sep 17 00:00:00 2001
+From 9388b61efd236a365cf12218bfc24f2ba7b24e2f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 19/31] Use *.dll.a as import lib extension
@ -14,21 +14,21 @@ Change-Id: I1175feedd96ef4940af87dc3662fedc8f4d1d764
 3 files changed, 26 insertions(+), 9 deletions(-)

 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index b8045753f0..cb4e136ded 100644
+index fa8c142ec5..e023f39a5d 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -328,8 +328,9 @@ mac {
-             CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
+@@ -332,8 +332,9 @@ mac {
+             CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.prl
             CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
         } else {
-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a
+-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
 -            CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
 +            isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
-+            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.$${QMAKE_EXTENSION_IMPORTLIB}
+            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}
         }
     } else {
-         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
+         CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}$${debug_suffix}.dll
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
 index bbada46c29..d6299d8eed 100644
 --- a/mkspecs/features/qt.prf
@ -94,5 +94,5 @@ index c1b28a52e9..3b4372ad05 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.24.1
+2.25.0

--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7`