Update qt5 packages to 5.12.2

2019-03-16 16:58:50 +01:00 · 2019-03-16 16:58:50 +01:00 · f8bf1de7c8
parent a63ea32637
commit f8bf1de7c8
201 changed files with 1465 additions and 904 deletions
--- a/README.md
+++ b/README.md
@ -71,6 +71,8 @@ workflow is quite simple:
    * eg. `rebase-patches.sh 5.11.0 5.10.1 fixes` to create branch `5.11.0-mingw-w64` based on `5.10.1-mingw-w64-fixes`
    * after fixing possible conflicts, run `devel/qt5/continue-rebase-patches.sh`
    * otherwise, that's it
+    * all scripts need to run in the Git repository directory of the Qt module except `rebase-all-patches.sh` which needs
+      the environment variable `QT_GIT_REPOS_DIR` to be set
 2. Run `devel/qt5/update-patches.sh` or `devel/qt5/update-all-patches.sh` to update PKGBUILDs

 ## Supported build and deployment tools for mingw-w64-qt5 packages
--- a/devel/qt5/rebase-patches.sh
+++ b/devel/qt5/rebase-patches.sh
@ -30,7 +30,7 @@ if [[ $branch_count -lt 1 ]]; then
    msg2 "Branch for old version $oldversionbranch doesn't exist. Likely we just don't need any patches for this repo :-)"
    exit 0
 fi
-if [[ $branch_count -gt 1 ]]; then
+if [[ -z $3 ]] && [[ $branch_count -gt 1 ]]; then
    msg 'Which of the following branches was the latest for the old version?'
    git branch | grep "$oldversionbranch"
    msg2 'Please disambiguate by specifying the corresponding suffix as 3rd argument.'
--- a/devel/versions.sh
+++ b/devel/versions.sh
@ -11,7 +11,7 @@ declare -A versions=(
    [reflective-rapidjson]=0.0.6
    [blackwidowcontrol]=1.0.1
    [dbus-soundrecorder]=1.2.2
-    [qt5]=5.12.1
+    [qt5]=5.12.2
 )
 declare -A github_names=(
    [c++utilities]=cpp-utilities
--- a/qt5-3d/mingw-w64/PKGBUILD
+++ b/qt5-3d/mingw-w64/PKGBUILD
@ -9,7 +9,7 @@

 _qt_module=qt3d
 pkgname="mingw-w64-qt5-3d"
-pkgver=5.12.1
+pkgver=5.12.2
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="C++ and QML APIs for easy inclusion of 3D graphics (mingw-w64)"
@ -21,7 +21,7 @@ license=('GPL3' 'LGPL3' 'FDL' 'custom')
 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=('ce51ed3fe403672db2c874cbaa60f3a139ec817abd1270dc5e4255d35fd64bf1')
+sha256sums=('d4036e7ac146ba78784dde0dd99e8182372b7c38e832e33b61fed4187de0ad06')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
--- 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 c8373145859a4167b83772790879b3c453db5f83 Mon Sep 17 00:00:00 2001
+From 39cbdd617fe7d154bb77c62378ef4fa939cad59c 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.20.1
+2.21.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 6ab1661e2f6781ae219ba65f7981667ad4ed4043 Mon Sep 17 00:00:00 2001
+From e6e5e75c12ff1c0cc96662fb20a2eddb25022922 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 4601aef..65eee94 100644
     }
 
 -- 
-2.20.1
+2.21.0

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

 _qt_module=qtactiveqt
 pkgname=mingw-w64-qt5-activeqt
-pkgver=5.12.1
+pkgver=5.12.2
 pkgrel=1
 arch=('any')
 pkgdesc="ActiveX integration framework (mingw-w64)"
@ -23,9 +23,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=('a56fbd9aa018b9b91a1de6018db6538f4bc4309bfbdd86c52d437e7297983c45'
-            '1b07005fbcccf531475b131f84b6a13bff3f7281e3eb35457e93d2fe7ba7c345'
-            'ea3a9fbb5bcc3d73832489342fde116347c981bd8668685aa69f88d6a2ceed0a')
+sha256sums=('281ec22e43c5e8385ed7da0ad7f317cf200bc6c2b72e6980e7c1c318635c636b'
+            'f6a82b00428d8da4a794740addc39293322a6f3c0e04c3d1aafba357ec3d46f2'
+            '9d1cf3315c79b3e81b21c336c7953d9c2d472a02298a2c1750a47faab0ae555e')

 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
--- 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.12.1
+pkgver=5.12.2
 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 2ac45582566cb492858de99cf06cabf2fa575e30 Mon Sep 17 00:00:00 2001
+From 7b26289a1e7fafff7da844cdaac26b997febbc94 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with
@ -161,5 +161,5 @@ index ed131c6823..b8e08df0be 100644
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.20.1
+2.21.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 1083693a799b03cde91c83ff25d890640c01d780 Mon Sep 17 00:00:00 2001
+From 71303c275da3c576a5386dc50d4916ce21a58b16 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
 Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL
@ -23,5 +23,5 @@ index 00287b0665..35ad3007d1 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch
+++ b/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch
@ -1,4 +1,4 @@
-From 0be0cdb753a85725e603a02ada330cc9fd2c161e Mon Sep 17 00:00:00 2001
+From 1e421ad10dfb855e5a8626124854fb6e9ab568ca Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
 Subject: [PATCH 03/34] Use external ANGLE library
@ -93,5 +93,5 @@ index 1c76a2e46f..6a5f046b34 100644
         SUBDIRS += src_3rdparty_libpng
         src_3rdparty_freetype.depends += src_3rdparty_libpng
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-angle/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -1,4 +1,4 @@
-From 987045e209769c2b4f8f48046167b5ef9106dd70 Mon Sep 17 00:00:00 2001
+From 200e74dca03f63bac8ef550403454e069c450239 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
 Subject: [PATCH 04/34] 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.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-angle/0005-Make-sure-.pc-files-are-installed-correctly.patch
@ -1,4 +1,4 @@
-From 08286bb3f862fdc5f6cbdbb104d56d29d06b840a Mon Sep 17 00:00:00 2001
+From 77b28d91f16838274c5e6ac28cf10a0d8794c225 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
 Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
@ -10,10 +10,10 @@ Subject: [PATCH 05/34] 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 f824f12bce..07abba9e5f 100644
+index 7762e47f41..bc466d35b3 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
 }
 
 QString
@ -22,7 +22,7 @@ index f824f12bce..07abba9e5f 100644
 {
     QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
     if (ret.isEmpty()) {
-@@ -3252,7 +3252,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3255,7 +3255,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
     if(fixify) {
         if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
             ret.prepend(project->first("DESTDIR").toQString());
@ -36,7 +36,7 @@ index f824f12bce..07abba9e5f 100644
     return ret;
 }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index 0535017ff6..b2f8b961c0 100644
+index 350ebd377a..d0c234b864 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
@@ -92,7 +92,7 @@ protected:
@ -62,5 +62,5 @@ index 6046e5791e..87157f31ae 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-angle/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -1,4 +1,4 @@
-From fdec0d79a76384fcefd55c06722380a2eccbbe22 Mon Sep 17 00:00:00 2001
+From 81db0b14c6a54d49f9150f20a30a3e188ec97052 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
 Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-angle/0007-Prevent-debug-library-names-in-pkg-config-files.patch
@ -1,4 +1,4 @@
-From a7d2f0dacfb8e30058dcacf34450a467a5ff5d94 Mon Sep 17 00:00:00 2001
+From 5242deeb9bda4e9e692bb56a2cc681d4311cb0e5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
 Subject: [PATCH 07/34] 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 07abba9e5f..e640fb8079 100644
+index bc466d35b3..67d97f520a 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3241,6 +3241,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
         if (dot != -1)
             ret = ret.left(dot);
     }
@ -29,5 +29,5 @@ index 07abba9e5f..e640fb8079 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64-angle/0008-Fix-linking-against-shared-static-libpng.patch
@ -1,4 +1,4 @@
-From 95710d93c0d010afaa8ac7433b99827346bc011b Mon Sep 17 00:00:00 2001
+From 658b08047664f3f83caa324dcbfd3281e2a375cc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
 Subject: [PATCH 08/34] 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 89934c8f1d..9124e3e77e 100644
+index 44140bc7b6..19fd92bce7 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -385,8 +385,10 @@
+@@ -387,8 +387,10 @@
                 { "type": "pkgConfig", "args": "libpng" },
                 { "libs": "-llibpng16", "condition": "config.msvc" },
                 { "libs": "-llibpng", "condition": "config.msvc" },
@ -26,5 +26,5 @@ index 89934c8f1d..9124e3e77e 100644
             ],
             "use": [
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-angle/0009-Fix-linking-against-static-D-Bus.patch
@ -1,4 +1,4 @@
-From 5c645a6510d3ac66a845b695c5e30c76944f22a0 Mon Sep 17 00:00:00 2001
+From 1ca21f0dc5e507ad26f16232dd75cb351ded1d6a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
 Subject: [PATCH 09/34] Fix linking against static D-Bus
@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64-angle/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@ -1,4 +1,4 @@
-From 75d943609ad0a9814656ce151a353fb391b5df33 Mon Sep 17 00:00:00 2001
+From aef97271acabe3732d92e6c291f9b9f844bc1f29 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
 Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
@ -25,5 +25,5 @@ index c673f9a5fc..15b0f21e58 100644
                     },
                     "condition": "config.win32 && features.shared"
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64-angle/0011-Fix-linking-against-static-freetype2.patch
@ -1,4 +1,4 @@
-From 54e2fd21f8daa2f61c44d764ea19f31e03390b1d Mon Sep 17 00:00:00 2001
+From d318f8d851e848936b2e171d38ebda142f733455 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
 Subject: [PATCH 11/34] Fix linking against static freetype2
@ -8,10 +8,10 @@ Subject: [PATCH 11/34] 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 9124e3e77e..f3628f415d 100644
+index 19fd92bce7..822214a0aa 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -237,8 +237,11 @@
+@@ -238,8 +238,11 @@
             },
             "headers": "ft2build.h",
             "sources": [
@ -22,9 +22,9 @@ index 9124e3e77e..f3628f415d 100644
 +                { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
-                 { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
+                 { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
+                 { "libs": "-lfreetype" }
             ],
-             "use": [
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64-angle/0012-Fix-linking-against-static-harfbuzz.patch
@ -1,4 +1,4 @@
-From bdfd1226b5fcf7ede805676a2bb4bb8fbe047d6a Mon Sep 17 00:00:00 2001
+From 49fd90a7d66176f95ace73a34d7c2b3aca3206bd Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
 Subject: [PATCH 12/34] Fix linking against static harfbuzz
@ -8,10 +8,10 @@ Subject: [PATCH 12/34] 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 f3628f415d..b12a0e8ff2 100644
+index 822214a0aa..da4cab79a0 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -304,7 +304,11 @@
+@@ -306,7 +306,11 @@
             },
             "headers": "harfbuzz/hb.h",
             "sources": [
@ -25,5 +25,5 @@ index f3628f415d..b12a0e8ff2 100644
         },
         "imf": {
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-angle/0013-Fix-linking-against-static-pcre.patch
@ -1,4 +1,4 @@
-From 52634efb9b9b2f3de1a2941297c7670ec7d4bdfc Mon Sep 17 00:00:00 2001
+From 1b56343203f3a75b0e1ae237da4f42f6b235940b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
 Subject: [PATCH 13/34] Fix linking against static pcre
@ -24,5 +24,5 @@ index bdaa2d3243..90f8250c03 100644
 #include <pcre2.h>
 
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64-angle/0014-Fix-linking-against-shared-static-MariaDB.patch
@ -1,4 +1,4 @@
-From 6d8c6ce62a3a418cc30a6e3016eaf38ff945697b Mon Sep 17 00:00:00 2001
+From 697338ba4c3626e99aa3a501c0942a411ce55a5f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 14/34] 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.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-angle/0015-Fix-linking-against-shared-static-PostgreSQL.patch
@ -1,4 +1,4 @@
-From 0c7b1782160144c9a0839f02efd365716816400d Mon Sep 17 00:00:00 2001
+From bc71e0b2ee8e5ce96091e0fc65f2fdc986438376 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644
             ]
         },
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch
@ -1,4 +1,4 @@
-From c37572ff090abe65285eacaedf7e7022af92aae6 Mon Sep 17 00:00:00 2001
+From 53eb02bb30a316f3562e5886cd3fae8ad02af7a0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
 Subject: [PATCH 16/34] Rename qtmain to qt5main
@ -53,7 +53,7 @@ index ecb167bf18..7c9368c3b3 100644
                 QMAKE_LIBS += -L$$QT.core.libs
             CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d
 diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
-index 61e9f29d23..a1795bf265 100644
+index 9cb6ab0c59..4327ba365e 100644
 --- a/src/winmain/winmain.pro
 +++ b/src/winmain/winmain.pro
@@ -2,7 +2,7 @@
@ -66,5 +66,5 @@ index 61e9f29d23..a1795bf265 100644
 
 CONFIG += static
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch
+++ b/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch
@ -1,4 +1,4 @@
-From 901d666dd3a5609f40b5fce75620b9016660b4c5 Mon Sep 17 00:00:00 2001
+From 1289a32f82d05281db146165a94fc4d06d432972 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
 Subject: [PATCH 17/34] Build dynamic host libraries
@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.20.1
+2.21.0

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

--- a/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-angle/0019-Use-system-zlib-for-build-tools.patch
@ -1,4 +1,4 @@
-From 9056f0faf07d8493969ead198f30edc958f86fd7 Mon Sep 17 00:00:00 2001
+From 6e6bc8bbffff9972c86d660d3fdd99029e6c7c8a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
 Subject: [PATCH 19/34] Use system zlib for build tools
@ -23,5 +23,5 @@ index 83e44ff9a4..4734623936 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-angle/0020-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From 5e28a49dd99a5b682fcc9cd78985fc138a1cbc2f Mon Sep 17 00:00:00 2001
+From cf9f7a67dedc858d1f8b1e16747a31747787cb4e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 20/34] Use *.dll.a as import lib extension
@ -62,5 +62,5 @@ index 87157f31ae..4592fed7b2 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-angle/0021-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From d21a2fde18007e8abbde3407ae20b967b137069e Mon Sep 17 00:00:00 2001
+From 0e8a2cab1c1a9257ad85cfa3869433c9b454f860 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 21/34] Merge shared and static library trees
@ -13,10 +13,10 @@ Allow installation of shared and static build in the same prefix
 5 files changed, 51 insertions(+), 6 deletions(-)

 diff --git a/configure.pri b/configure.pri
-index b3b3e27c44..3136889a2f 100644
+index 629ca78ff1..b4822af13f 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) {
+@@ -1315,3 +1315,12 @@ defineTest(createConfigStatus) {
 
 QMAKE_POST_CONFIGURE += \
     "createConfigStatus()"
@ -51,10 +51,10 @@ index fbf1f3b8df..c261c46e72 100644
 
 !have_target:!force_qt: CONFIG -= qt
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 5da82fdb5b..5b05aa9e2a 100644
+index d8d5acaafd..167b8dbf2c 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -246,6 +246,23 @@ for(ever) {
+@@ -238,6 +238,23 @@ for(ever) {
             !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
                 WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
         }
@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644
 QMAKE_EXT_YACC          = .y
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index e640fb8079..fc7f729ae6 100644
+index 67d97f520a..a802c645c7 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
     if (project->isActiveConfig("debug")) {
         ret += "d";
     }
@ -114,7 +114,7 @@ index e640fb8079..fc7f729ae6 100644
     ret += Option::pkgcfg_ext;
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
-@@ -3418,9 +3421,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3421,9 +3424,9 @@ MakefileGenerator::writePkgConfigFile()
     t << endl;
 
     // requires
@ -128,5 +128,5 @@ index e640fb8079..fc7f729ae6 100644
 
     t << endl;
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-angle/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From 7f561d87a70af23d5d2a0c89e08ba5744b2f9585 Mon Sep 17 00:00:00 2001
+From b2d749f5e3b7b6d35345dff54c7eb76d2e1a3a44 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules
@ -7,18 +7,78 @@ When doing a static build of Qt, the dependencies of the Qt
 libraries and plugins itself must be specified when linking
 the final application.
 ---
- .../data/cmake/Qt5BasicConfig.cmake.in        | 148 ++++++++++++++----
+ .../data/cmake/Qt5BasicConfig.cmake.in        | 207 +++++++++++++++---
 .../data/cmake/Qt5PluginTarget.cmake.in       |  11 +-
 qmake/generators/makefile.cpp                 |  16 +-
- 3 files changed, 133 insertions(+), 42 deletions(-)
+ 3 files changed, 192 insertions(+), 42 deletions(-)

 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 3ed6dd5889..15d8b8372e 100644
+index 3ed6dd5889..9325bb3190 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -49,35 +49,52 @@ but not all the files it references.
+@@ -48,36 +48,110 @@ but not all the files it references.
+     endif()
 endmacro()
 
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+if(NOT COMMAND _qt5_add_dependencies)
+    # add dependencies via imported targets with their absolute file path so CMake does not mess with them
+    macro(_qt5_add_dependencies IMPORTED_TARGET_NAME IMPORTED_TARGET_CONFIG STATIC_DEPENDENCIES)
+        # prefer static libs
+        set(DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES \"${CMAKE_FIND_LIBRARY_SUFFIXES}\")
+        set(DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES \"${CMAKE_FIND_LIBRARY_PREFIXES}\")
+        set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib)
+        set(CMAKE_FIND_LIBRARY_PREFIXES lib \"\")
+
+        set(DEPENDENCY_INDEX 0)
+        unset(EXTRA_PATHS)
+        unset(DEPENDENCY_TARGETS)
+
+        foreach(LIBRARY_NAME ${STATIC_DEPENDENCIES})
+            if (TARGET \"${LIBRARY_NAME}\")
+                list(APPEND DEPENDENCY_TARGETS \"${LIBRARY_NAME}\")
+                continue()
+            endif()
+            set(DEPENDENCY_NAME ${IMPORTED_TARGET_NAME}_DEPENDENCY_${DEPENDENCY_INDEX})
+            if (NOT TARGET \"${DEPENDENCY_NAME}\")
+                if(EXISTS \"${LIBRARY_NAME}\")
+                    set(IMPORTED_LOCATION ${LIBRARY_NAME})
+                elseif(\"${LIBRARY_NAME}\" MATCHES \" *-l(.*)\")
+                    set(LIBRARY_NAME \"${CMAKE_MATCH_1}\")
+                    find_library(\"${DEPENDENCY_NAME}_LIBRARY_PATH\" \"${LIBRARY_NAME}\" PATHS \"${EXTRA_PATHS}\")
+                    if (NOT EXISTS "${${DEPENDENCY_NAME}_LIBRARY_PATH}")
+                        message(WARNING \"Unable to find dependency ${LIBRARY_NAME} for static Qt target (was looking in ${EXTRA_PATHS}).\")
+                        continue()
+                    endif()
+                    set(IMPORTED_LOCATION \"${${DEPENDENCY_NAME}_LIBRARY_PATH}\")
+                elseif(\"${LIBRARY_NAME}\" MATCHES \" *-L(.*)\")
+                    list(APPEND EXTRA_PATHS \"${CMAKE_MATCH_1}\")
+                else()
+                    set(IMPORTED_LOCATION ${LIBRARY_NAME})
+                    message(WARNING \"Format of dependency unknown: ${LIBRARY_NAME}\")
+                endif()
+                add_library(${DEPENDENCY_NAME} STATIC IMPORTED)
+                set_property(TARGET ${DEPENDENCY_NAME} PROPERTY IMPORTED_LOCATION ${IMPORTED_LOCATION})
+            endif()
+            if (TARGET ${DEPENDENCY_NAME})
+                list(APPEND DEPENDENCY_TARGETS ${DEPENDENCY_NAME})
+            endif()
+            math(EXPR DEPENDENCY_INDEX \"${DEPENDENCY_INDEX} + 1\")
+        endforeach()
+
+        if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\")
+            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${DEPENDENCY_TARGETS})
+        else()
+            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES_${IMPORTED_TARGET_CONFIG} ${DEPENDENCY_TARGETS})
+        endif()
+
+        # restore previous setup
+        set(CMAKE_FIND_LIBRARY_SUFFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES}\")
+        set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\")
+    endmacro()
+endif()
+!!ENDIF
+
 !!IF !equals(TEMPLATE, aux)
 -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
 -    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
@ -38,14 +98,12 @@ index 3ed6dd5889..15d8b8372e 100644
 +        set(_list_sep \";\")
 +    endif()
 +    set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-+        \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
 +        \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
 +!!IF !isEmpty(CMAKE_LIB_SONAME)
 +        \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\"
 +!!ENDIF
-+        # For backward compatibility with CMake < 2.8.12
-+        \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
 +    )
+    _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\")
 +!!ELSE
     set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 -        \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
@ -77,7 +135,7 @@ index 3ed6dd5889..15d8b8372e 100644
         )
     endif()
 !!ENDIF
-@@ -217,13 +234,47 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -217,13 +291,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
     add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
@ -98,19 +156,17 @@ index 3ed6dd5889..15d8b8372e 100644
 +        file(STRINGS "${PRL_FILE_LOCATION}" prl_strings REGEX "QMAKE_PRL_LIBS_FOR_CMAKE")
 +        string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE *= *([^\n]*)\" \"\\\\1\" static_depends ${prl_strings})
 +        string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" static_depends \"${static_depends}\")
-+        set_property(TARGET ${PLUGIN_TARGET_NAME} PROPERTY
-+            INTERFACE_LINK_LIBRARIES ${static_depends}
-+        )
+        _qt5_add_dependencies(\"${PLUGIN_TARGET_NAME}\" ALL \"${static_depends}\")
 +    endmacro()
 +
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG)
- !!ELSE
+!!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG)
 +!!ENDIF
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE)
-+!!ELSE
+ !!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE)
 +!!ENDIF
 +
@ -126,7 +182,7 @@ index 3ed6dd5889..15d8b8372e 100644
 !!IF !equals(TEMPLATE, aux)
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-@@ -238,6 +289,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -238,6 +344,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";"))
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";"))
 
@ -183,7 +239,21 @@ index 3ed6dd5889..15d8b8372e 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})
-@@ -328,9 +429,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -256,9 +412,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+                 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
+             endif()
+         endforeach()
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+        _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME}Private ALL \"Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\")
+!!ELSE
+         set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
+             INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
+         )
+!!ENDIF // CMAKE_STATIC_TYPE
+     endif()
+ 
+ !!IF !equals(TEMPLATE, aux)
+@@ -328,9 +488,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -197,7 +267,7 @@ index 3ed6dd5889..15d8b8372e 100644
 !!ENDIF // CMAKE_RELEASE_TYPE
 !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
 
-@@ -341,29 +444,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -341,29 +503,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     )
 !!ENDIF // TEMPLATE != aux
 
@ -251,7 +321,7 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index fc7f729ae6..095b4d2720 100644
+index a802c645c7..30756d9b64 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
@@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
@ -278,5 +348,5 @@ index fc7f729ae6..095b4d2720 100644
 }
 
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-angle/0023-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From c49f1674465685e03c0d95b869d6cea45dcf5447 Mon Sep 17 00:00:00 2001
+From af97d60e4f62cffec74c0c4905b79b49aab598af Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 23/34] Allow usage of static version with CMake
@ -12,13 +12,13 @@ installed in the same prefix
   via regular find_package(Qt5Core)
 ---
 mkspecs/features/create_cmake.prf             | 103 +++---
- .../data/cmake/Qt5BasicConfig.cmake.in        | 302 ++++++++++++------
+ .../data/cmake/Qt5BasicConfig.cmake.in        | 305 ++++++++++++------
 .../data/cmake/Qt5PluginTarget.cmake.in       |  18 +-
 .../cmake/Qt5StaticOnlyRedirection.cmake.in   |  11 +
 src/corelib/Qt5CoreConfigExtras.cmake.in      |  24 +-
 src/gui/Qt5GuiConfigExtras.cmake.in           |   8 +-
 src/testlib/Qt5TestConfigExtras.cmake.in      |   2 +-
- 7 files changed, 315 insertions(+), 153 deletions(-)
+ 7 files changed, 316 insertions(+), 155 deletions(-)
 create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in

 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
@ -244,7 +244,7 @@ index 2a94964b49..839a51f377 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 15d8b8372e..939e55dfd8 100644
+index 9325bb3190..7ee0c86130 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)
@ -307,19 +307,19 @@ index 15d8b8372e..939e55dfd8 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.
-@@ -48,23 +79,60 @@ but not all the files it references.
-     endif()
- endmacro()
- 
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+@@ -105,33 +136,68 @@ if(NOT COMMAND _qt5_add_dependencies)
+         set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\")
+     endmacro()
+ endif()
+
 +# ensure also regular/dynamic macro exists because it might be used in some extra config
 +if(NOT COMMAND _qt5_$${CMAKE_MODULE_NAME}_check_file_exists)
 +    macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists FILE)
-+        _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static("${FILE}")
+        _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${FILE}\")
 +    endmacro()
 +endif()
-+!!ENDIF
-+
+ !!ENDIF
+ 
 !!IF !equals(TEMPLATE, aux)
 -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION)
 -    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${TARGET_CONFIG})
@ -368,19 +368,20 @@ index 15d8b8372e..939e55dfd8 100644
     endif()
 -    set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 +    set_target_properties(${TARGET_NAME} PROPERTIES
-         \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
         \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
 !!IF !isEmpty(CMAKE_LIB_SONAME)
-@@ -74,7 +142,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
-         \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
+         \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\"
+ !!ENDIF
     )
+-    _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\")
+    _qt5_add_dependencies(\"${TARGET_NAME}\" \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\")
 !!ELSE
 -    set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 +    set_target_properties(${TARGET_NAME} PROPERTIES
         \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
         \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
 !!IF !isEmpty(CMAKE_LIB_SONAME)
-@@ -91,9 +159,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
+@@ -148,9 +214,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
 !!ELSE
     set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
 !!ENDIF
@ -395,7 +396,7 @@ index 15d8b8372e..939e55dfd8 100644
         \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib}
         )
     endif()
-@@ -101,8 +173,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
+@@ -158,8 +228,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
 endmacro()
 !!ENDIF
 
@ -406,7 +407,7 @@ index 15d8b8372e..939e55dfd8 100644
 !!IF !no_module_headers
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -110,46 +183,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -167,46 +238,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
       \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
     )
 !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
@ -474,7 +475,7 @@ index 15d8b8372e..939e55dfd8 100644
     endforeach()
 
 !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -158,16 +235,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -215,16 +290,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})
@ -498,7 +499,7 @@ index 15d8b8372e..939e55dfd8 100644
 !!ENDIF // TEMPLATE != aux
     set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
 
-@@ -175,10 +256,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -232,10 +311,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\")
 !!ENDIF
 
@ -511,7 +512,7 @@ index 15d8b8372e..939e55dfd8 100644
         set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
     endif()
     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
-@@ -186,17 +267,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -243,17 +322,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)
@ -533,7 +534,7 @@ index 15d8b8372e..939e55dfd8 100644
                 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
                 ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
                 ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
-@@ -204,36 +285,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -261,36 +340,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
             )
         endif()
 
@ -589,7 +590,7 @@ index 15d8b8372e..939e55dfd8 100644
     macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION)
         if (EXISTS \"${PRL_FILE_LOCATION}\")
             file(STRINGS \"${PRL_FILE_LOCATION}\" prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE\")
-@@ -257,37 +343,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -312,37 +396,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     endmacro()
 
 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@ -650,7 +651,7 @@ index 15d8b8372e..939e55dfd8 100644
 
     # Find plugin targets
     file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
-@@ -301,7 +398,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -356,7 +451,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         endforeach()
     endif()
 
@ -662,7 +663,7 @@ index 15d8b8372e..939e55dfd8 100644
         set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
 
 !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-@@ -309,7 +410,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -364,7 +463,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
 !!ENDIF
@ -674,7 +675,7 @@ index 15d8b8372e..939e55dfd8 100644
         set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
             \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
         )
-@@ -340,16 +445,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -395,16 +498,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     endif()
 
     set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
@ -695,15 +696,20 @@ index 15d8b8372e..939e55dfd8 100644
         )
         set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
         foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -357,66 +462,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-                 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
+@@ -413,69 +516,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
             endif()
         endforeach()
+ !!IF !isEmpty(CMAKE_STATIC_TYPE)
+-        _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME}Private ALL \"Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\")
+        _qt5_add_dependencies(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private ALL
+            \"${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\")
+ !!ELSE
 -        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
 -            INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
 +        set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
 +            INTERFACE_LINK_LIBRARIES ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
         )
+ !!ENDIF // CMAKE_STATIC_TYPE
     endif()
 
 !!IF !equals(TEMPLATE, aux)
@ -786,7 +792,7 @@ index 15d8b8372e..939e55dfd8 100644
     if (EXISTS
 !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -429,7 +536,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -488,7 +594,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -795,7 +801,7 @@ index 15d8b8372e..939e55dfd8 100644
     endif()
 !!ENDIF // CMAKE_STATIC_TYPE
 
-@@ -439,19 +546,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -498,19 +604,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 
 !!ENDIF // CMAKE_DEBUG_TYPE
 !!ELSE // TEMPLATE != aux
@ -997,5 +1003,5 @@ index 2a575958ae..ca0e3be3b5 100644
     INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
 )
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-angle/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From 5decd2ed0bdfafd01c119357c73fc91e470b9f61 Mon Sep 17 00:00:00 2001
+From 25143b06d43a9a4cceb6d038f4f97d5f2af53c8e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 24/34] Adjust linker flags for static build with
@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644
 +unset(_isExe)
 +!!ENDIF
 -- 
-2.20.1
+2.21.0

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

 diff --git a/configure.pri b/configure.pri
-index 3136889a2f..601629c047 100644
+index b4822af13f..addb27b6d7 100644
 --- a/configure.pri
 +++ b/configure.pri
@@ -328,6 +328,9 @@ defineTest(qtConfTest_detectPkgConfig) {
@ -22,5 +22,5 @@ index 3136889a2f..601629c047 100644
     $$qtConfEvaluate("features.cross_compile") {
         # cross compiling, check that pkg-config is set up sanely
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64-angle/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,4 +1,4 @@
-From ad4a59bd142b2b3ab402ed8d0337ac972f77e76c Mon Sep 17 00:00:00 2001
+From 7fc63fcd9c5e8a2c864c7de9fa14338ce3e82969 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
 Subject: [PATCH 26/34] Fix macro invoking moc, rcc and uic
@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
           MAIN_DEPENDENCY ${infile} VERBATIM)
         set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64-angle/0027-Ignore-errors-about-missing-feature-static.patch
@ -1,4 +1,4 @@
-From a17249171793a58d2a0308879e96465e96c362f1 Mon Sep 17 00:00:00 2001
+From 93aba1e6a5106bc91b34fada1d5343ff25b9ce43 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
 Subject: [PATCH 27/34] Ignore errors about missing feature static
@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
 }
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64-angle/0028-Enable-and-fix-use-of-iconv.patch
@ -1,4 +1,4 @@
-From 94bf26c2b8ae87dc5add63ef4df8b765e4067651 Mon Sep 17 00:00:00 2001
+From 512be5eb5add4a5f2146ca0a0b3a8b7a434c600a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
 Subject: [PATCH 28/34] Enable and fix use of iconv
@ -74,5 +74,5 @@ index a22a7459bd..b7ed2f7281 100644
         },
         "icu": {
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64-angle/0029-Ignore-failing-pkg-config-test.patch
@ -1,4 +1,4 @@
-From 93dcee644f3059e381310bd0e4f905caeebfa05b Mon Sep 17 00:00:00 2001
+From 41e9bbfc0c70d1a94f7c90aef50493e3341389b7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
 Subject: [PATCH 29/34] Ignore failing pkg-config test
@ -21,5 +21,5 @@ index 15b0f21e58..46cc841148 100644
                 "publicFeature",
                 { "type": "publicQtConfig", "negative": true },
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64-angle/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,4 +1,4 @@
-From e917a88d58047cdb3fb46c1b07fb78648bf74358 Mon Sep 17 00:00:00 2001
+From f41ba61108dd735410e4feac87fa23b321d0a20f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
 Subject: [PATCH 30/34] Prevent qmake from messing static lib dependencies
@ -11,7 +11,7 @@ static freetype2 and harfbuzz
 2 files changed, 6 insertions(+)

 diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index 4cbe06d9dc..47535f60d5 100644
+index 7f42fbe09e..e27428c0f2 100644
 --- a/qmake/generators/unix/unixmake.cpp
 +++ b/qmake/generators/unix/unixmake.cpp
@@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
@ -39,5 +39,5 @@ index 4592fed7b2..b93d0df473 100644
     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
         dirs.append(QMakeLocalFileName(dlib.toQString()));
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64-angle/0031-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,4 +1,4 @@
-From fe25b3abe19208154631b6315587fce9bacc4991 Mon Sep 17 00:00:00 2001
+From 2c28928b34fc030330b00f16fcb546a477c48621 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
 Subject: [PATCH 31/34] Hardcode linker flags for platform plugins
@ -82,7 +82,7 @@ index a1a2da547b..7ef91b574d 100644
 DEFINES += QT_NO_FOREACH
 
 diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro
-index 6652cefd86..a322b17cc5 100644
+index 392ee8bed1..f1f266e2c2 100644
 --- a/src/plugins/platforms/offscreen/offscreen.pro
 +++ b/src/plugins/platforms/offscreen/offscreen.pro
@@ -1,8 +1,18 @@
@ -149,5 +149,5 @@ index 174bc7b609..e66488e364 100644
 include(windows.pri)
 
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64-angle/0032-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,4 +1,4 @@
-From 1cd9a4e98c177d3b794f2c0549b6f74ddf0e6e65 Mon Sep 17 00:00:00 2001
+From 00034061c0b8ad7c875ef00a687d95c2100f15f3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
 Subject: [PATCH 32/34] Fix linking against static plugins with qmake
@ -11,7 +11,7 @@ approach
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 5b05aa9e2a..2732c94797 100644
+index 167b8dbf2c..5cfb4f62c9 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
@@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d
@ -33,5 +33,5 @@ index 5b05aa9e2a..2732c94797 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.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch
+++ b/qt5-base/mingw-w64-angle/0033-Disable-hardware-randomizer-for-32-bit.patch
@ -1,4 +1,4 @@
-From b26414fad10e9ff16f305b3484670260e07df70e Mon Sep 17 00:00:00 2001
+From f3ec9ba64cd4a80639959abbef537ce718dc70d6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 May 2018 03:47:14 +0200
 Subject: [PATCH 33/34] Disable hardware randomizer for 32-bit
@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644
 #else
     return false;
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-angle/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch
+++ b/qt5-base/mingw-w64-angle/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch
@ -1,4 +1,4 @@
-From 62ddbd09af7ddeb08d21ccbaf2c8724a12c52ef6 Mon Sep 17 00:00:00 2001
+From ee1d9dbd64b6123280c47b8633daf3d407f12ae6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 3 Feb 2019 14:34:42 +0100
 Subject: [PATCH 34/34] Prevent static build to prefer dynamic libraries
@ -10,10 +10,10 @@ in order to get a fully statically linked binary in the end.
 1 file changed, 6 insertions(+), 6 deletions(-)

 diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
-index c45439c3ef..7953cdd19e 100644
+index 7ca65c92b3..48fa54a166 100644
 --- a/mkspecs/features/qt_configure.prf
 +++ b/mkspecs/features/qt_configure.prf
-@@ -541,12 +541,12 @@ defineTest(qtConfResolveLibs) {
+@@ -553,12 +553,12 @@ defineTest(qtConfResolveLibs) {
                 # Under Windows, we look only for static libraries, as even for DLLs
                 # one actually links against a static import library.
                 mingw {
@ -33,5 +33,5 @@ index c45439c3ef..7953cdd19e 100644
                 lcan += $${lib}.lib
             }
 -- 
-2.20.1
+2.21.0

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

 pkgname=mingw-w64-qt5-base-angle
-pkgver=5.12.1
+pkgver=5.12.2
 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,41 +86,41 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
        '0032-Fix-linking-against-static-plugins-with-qmake.patch'
        '0033-Disable-hardware-randomizer-for-32-bit.patch'
        '0034-Prevent-static-build-to-prefer-dynamic-libraries.patch')
-sha256sums=('533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049'
-            '4e1dbb878b77dbba96a9564ecbded6dbd74482b52e1cf4becaa1ce741c8cf489'
-            'f54815ff2fede9dbdc0ade572305ff684940714ca65e76d25f5b15cd0cb0a3da'
-            'c60e6cef5d0c95b6d034ade75fde3cf150e1570f5ca62d6b32d942abcb937f86'
-            '0a82cde28edae5abb8d624cea407db515c1d52e8963f07aa8430c1d1f810e54a'
-            '39059ed786851c1cdf416c4d0a9a5b042edda83bddd03b5bfcbcae1eaf8f7694'
-            '4ef83cf4d211c446a5715cfa422f130492ae18bfb5cb42db9ff6516ed7fb29f1'
-            '48ee96ffc01d5ab7c648f4aae6cee286992e4eb406e48718058092206f8ad2eb'
-            '58f27f2359b3571aac44a3770a705692eed9e6fd24b6e6bf730e7aad5ee4a030'
-            'cf6154d83655efbf30281c4f83d29feb252fd104849f8e2ad495da688e581314'
-            'edf080092f4d158d2e42cedd50f80b3b5715ae47f740b16fa43132f1dc68cf9d'
-            '1c3c46c26809e59e91732d2ff082a445dac4986294f400277272c2337d8c21f3'
-            '3ee7b4f4ed6ea86794a5d119c7000033d0f61208150e37f35428e52611f7ae3f'
-            '1d18e225c4bda89fe024a47834a8b79d9c8e4d1ba884d7dc6b07a93bf0307a85'
-            '2affe7ac03016cfd536f63d61c0f5bd42932fc3823b7f2dbabca9c2db5a53ae6'
-            'd0a2e33d20c4d6063f7546fbc84d2f6a5a96955f998ba7af4320bc005fa2a722'
-            '9941e9c883496bb3409a12ef3f73b6f3d76e106061381deb74380eafb1ac472f'
-            'f336402daf227aa529080ab31612a205c936438ecbfab3627252164d8903c1b1'
-            '8cf716c22bf0fface6e3c015cd4d621425e3b20771b15ab03eeeeb59db248756'
-            '95f9847a1fe05ad78ae4a682208894d995becc0ca4f3463d39781e8a52543017'
-            '132fc790cfa528063fe95c3bc104826cb82105cd24e05ed77593115212987dc3'
-            '8ace42d2ec1b7a05a6bacf93f899775906c407f349efbbd2533b942fb474f200'
-            '8849864de4abf2dd70ffe2fe70aabb608c296eccdc41e6f4061645bd39f63c50'
-            '60ca9adfe6ae46d6dc7b4874c3202b46bc57f6649a45fb5301e4e4b63e70aa5e'
-            '47f83f04256afe1bd8701c31673e00e445b65840b5fe2bd132a98c8f292aa9c4'
-            '305b30fad80fba756bd3ad6c34c95030fc3927d52a3dc9b90d2705b390831734'
-            '91f37e9098e78881c1953c85e592e108be27dae08a83278f4a9885cb296a6871'
-            '9ca5f2175d8679b7312d8cb718ddc648e161a6aae631b5d4c9e528594a020d1a'
-            '3a5619542cb549ba7cc2bf1f9b77d524e5f9aa78d1e8dea6cd75c4f09b6aabc9'
-            'e30cf84af1ff7764cb0e0644a7bfbde920f463af9c24aab53abef9cf3410ceb3'
-            'fdd36ed82c5a8df7a0157b4ce9a3be16ec4c2b98cdf071a2be662603045da652'
-            '55b42d68ca7981ef777a7f081f840b1b80ada8c0dc9508092ec9fba151a88dfd'
-            '06f98f6ce25da7010e7398111ee7b79f380b79a7ab125eba3ef6d051af92cf8a'
-            '5a097dc80dc07aa755e77c50a469c3c08bf5b562ad9b116dbbf891a072e7bdc2'
-            '66047e08db2282d69563b3081b847fa7c041c3c387ab00ca72ff481b91124925')
+sha256sums=('562c095a59c95f393762ec53bc05c0d80fad1758fd5ff7a5231967d1a98d56c1'
+            'c00565f03113cde30d3a7f8badb93162013a88399bb06eaae70592912df8d4c5'
+            '050ce8f1b6c7c95b5a6c47357e8a49b078fd1df5b918466678f9e4a289069944'
+            'eae6d4d5fdc434279e445cde156cb3a7e20ce490c6b0d57dbb306d879147dcf9'
+            'd1b594a807f19a788ade63d13fd47d110e6ef03178ec26aab0dd0d00e328e0d7'
+            '8f70f6fc4b7e1cfd68717a5f0814a4bd70f4800ef052b43006c8602b793d59ec'
+            '06b313e9c95ed32c3b82592e7e8824c44b3a1fc554bc47ba151c5f36b46e05e2'
+            'c0eee68dc34518ed4164711b3a69d50f99d4fbb0c6173c8e38dd6b5517c19536'
+            '545d351d7986c72b8d662d1417b28957db5a47e667e72a858bf8942f97ede6cb'
+            '2ba1bca2e3be4615c8b1f9f73e8868543aa3c8e4ab932a503a97ad6ccdfedf50'
+            'eb04c06b8a1427efebf3c1a833a49877c697785e2f109dff233626c36cfeb007'
+            '3011580418c55e8bd232e5f1d9b43c9ec65dbe3339e795c8687ba1f744d89813'
+            '2dd37f28b8d816858e6bbed179f14036443c129c1afc7f7a768e7429afef2863'
+            'da364a529d5e152ffe4e1f72a9267943ee1bb85ce44433ce4e12675e7cea27cf'
+            '8fe5700557c7e7ec3b24758d253dd6f6b42a32b1f739daf856fe038e2ba96425'
+            '61d28c257322907a4334dbe755c28d49bb66a1bc6944b5cb5d578d2cdb568e25'
+            '2048f2f03ae14f7687426b512fe956b7e1eea4cafba570eb9909790c745c4fe9'
+            'ecef2faaba4a4e6f05f24d56b52d99518531581541dbd213d37acc579539d1c3'
+            '5fb06a23b7d14ed06270f34f34c972227c8674d5684d32517c5f0bcddd3d7050'
+            'a77c0710c9a3f8e0cf50e6eb25b509e01284fa00409288ca885541b6e472d127'
+            '187deaccba8407bc8f363e1032cd5e14578c363b2d79c063ebfe131d985605f8'
+            '73dd1bb7cd31cbe90eda80065679aed7cad89899d6bdb531fbc062391836b2ff'
+            '74090e540b4276c2cf8722b3a72d99ad1fa10b44d25c980e363629b9aed87579'
+            'ad74076f636d1a88d54002e8918074be29157a32a5122def2e20803bd2c0af1d'
+            '97be647f6d5ad29bcf9f313efbd641ca9895757d7032c740ab00bcad8d114b54'
+            'c42240c548594ff05e555ff24d4b17d630cbcd2e5e90952ff88bfc85630de527'
+            '10aef30b86431746a002bff9e5ce5af46cb138b31a5e182aa3b9f9dbda3be22f'
+            'afdabb26ec027f41f52ca6c736cfaf8a95c5c59d28061a240a20f7d521dfde2e'
+            'f766bc129f5ad8e2fca7705fb5d135fbc1144aa8dddca004b141b11bc193efe1'
+            '65d0ac8597be9eb0a695153396b231079204d9451337807685734304b4f672ed'
+            'f56f00584a77a7c80428b6218ac4a848758cf49ca047ef1b7f11b81a2b55aaee'
+            '7ef1fcb918d6079ae6cc97a12730faf3819f94b68f4005afb3c7cbd3c8cbb186'
+            'fe65e9657a337a8fab9e362478d6d1ba794f90315a277660b05577c4c044cebb'
+            '586dc48f77e001152e59c28c1afdaad64c03957d0052e4905b34c2ef2bcd308a'
+            '46f454f756dcc298629ec6b73cb15c643edf9ace7a0e181b43055575e3e86190')

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

--- a/qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64-dynamic/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@ -1,4 +1,4 @@
-From 2ac45582566cb492858de99cf06cabf2fa575e30 Mon Sep 17 00:00:00 2001
+From 7b26289a1e7fafff7da844cdaac26b997febbc94 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with
@ -161,5 +161,5 @@ index ed131c6823..b8e08df0be 100644
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64-dynamic/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@ -1,4 +1,4 @@
-From 1083693a799b03cde91c83ff25d890640c01d780 Mon Sep 17 00:00:00 2001
+From 71303c275da3c576a5386dc50d4916ce21a58b16 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
 Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL
@ -23,5 +23,5 @@ index 00287b0665..35ad3007d1 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch
+++ b/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch
@ -1,4 +1,4 @@
-From 0be0cdb753a85725e603a02ada330cc9fd2c161e Mon Sep 17 00:00:00 2001
+From 1e421ad10dfb855e5a8626124854fb6e9ab568ca Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
 Subject: [PATCH 03/34] Use external ANGLE library
@ -93,5 +93,5 @@ index 1c76a2e46f..6a5f046b34 100644
         SUBDIRS += src_3rdparty_libpng
         src_3rdparty_freetype.depends += src_3rdparty_libpng
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-dynamic/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -1,4 +1,4 @@
-From 987045e209769c2b4f8f48046167b5ef9106dd70 Mon Sep 17 00:00:00 2001
+From 200e74dca03f63bac8ef550403454e069c450239 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
 Subject: [PATCH 04/34] 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.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-dynamic/0005-Make-sure-.pc-files-are-installed-correctly.patch
@ -1,4 +1,4 @@
-From 08286bb3f862fdc5f6cbdbb104d56d29d06b840a Mon Sep 17 00:00:00 2001
+From 77b28d91f16838274c5e6ac28cf10a0d8794c225 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
 Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
@ -10,10 +10,10 @@ Subject: [PATCH 05/34] 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 f824f12bce..07abba9e5f 100644
+index 7762e47f41..bc466d35b3 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
 }
 
 QString
@ -22,7 +22,7 @@ index f824f12bce..07abba9e5f 100644
 {
     QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
     if (ret.isEmpty()) {
-@@ -3252,7 +3252,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3255,7 +3255,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
     if(fixify) {
         if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
             ret.prepend(project->first("DESTDIR").toQString());
@ -36,7 +36,7 @@ index f824f12bce..07abba9e5f 100644
     return ret;
 }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index 0535017ff6..b2f8b961c0 100644
+index 350ebd377a..d0c234b864 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
@@ -92,7 +92,7 @@ protected:
@ -62,5 +62,5 @@ index 6046e5791e..87157f31ae 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-dynamic/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -1,4 +1,4 @@
-From fdec0d79a76384fcefd55c06722380a2eccbbe22 Mon Sep 17 00:00:00 2001
+From 81db0b14c6a54d49f9150f20a30a3e188ec97052 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
 Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-dynamic/0007-Prevent-debug-library-names-in-pkg-config-files.patch
@ -1,4 +1,4 @@
-From a7d2f0dacfb8e30058dcacf34450a467a5ff5d94 Mon Sep 17 00:00:00 2001
+From 5242deeb9bda4e9e692bb56a2cc681d4311cb0e5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
 Subject: [PATCH 07/34] 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 07abba9e5f..e640fb8079 100644
+index bc466d35b3..67d97f520a 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3241,6 +3241,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
         if (dot != -1)
             ret = ret.left(dot);
     }
@ -29,5 +29,5 @@ index 07abba9e5f..e640fb8079 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64-dynamic/0008-Fix-linking-against-shared-static-libpng.patch
@ -1,4 +1,4 @@
-From 95710d93c0d010afaa8ac7433b99827346bc011b Mon Sep 17 00:00:00 2001
+From 658b08047664f3f83caa324dcbfd3281e2a375cc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
 Subject: [PATCH 08/34] 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 89934c8f1d..9124e3e77e 100644
+index 44140bc7b6..19fd92bce7 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -385,8 +385,10 @@
+@@ -387,8 +387,10 @@
                 { "type": "pkgConfig", "args": "libpng" },
                 { "libs": "-llibpng16", "condition": "config.msvc" },
                 { "libs": "-llibpng", "condition": "config.msvc" },
@ -26,5 +26,5 @@ index 89934c8f1d..9124e3e77e 100644
             ],
             "use": [
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-dynamic/0009-Fix-linking-against-static-D-Bus.patch
@ -1,4 +1,4 @@
-From 5c645a6510d3ac66a845b695c5e30c76944f22a0 Mon Sep 17 00:00:00 2001
+From 1ca21f0dc5e507ad26f16232dd75cb351ded1d6a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
 Subject: [PATCH 09/34] Fix linking against static D-Bus
@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64-dynamic/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@ -1,4 +1,4 @@
-From 75d943609ad0a9814656ce151a353fb391b5df33 Mon Sep 17 00:00:00 2001
+From aef97271acabe3732d92e6c291f9b9f844bc1f29 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
 Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
@ -25,5 +25,5 @@ index c673f9a5fc..15b0f21e58 100644
                     },
                     "condition": "config.win32 && features.shared"
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64-dynamic/0011-Fix-linking-against-static-freetype2.patch
@ -1,4 +1,4 @@
-From 54e2fd21f8daa2f61c44d764ea19f31e03390b1d Mon Sep 17 00:00:00 2001
+From d318f8d851e848936b2e171d38ebda142f733455 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
 Subject: [PATCH 11/34] Fix linking against static freetype2
@ -8,10 +8,10 @@ Subject: [PATCH 11/34] 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 9124e3e77e..f3628f415d 100644
+index 19fd92bce7..822214a0aa 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -237,8 +237,11 @@
+@@ -238,8 +238,11 @@
             },
             "headers": "ft2build.h",
             "sources": [
@ -22,9 +22,9 @@ index 9124e3e77e..f3628f415d 100644
 +                { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
-                 { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
+                 { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
+                 { "libs": "-lfreetype" }
             ],
-             "use": [
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64-dynamic/0012-Fix-linking-against-static-harfbuzz.patch
@ -1,4 +1,4 @@
-From bdfd1226b5fcf7ede805676a2bb4bb8fbe047d6a Mon Sep 17 00:00:00 2001
+From 49fd90a7d66176f95ace73a34d7c2b3aca3206bd Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
 Subject: [PATCH 12/34] Fix linking against static harfbuzz
@ -8,10 +8,10 @@ Subject: [PATCH 12/34] 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 f3628f415d..b12a0e8ff2 100644
+index 822214a0aa..da4cab79a0 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -304,7 +304,11 @@
+@@ -306,7 +306,11 @@
             },
             "headers": "harfbuzz/hb.h",
             "sources": [
@ -25,5 +25,5 @@ index f3628f415d..b12a0e8ff2 100644
         },
         "imf": {
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-dynamic/0013-Fix-linking-against-static-pcre.patch
@ -1,4 +1,4 @@
-From 52634efb9b9b2f3de1a2941297c7670ec7d4bdfc Mon Sep 17 00:00:00 2001
+From 1b56343203f3a75b0e1ae237da4f42f6b235940b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
 Subject: [PATCH 13/34] Fix linking against static pcre
@ -24,5 +24,5 @@ index bdaa2d3243..90f8250c03 100644
 #include <pcre2.h>
 
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64-dynamic/0014-Fix-linking-against-shared-static-MariaDB.patch
@ -1,4 +1,4 @@
-From 6d8c6ce62a3a418cc30a6e3016eaf38ff945697b Mon Sep 17 00:00:00 2001
+From 697338ba4c3626e99aa3a501c0942a411ce55a5f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 14/34] 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.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-dynamic/0015-Fix-linking-against-shared-static-PostgreSQL.patch
@ -1,4 +1,4 @@
-From 0c7b1782160144c9a0839f02efd365716816400d Mon Sep 17 00:00:00 2001
+From bc71e0b2ee8e5ce96091e0fc65f2fdc986438376 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644
             ]
         },
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch
@ -1,4 +1,4 @@
-From c37572ff090abe65285eacaedf7e7022af92aae6 Mon Sep 17 00:00:00 2001
+From 53eb02bb30a316f3562e5886cd3fae8ad02af7a0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
 Subject: [PATCH 16/34] Rename qtmain to qt5main
@ -53,7 +53,7 @@ index ecb167bf18..7c9368c3b3 100644
                 QMAKE_LIBS += -L$$QT.core.libs
             CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d
 diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
-index 61e9f29d23..a1795bf265 100644
+index 9cb6ab0c59..4327ba365e 100644
 --- a/src/winmain/winmain.pro
 +++ b/src/winmain/winmain.pro
@@ -2,7 +2,7 @@
@ -66,5 +66,5 @@ index 61e9f29d23..a1795bf265 100644
 
 CONFIG += static
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch
+++ b/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch
@ -1,4 +1,4 @@
-From 901d666dd3a5609f40b5fce75620b9016660b4c5 Mon Sep 17 00:00:00 2001
+From 1289a32f82d05281db146165a94fc4d06d432972 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
 Subject: [PATCH 17/34] Build dynamic host libraries
@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64-dynamic/0018-Enable-rpath-for-build-tools.patch
@ -1,4 +1,4 @@
-From 8ae9fed6ff5f5bf2e4c1d031baa7c03282268b35 Mon Sep 17 00:00:00 2001
+From 8f12c750711b71fded02ad3e6bee6e88f93f4bae Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
 Subject: [PATCH 18/34] Enable rpath for build tools
@ -33,5 +33,5 @@ index 8354f30eea..30e8cf18c5 100644
 INSTALLS += target
 
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-dynamic/0019-Use-system-zlib-for-build-tools.patch
@ -1,4 +1,4 @@
-From 9056f0faf07d8493969ead198f30edc958f86fd7 Mon Sep 17 00:00:00 2001
+From 6e6bc8bbffff9972c86d660d3fdd99029e6c7c8a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
 Subject: [PATCH 19/34] Use system zlib for build tools
@ -23,5 +23,5 @@ index 83e44ff9a4..4734623936 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-dynamic/0020-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From 5e28a49dd99a5b682fcc9cd78985fc138a1cbc2f Mon Sep 17 00:00:00 2001
+From cf9f7a67dedc858d1f8b1e16747a31747787cb4e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 20/34] Use *.dll.a as import lib extension
@ -62,5 +62,5 @@ index 87157f31ae..4592fed7b2 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-dynamic/0021-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From d21a2fde18007e8abbde3407ae20b967b137069e Mon Sep 17 00:00:00 2001
+From 0e8a2cab1c1a9257ad85cfa3869433c9b454f860 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 21/34] Merge shared and static library trees
@ -13,10 +13,10 @@ Allow installation of shared and static build in the same prefix
 5 files changed, 51 insertions(+), 6 deletions(-)

 diff --git a/configure.pri b/configure.pri
-index b3b3e27c44..3136889a2f 100644
+index 629ca78ff1..b4822af13f 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) {
+@@ -1315,3 +1315,12 @@ defineTest(createConfigStatus) {
 
 QMAKE_POST_CONFIGURE += \
     "createConfigStatus()"
@ -51,10 +51,10 @@ index fbf1f3b8df..c261c46e72 100644
 
 !have_target:!force_qt: CONFIG -= qt
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 5da82fdb5b..5b05aa9e2a 100644
+index d8d5acaafd..167b8dbf2c 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -246,6 +246,23 @@ for(ever) {
+@@ -238,6 +238,23 @@ for(ever) {
             !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
                 WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
         }
@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644
 QMAKE_EXT_YACC          = .y
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index e640fb8079..fc7f729ae6 100644
+index 67d97f520a..a802c645c7 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
     if (project->isActiveConfig("debug")) {
         ret += "d";
     }
@ -114,7 +114,7 @@ index e640fb8079..fc7f729ae6 100644
     ret += Option::pkgcfg_ext;
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
-@@ -3418,9 +3421,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3421,9 +3424,9 @@ MakefileGenerator::writePkgConfigFile()
     t << endl;
 
     // requires
@ -128,5 +128,5 @@ index e640fb8079..fc7f729ae6 100644
 
     t << endl;
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-dynamic/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From 7f561d87a70af23d5d2a0c89e08ba5744b2f9585 Mon Sep 17 00:00:00 2001
+From b2d749f5e3b7b6d35345dff54c7eb76d2e1a3a44 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules
@ -7,18 +7,78 @@ When doing a static build of Qt, the dependencies of the Qt
 libraries and plugins itself must be specified when linking
 the final application.
 ---
- .../data/cmake/Qt5BasicConfig.cmake.in        | 148 ++++++++++++++----
+ .../data/cmake/Qt5BasicConfig.cmake.in        | 207 +++++++++++++++---
 .../data/cmake/Qt5PluginTarget.cmake.in       |  11 +-
 qmake/generators/makefile.cpp                 |  16 +-
- 3 files changed, 133 insertions(+), 42 deletions(-)
+ 3 files changed, 192 insertions(+), 42 deletions(-)

 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 3ed6dd5889..15d8b8372e 100644
+index 3ed6dd5889..9325bb3190 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -49,35 +49,52 @@ but not all the files it references.
+@@ -48,36 +48,110 @@ but not all the files it references.
+     endif()
 endmacro()
 
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+if(NOT COMMAND _qt5_add_dependencies)
+    # add dependencies via imported targets with their absolute file path so CMake does not mess with them
+    macro(_qt5_add_dependencies IMPORTED_TARGET_NAME IMPORTED_TARGET_CONFIG STATIC_DEPENDENCIES)
+        # prefer static libs
+        set(DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES \"${CMAKE_FIND_LIBRARY_SUFFIXES}\")
+        set(DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES \"${CMAKE_FIND_LIBRARY_PREFIXES}\")
+        set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib)
+        set(CMAKE_FIND_LIBRARY_PREFIXES lib \"\")
+
+        set(DEPENDENCY_INDEX 0)
+        unset(EXTRA_PATHS)
+        unset(DEPENDENCY_TARGETS)
+
+        foreach(LIBRARY_NAME ${STATIC_DEPENDENCIES})
+            if (TARGET \"${LIBRARY_NAME}\")
+                list(APPEND DEPENDENCY_TARGETS \"${LIBRARY_NAME}\")
+                continue()
+            endif()
+            set(DEPENDENCY_NAME ${IMPORTED_TARGET_NAME}_DEPENDENCY_${DEPENDENCY_INDEX})
+            if (NOT TARGET \"${DEPENDENCY_NAME}\")
+                if(EXISTS \"${LIBRARY_NAME}\")
+                    set(IMPORTED_LOCATION ${LIBRARY_NAME})
+                elseif(\"${LIBRARY_NAME}\" MATCHES \" *-l(.*)\")
+                    set(LIBRARY_NAME \"${CMAKE_MATCH_1}\")
+                    find_library(\"${DEPENDENCY_NAME}_LIBRARY_PATH\" \"${LIBRARY_NAME}\" PATHS \"${EXTRA_PATHS}\")
+                    if (NOT EXISTS "${${DEPENDENCY_NAME}_LIBRARY_PATH}")
+                        message(WARNING \"Unable to find dependency ${LIBRARY_NAME} for static Qt target (was looking in ${EXTRA_PATHS}).\")
+                        continue()
+                    endif()
+                    set(IMPORTED_LOCATION \"${${DEPENDENCY_NAME}_LIBRARY_PATH}\")
+                elseif(\"${LIBRARY_NAME}\" MATCHES \" *-L(.*)\")
+                    list(APPEND EXTRA_PATHS \"${CMAKE_MATCH_1}\")
+                else()
+                    set(IMPORTED_LOCATION ${LIBRARY_NAME})
+                    message(WARNING \"Format of dependency unknown: ${LIBRARY_NAME}\")
+                endif()
+                add_library(${DEPENDENCY_NAME} STATIC IMPORTED)
+                set_property(TARGET ${DEPENDENCY_NAME} PROPERTY IMPORTED_LOCATION ${IMPORTED_LOCATION})
+            endif()
+            if (TARGET ${DEPENDENCY_NAME})
+                list(APPEND DEPENDENCY_TARGETS ${DEPENDENCY_NAME})
+            endif()
+            math(EXPR DEPENDENCY_INDEX \"${DEPENDENCY_INDEX} + 1\")
+        endforeach()
+
+        if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\")
+            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${DEPENDENCY_TARGETS})
+        else()
+            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES_${IMPORTED_TARGET_CONFIG} ${DEPENDENCY_TARGETS})
+        endif()
+
+        # restore previous setup
+        set(CMAKE_FIND_LIBRARY_SUFFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES}\")
+        set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\")
+    endmacro()
+endif()
+!!ENDIF
+
 !!IF !equals(TEMPLATE, aux)
 -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
 -    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
@ -38,14 +98,12 @@ index 3ed6dd5889..15d8b8372e 100644
 +        set(_list_sep \";\")
 +    endif()
 +    set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-+        \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
 +        \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
 +!!IF !isEmpty(CMAKE_LIB_SONAME)
 +        \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\"
 +!!ENDIF
-+        # For backward compatibility with CMake < 2.8.12
-+        \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
 +    )
+    _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\")
 +!!ELSE
     set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 -        \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
@ -77,7 +135,7 @@ index 3ed6dd5889..15d8b8372e 100644
         )
     endif()
 !!ENDIF
-@@ -217,13 +234,47 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -217,13 +291,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
     add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
@ -98,19 +156,17 @@ index 3ed6dd5889..15d8b8372e 100644
 +        file(STRINGS "${PRL_FILE_LOCATION}" prl_strings REGEX "QMAKE_PRL_LIBS_FOR_CMAKE")
 +        string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE *= *([^\n]*)\" \"\\\\1\" static_depends ${prl_strings})
 +        string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" static_depends \"${static_depends}\")
-+        set_property(TARGET ${PLUGIN_TARGET_NAME} PROPERTY
-+            INTERFACE_LINK_LIBRARIES ${static_depends}
-+        )
+        _qt5_add_dependencies(\"${PLUGIN_TARGET_NAME}\" ALL \"${static_depends}\")
 +    endmacro()
 +
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG)
- !!ELSE
+!!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG)
 +!!ENDIF
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE)
-+!!ELSE
+ !!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE)
 +!!ENDIF
 +
@ -126,7 +182,7 @@ index 3ed6dd5889..15d8b8372e 100644
 !!IF !equals(TEMPLATE, aux)
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-@@ -238,6 +289,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -238,6 +344,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";"))
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";"))
 
@ -183,7 +239,21 @@ index 3ed6dd5889..15d8b8372e 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})
-@@ -328,9 +429,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -256,9 +412,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+                 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
+             endif()
+         endforeach()
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+        _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME}Private ALL \"Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\")
+!!ELSE
+         set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
+             INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
+         )
+!!ENDIF // CMAKE_STATIC_TYPE
+     endif()
+ 
+ !!IF !equals(TEMPLATE, aux)
+@@ -328,9 +488,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -197,7 +267,7 @@ index 3ed6dd5889..15d8b8372e 100644
 !!ENDIF // CMAKE_RELEASE_TYPE
 !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
 
-@@ -341,29 +444,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -341,29 +503,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     )
 !!ENDIF // TEMPLATE != aux
 
@ -251,7 +321,7 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index fc7f729ae6..095b4d2720 100644
+index a802c645c7..30756d9b64 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
@@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
@ -278,5 +348,5 @@ index fc7f729ae6..095b4d2720 100644
 }
 
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-dynamic/0023-Allow-usage-of-static-version-with-CMake.patch
@ -1,4 +1,4 @@
-From c49f1674465685e03c0d95b869d6cea45dcf5447 Mon Sep 17 00:00:00 2001
+From af97d60e4f62cffec74c0c4905b79b49aab598af Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 23/34] Allow usage of static version with CMake
@ -12,13 +12,13 @@ installed in the same prefix
   via regular find_package(Qt5Core)
 ---
 mkspecs/features/create_cmake.prf             | 103 +++---
- .../data/cmake/Qt5BasicConfig.cmake.in        | 302 ++++++++++++------
+ .../data/cmake/Qt5BasicConfig.cmake.in        | 305 ++++++++++++------
 .../data/cmake/Qt5PluginTarget.cmake.in       |  18 +-
 .../cmake/Qt5StaticOnlyRedirection.cmake.in   |  11 +
 src/corelib/Qt5CoreConfigExtras.cmake.in      |  24 +-
 src/gui/Qt5GuiConfigExtras.cmake.in           |   8 +-
 src/testlib/Qt5TestConfigExtras.cmake.in      |   2 +-
- 7 files changed, 315 insertions(+), 153 deletions(-)
+ 7 files changed, 316 insertions(+), 155 deletions(-)
 create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in

 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
@ -244,7 +244,7 @@ index 2a94964b49..839a51f377 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 15d8b8372e..939e55dfd8 100644
+index 9325bb3190..7ee0c86130 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)
@ -307,19 +307,19 @@ index 15d8b8372e..939e55dfd8 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.
-@@ -48,23 +79,60 @@ but not all the files it references.
-     endif()
- endmacro()
- 
-+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+@@ -105,33 +136,68 @@ if(NOT COMMAND _qt5_add_dependencies)
+         set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\")
+     endmacro()
+ endif()
+
 +# ensure also regular/dynamic macro exists because it might be used in some extra config
 +if(NOT COMMAND _qt5_$${CMAKE_MODULE_NAME}_check_file_exists)
 +    macro(_qt5_$${CMAKE_MODULE_NAME}_check_file_exists FILE)
-+        _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static("${FILE}")
+        _qt5_$${CMAKE_MODULE_NAME}_check_file_exists_static(\"${FILE}\")
 +    endmacro()
 +endif()
-+!!ENDIF
-+
+ !!ENDIF
+ 
 !!IF !equals(TEMPLATE, aux)
 -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATION IMPLIB_LOCATION)
 -    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${TARGET_CONFIG})
@ -368,19 +368,20 @@ index 15d8b8372e..939e55dfd8 100644
     endif()
 -    set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 +    set_target_properties(${TARGET_NAME} PROPERTIES
-         \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
         \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
 !!IF !isEmpty(CMAKE_LIB_SONAME)
-@@ -74,7 +142,7 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
-         \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
+         \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\"
+ !!ENDIF
     )
+-    _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\")
+    _qt5_add_dependencies(\"${TARGET_NAME}\" \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\")
 !!ELSE
 -    set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 +    set_target_properties(${TARGET_NAME} PROPERTIES
         \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
         \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
 !!IF !isEmpty(CMAKE_LIB_SONAME)
-@@ -91,9 +159,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
+@@ -148,9 +214,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
 !!ELSE
     set(imported_implib \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
 !!ENDIF
@ -395,7 +396,7 @@ index 15d8b8372e..939e55dfd8 100644
         \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib}
         )
     endif()
-@@ -101,8 +173,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
+@@ -158,8 +228,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
 endmacro()
 !!ENDIF
 
@ -406,7 +407,7 @@ index 15d8b8372e..939e55dfd8 100644
 !!IF !no_module_headers
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -110,46 +183,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -167,46 +238,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
       \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}Qt$${CMAKE_MODULE_NAME}.framework/Headers\"
     )
 !!IF isEmpty(CMAKE_NO_PRIVATE_INCLUDES)
@ -474,7 +475,7 @@ index 15d8b8372e..939e55dfd8 100644
     endforeach()
 
 !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -158,16 +235,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -215,16 +290,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})
@ -498,7 +499,7 @@ index 15d8b8372e..939e55dfd8 100644
 !!ENDIF // TEMPLATE != aux
     set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
 
-@@ -175,10 +256,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -232,10 +311,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\")
 !!ENDIF
 
@ -511,7 +512,7 @@ index 15d8b8372e..939e55dfd8 100644
         set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
     endif()
     set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
-@@ -186,17 +267,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -243,17 +322,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)
@ -533,7 +534,7 @@ index 15d8b8372e..939e55dfd8 100644
                 $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
                 ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
                 ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
-@@ -204,36 +285,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -261,36 +340,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
             )
         endif()
 
@ -589,7 +590,7 @@ index 15d8b8372e..939e55dfd8 100644
     macro(_process_prl_file PRL_FILE_LOCATION CONFIGURATION)
         if (EXISTS \"${PRL_FILE_LOCATION}\")
             file(STRINGS \"${PRL_FILE_LOCATION}\" prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE\")
-@@ -257,37 +343,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -312,37 +396,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     endmacro()
 
 !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@ -650,7 +651,7 @@ index 15d8b8372e..939e55dfd8 100644
 
     # Find plugin targets
     file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
-@@ -301,7 +398,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -356,7 +451,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         endforeach()
     endif()
 
@ -662,7 +663,7 @@ index 15d8b8372e..939e55dfd8 100644
         set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
 
 !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-@@ -309,7 +410,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -364,7 +463,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
 !!ENDIF
@ -674,7 +675,7 @@ index 15d8b8372e..939e55dfd8 100644
         set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
             \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
         )
-@@ -340,16 +445,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -395,16 +498,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     endif()
 
     set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
@ -695,15 +696,20 @@ index 15d8b8372e..939e55dfd8 100644
         )
         set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
         foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -357,66 +462,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-                 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
+@@ -413,69 +516,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
             endif()
         endforeach()
+ !!IF !isEmpty(CMAKE_STATIC_TYPE)
+-        _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME}Private ALL \"Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\")
+        _qt5_add_dependencies(${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private ALL
+            \"${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\")
+ !!ELSE
 -        set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
 -            INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
 +        set_property(TARGET ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
 +            INTERFACE_LINK_LIBRARIES ${QT_VARIANT_PREFIX}Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
         )
+ !!ENDIF // CMAKE_STATIC_TYPE
     endif()
 
 !!IF !equals(TEMPLATE, aux)
@ -786,7 +792,7 @@ index 15d8b8372e..939e55dfd8 100644
     if (EXISTS
 !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -429,7 +536,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -488,7 +594,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -795,7 +801,7 @@ index 15d8b8372e..939e55dfd8 100644
     endif()
 !!ENDIF // CMAKE_STATIC_TYPE
 
-@@ -439,19 +546,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -498,19 +604,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 
 !!ENDIF // CMAKE_DEBUG_TYPE
 !!ELSE // TEMPLATE != aux
@ -997,5 +1003,5 @@ index 2a575958ae..ca0e3be3b5 100644
     INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
 )
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-dynamic/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@ -1,4 +1,4 @@
-From 5decd2ed0bdfafd01c119357c73fc91e470b9f61 Mon Sep 17 00:00:00 2001
+From 25143b06d43a9a4cceb6d038f4f97d5f2af53c8e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 24/34] Adjust linker flags for static build with
@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644
 +unset(_isExe)
 +!!ENDIF
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-dynamic/0025-Use-correct-pkg-config-static-flag.patch
@ -1,4 +1,4 @@
-From 9a0c4a937083e14ad32a8a25feb92333b5015dda Mon Sep 17 00:00:00 2001
+From 348b46baa42d1001d2a650a0fe44a2254068bb8e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 25/34] Use correct pkg-config --static flag
@ -8,7 +8,7 @@ Subject: [PATCH 25/34] Use correct pkg-config --static flag
 1 file changed, 3 insertions(+)

 diff --git a/configure.pri b/configure.pri
-index 3136889a2f..601629c047 100644
+index b4822af13f..addb27b6d7 100644
 --- a/configure.pri
 +++ b/configure.pri
@@ -328,6 +328,9 @@ defineTest(qtConfTest_detectPkgConfig) {
@ -22,5 +22,5 @@ index 3136889a2f..601629c047 100644
     $$qtConfEvaluate("features.cross_compile") {
         # cross compiling, check that pkg-config is set up sanely
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64-dynamic/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
@ -1,4 +1,4 @@
-From ad4a59bd142b2b3ab402ed8d0337ac972f77e76c Mon Sep 17 00:00:00 2001
+From 7fc63fcd9c5e8a2c864c7de9fa14338ce3e82969 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
 Subject: [PATCH 26/34] Fix macro invoking moc, rcc and uic
@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
           MAIN_DEPENDENCY ${infile} VERBATIM)
         set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64-dynamic/0027-Ignore-errors-about-missing-feature-static.patch
@ -1,4 +1,4 @@
-From a17249171793a58d2a0308879e96465e96c362f1 Mon Sep 17 00:00:00 2001
+From 93aba1e6a5106bc91b34fada1d5343ff25b9ce43 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
 Subject: [PATCH 27/34] Ignore errors about missing feature static
@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
 }
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64-dynamic/0028-Enable-and-fix-use-of-iconv.patch
@ -1,4 +1,4 @@
-From 94bf26c2b8ae87dc5add63ef4df8b765e4067651 Mon Sep 17 00:00:00 2001
+From 512be5eb5add4a5f2146ca0a0b3a8b7a434c600a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
 Subject: [PATCH 28/34] Enable and fix use of iconv
@ -74,5 +74,5 @@ index a22a7459bd..b7ed2f7281 100644
         },
         "icu": {
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0029-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64-dynamic/0029-Ignore-failing-pkg-config-test.patch
@ -1,4 +1,4 @@
-From 93dcee644f3059e381310bd0e4f905caeebfa05b Mon Sep 17 00:00:00 2001
+From 41e9bbfc0c70d1a94f7c90aef50493e3341389b7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
 Subject: [PATCH 29/34] Ignore failing pkg-config test
@ -21,5 +21,5 @@ index 15b0f21e58..46cc841148 100644
                 "publicFeature",
                 { "type": "publicQtConfig", "negative": true },
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64-dynamic/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
@ -1,4 +1,4 @@
-From e917a88d58047cdb3fb46c1b07fb78648bf74358 Mon Sep 17 00:00:00 2001
+From f41ba61108dd735410e4feac87fa23b321d0a20f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
 Subject: [PATCH 30/34] Prevent qmake from messing static lib dependencies
@ -11,7 +11,7 @@ static freetype2 and harfbuzz
 2 files changed, 6 insertions(+)

 diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index 4cbe06d9dc..47535f60d5 100644
+index 7f42fbe09e..e27428c0f2 100644
 --- a/qmake/generators/unix/unixmake.cpp
 +++ b/qmake/generators/unix/unixmake.cpp
@@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
@ -39,5 +39,5 @@ index 4592fed7b2..b93d0df473 100644
     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
         dirs.append(QMakeLocalFileName(dlib.toQString()));
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64-dynamic/0031-Hardcode-linker-flags-for-platform-plugins.patch
@ -1,4 +1,4 @@
-From fe25b3abe19208154631b6315587fce9bacc4991 Mon Sep 17 00:00:00 2001
+From 2c28928b34fc030330b00f16fcb546a477c48621 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
 Subject: [PATCH 31/34] Hardcode linker flags for platform plugins
@ -82,7 +82,7 @@ index a1a2da547b..7ef91b574d 100644
 DEFINES += QT_NO_FOREACH
 
 diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro
-index 6652cefd86..a322b17cc5 100644
+index 392ee8bed1..f1f266e2c2 100644
 --- a/src/plugins/platforms/offscreen/offscreen.pro
 +++ b/src/plugins/platforms/offscreen/offscreen.pro
@@ -1,8 +1,18 @@
@ -149,5 +149,5 @@ index 174bc7b609..e66488e364 100644
 include(windows.pri)
 
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64-dynamic/0032-Fix-linking-against-static-plugins-with-qmake.patch
@ -1,4 +1,4 @@
-From 1cd9a4e98c177d3b794f2c0549b6f74ddf0e6e65 Mon Sep 17 00:00:00 2001
+From 00034061c0b8ad7c875ef00a687d95c2100f15f3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
 Subject: [PATCH 32/34] Fix linking against static plugins with qmake
@ -11,7 +11,7 @@ approach
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 5b05aa9e2a..2732c94797 100644
+index 167b8dbf2c..5cfb4f62c9 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
@@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d
@ -33,5 +33,5 @@ index 5b05aa9e2a..2732c94797 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.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch
+++ b/qt5-base/mingw-w64-dynamic/0033-Disable-hardware-randomizer-for-32-bit.patch
@ -1,4 +1,4 @@
-From b26414fad10e9ff16f305b3484670260e07df70e Mon Sep 17 00:00:00 2001
+From f3ec9ba64cd4a80639959abbef537ce718dc70d6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 May 2018 03:47:14 +0200
 Subject: [PATCH 33/34] Disable hardware randomizer for 32-bit
@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644
 #else
     return false;
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-dynamic/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch
+++ b/qt5-base/mingw-w64-dynamic/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch
@ -1,4 +1,4 @@
-From 62ddbd09af7ddeb08d21ccbaf2c8724a12c52ef6 Mon Sep 17 00:00:00 2001
+From ee1d9dbd64b6123280c47b8633daf3d407f12ae6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 3 Feb 2019 14:34:42 +0100
 Subject: [PATCH 34/34] Prevent static build to prefer dynamic libraries
@ -10,10 +10,10 @@ in order to get a fully statically linked binary in the end.
 1 file changed, 6 insertions(+), 6 deletions(-)

 diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
-index c45439c3ef..7953cdd19e 100644
+index 7ca65c92b3..48fa54a166 100644
 --- a/mkspecs/features/qt_configure.prf
 +++ b/mkspecs/features/qt_configure.prf
-@@ -541,12 +541,12 @@ defineTest(qtConfResolveLibs) {
+@@ -553,12 +553,12 @@ defineTest(qtConfResolveLibs) {
                 # Under Windows, we look only for static libraries, as even for DLLs
                 # one actually links against a static import library.
                 mingw {
@ -33,5 +33,5 @@ index c45439c3ef..7953cdd19e 100644
                 lcan += $${lib}.lib
             }
 -- 
-2.20.1
+2.21.0

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

 pkgname=mingw-w64-qt5-base-dynamic
-pkgver=5.12.1
+pkgver=5.12.2
 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,41 +86,41 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
        '0032-Fix-linking-against-static-plugins-with-qmake.patch'
        '0033-Disable-hardware-randomizer-for-32-bit.patch'
        '0034-Prevent-static-build-to-prefer-dynamic-libraries.patch')
-sha256sums=('533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049'
-            '4e1dbb878b77dbba96a9564ecbded6dbd74482b52e1cf4becaa1ce741c8cf489'
-            'f54815ff2fede9dbdc0ade572305ff684940714ca65e76d25f5b15cd0cb0a3da'
-            'c60e6cef5d0c95b6d034ade75fde3cf150e1570f5ca62d6b32d942abcb937f86'
-            '0a82cde28edae5abb8d624cea407db515c1d52e8963f07aa8430c1d1f810e54a'
-            '39059ed786851c1cdf416c4d0a9a5b042edda83bddd03b5bfcbcae1eaf8f7694'
-            '4ef83cf4d211c446a5715cfa422f130492ae18bfb5cb42db9ff6516ed7fb29f1'
-            '48ee96ffc01d5ab7c648f4aae6cee286992e4eb406e48718058092206f8ad2eb'
-            '58f27f2359b3571aac44a3770a705692eed9e6fd24b6e6bf730e7aad5ee4a030'
-            'cf6154d83655efbf30281c4f83d29feb252fd104849f8e2ad495da688e581314'
-            'edf080092f4d158d2e42cedd50f80b3b5715ae47f740b16fa43132f1dc68cf9d'
-            '1c3c46c26809e59e91732d2ff082a445dac4986294f400277272c2337d8c21f3'
-            '3ee7b4f4ed6ea86794a5d119c7000033d0f61208150e37f35428e52611f7ae3f'
-            '1d18e225c4bda89fe024a47834a8b79d9c8e4d1ba884d7dc6b07a93bf0307a85'
-            '2affe7ac03016cfd536f63d61c0f5bd42932fc3823b7f2dbabca9c2db5a53ae6'
-            'd0a2e33d20c4d6063f7546fbc84d2f6a5a96955f998ba7af4320bc005fa2a722'
-            '9941e9c883496bb3409a12ef3f73b6f3d76e106061381deb74380eafb1ac472f'
-            'f336402daf227aa529080ab31612a205c936438ecbfab3627252164d8903c1b1'
-            '8cf716c22bf0fface6e3c015cd4d621425e3b20771b15ab03eeeeb59db248756'
-            '95f9847a1fe05ad78ae4a682208894d995becc0ca4f3463d39781e8a52543017'
-            '132fc790cfa528063fe95c3bc104826cb82105cd24e05ed77593115212987dc3'
-            '8ace42d2ec1b7a05a6bacf93f899775906c407f349efbbd2533b942fb474f200'
-            '8849864de4abf2dd70ffe2fe70aabb608c296eccdc41e6f4061645bd39f63c50'
-            '60ca9adfe6ae46d6dc7b4874c3202b46bc57f6649a45fb5301e4e4b63e70aa5e'
-            '47f83f04256afe1bd8701c31673e00e445b65840b5fe2bd132a98c8f292aa9c4'
-            '305b30fad80fba756bd3ad6c34c95030fc3927d52a3dc9b90d2705b390831734'
-            '91f37e9098e78881c1953c85e592e108be27dae08a83278f4a9885cb296a6871'
-            '9ca5f2175d8679b7312d8cb718ddc648e161a6aae631b5d4c9e528594a020d1a'
-            '3a5619542cb549ba7cc2bf1f9b77d524e5f9aa78d1e8dea6cd75c4f09b6aabc9'
-            'e30cf84af1ff7764cb0e0644a7bfbde920f463af9c24aab53abef9cf3410ceb3'
-            'fdd36ed82c5a8df7a0157b4ce9a3be16ec4c2b98cdf071a2be662603045da652'
-            '55b42d68ca7981ef777a7f081f840b1b80ada8c0dc9508092ec9fba151a88dfd'
-            '06f98f6ce25da7010e7398111ee7b79f380b79a7ab125eba3ef6d051af92cf8a'
-            '5a097dc80dc07aa755e77c50a469c3c08bf5b562ad9b116dbbf891a072e7bdc2'
-            '66047e08db2282d69563b3081b847fa7c041c3c387ab00ca72ff481b91124925')
+sha256sums=('562c095a59c95f393762ec53bc05c0d80fad1758fd5ff7a5231967d1a98d56c1'
+            'c00565f03113cde30d3a7f8badb93162013a88399bb06eaae70592912df8d4c5'
+            '050ce8f1b6c7c95b5a6c47357e8a49b078fd1df5b918466678f9e4a289069944'
+            'eae6d4d5fdc434279e445cde156cb3a7e20ce490c6b0d57dbb306d879147dcf9'
+            'd1b594a807f19a788ade63d13fd47d110e6ef03178ec26aab0dd0d00e328e0d7'
+            '8f70f6fc4b7e1cfd68717a5f0814a4bd70f4800ef052b43006c8602b793d59ec'
+            '06b313e9c95ed32c3b82592e7e8824c44b3a1fc554bc47ba151c5f36b46e05e2'
+            'c0eee68dc34518ed4164711b3a69d50f99d4fbb0c6173c8e38dd6b5517c19536'
+            '545d351d7986c72b8d662d1417b28957db5a47e667e72a858bf8942f97ede6cb'
+            '2ba1bca2e3be4615c8b1f9f73e8868543aa3c8e4ab932a503a97ad6ccdfedf50'
+            'eb04c06b8a1427efebf3c1a833a49877c697785e2f109dff233626c36cfeb007'
+            '3011580418c55e8bd232e5f1d9b43c9ec65dbe3339e795c8687ba1f744d89813'
+            '2dd37f28b8d816858e6bbed179f14036443c129c1afc7f7a768e7429afef2863'
+            'da364a529d5e152ffe4e1f72a9267943ee1bb85ce44433ce4e12675e7cea27cf'
+            '8fe5700557c7e7ec3b24758d253dd6f6b42a32b1f739daf856fe038e2ba96425'
+            '61d28c257322907a4334dbe755c28d49bb66a1bc6944b5cb5d578d2cdb568e25'
+            '2048f2f03ae14f7687426b512fe956b7e1eea4cafba570eb9909790c745c4fe9'
+            'ecef2faaba4a4e6f05f24d56b52d99518531581541dbd213d37acc579539d1c3'
+            '5fb06a23b7d14ed06270f34f34c972227c8674d5684d32517c5f0bcddd3d7050'
+            'a77c0710c9a3f8e0cf50e6eb25b509e01284fa00409288ca885541b6e472d127'
+            '187deaccba8407bc8f363e1032cd5e14578c363b2d79c063ebfe131d985605f8'
+            '73dd1bb7cd31cbe90eda80065679aed7cad89899d6bdb531fbc062391836b2ff'
+            '74090e540b4276c2cf8722b3a72d99ad1fa10b44d25c980e363629b9aed87579'
+            'ad74076f636d1a88d54002e8918074be29157a32a5122def2e20803bd2c0af1d'
+            '97be647f6d5ad29bcf9f313efbd641ca9895757d7032c740ab00bcad8d114b54'
+            'c42240c548594ff05e555ff24d4b17d630cbcd2e5e90952ff88bfc85630de527'
+            '10aef30b86431746a002bff9e5ce5af46cb138b31a5e182aa3b9f9dbda3be22f'
+            'afdabb26ec027f41f52ca6c736cfaf8a95c5c59d28061a240a20f7d521dfde2e'
+            'f766bc129f5ad8e2fca7705fb5d135fbc1144aa8dddca004b141b11bc193efe1'
+            '65d0ac8597be9eb0a695153396b231079204d9451337807685734304b4f672ed'
+            'f56f00584a77a7c80428b6218ac4a848758cf49ca047ef1b7f11b81a2b55aaee'
+            '7ef1fcb918d6079ae6cc97a12730faf3819f94b68f4005afb3c7cbd3c8cbb186'
+            'fe65e9657a337a8fab9e362478d6d1ba794f90315a277660b05577c4c044cebb'
+            '586dc48f77e001152e59c28c1afdaad64c03957d0052e4905b34c2ef2bcd308a'
+            '46f454f756dcc298629ec6b73cb15c643edf9ace7a0e181b43055575e3e86190')

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

--- 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 2ac45582566cb492858de99cf06cabf2fa575e30 Mon Sep 17 00:00:00 2001
+From 7b26289a1e7fafff7da844cdaac26b997febbc94 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/34] Adjust win32-g++ profile for cross compilation with
@ -161,5 +161,5 @@ index ed131c6823..b8e08df0be 100644
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.20.1
+2.21.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 1083693a799b03cde91c83ff25d890640c01d780 Mon Sep 17 00:00:00 2001
+From 71303c275da3c576a5386dc50d4916ce21a58b16 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
 Subject: [PATCH 02/34] Ensure GLdouble is defined when using dynamic OpenGL
@ -23,5 +23,5 @@ index 00287b0665..35ad3007d1 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch
+++ b/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch
@ -1,4 +1,4 @@
-From 0be0cdb753a85725e603a02ada330cc9fd2c161e Mon Sep 17 00:00:00 2001
+From 1e421ad10dfb855e5a8626124854fb6e9ab568ca Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
 Subject: [PATCH 03/34] Use external ANGLE library
@ -93,5 +93,5 @@ index 1c76a2e46f..6a5f046b34 100644
         SUBDIRS += src_3rdparty_libpng
         src_3rdparty_freetype.depends += src_3rdparty_libpng
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64-static/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@ -1,4 +1,4 @@
-From 987045e209769c2b4f8f48046167b5ef9106dd70 Mon Sep 17 00:00:00 2001
+From 200e74dca03f63bac8ef550403454e069c450239 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
 Subject: [PATCH 04/34] 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.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64-static/0005-Make-sure-.pc-files-are-installed-correctly.patch
@ -1,4 +1,4 @@
-From 08286bb3f862fdc5f6cbdbb104d56d29d06b840a Mon Sep 17 00:00:00 2001
+From 77b28d91f16838274c5e6ac28cf10a0d8794c225 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
 Subject: [PATCH 05/34] Make sure *.pc files are installed correctly
@ -10,10 +10,10 @@ Subject: [PATCH 05/34] 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 f824f12bce..07abba9e5f 100644
+index 7762e47f41..bc466d35b3 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3227,7 +3227,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
 }
 
 QString
@ -22,7 +22,7 @@ index f824f12bce..07abba9e5f 100644
 {
     QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
     if (ret.isEmpty()) {
-@@ -3252,7 +3252,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3255,7 +3255,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
     if(fixify) {
         if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
             ret.prepend(project->first("DESTDIR").toQString());
@ -36,7 +36,7 @@ index f824f12bce..07abba9e5f 100644
     return ret;
 }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index 0535017ff6..b2f8b961c0 100644
+index 350ebd377a..d0c234b864 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
@@ -92,7 +92,7 @@ protected:
@ -62,5 +62,5 @@ index 6046e5791e..87157f31ae 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64-static/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
@ -1,4 +1,4 @@
-From fdec0d79a76384fcefd55c06722380a2eccbbe22 Mon Sep 17 00:00:00 2001
+From 81db0b14c6a54d49f9150f20a30a3e188ec97052 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
 Subject: [PATCH 06/34] Don't add resource files to LIBS parameter
@ -24,5 +24,5 @@ index de7363e51b..b2b9d01799 100644
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64-static/0007-Prevent-debug-library-names-in-pkg-config-files.patch
@ -1,4 +1,4 @@
-From a7d2f0dacfb8e30058dcacf34450a467a5ff5d94 Mon Sep 17 00:00:00 2001
+From 5242deeb9bda4e9e692bb56a2cc681d4311cb0e5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
 Subject: [PATCH 07/34] 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 07abba9e5f..e640fb8079 100644
+index bc466d35b3..67d97f520a 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3241,6 +3241,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
         if (dot != -1)
             ret = ret.left(dot);
     }
@ -29,5 +29,5 @@ index 07abba9e5f..e640fb8079 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64-static/0008-Fix-linking-against-shared-static-libpng.patch
@ -1,4 +1,4 @@
-From 95710d93c0d010afaa8ac7433b99827346bc011b Mon Sep 17 00:00:00 2001
+From 658b08047664f3f83caa324dcbfd3281e2a375cc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
 Subject: [PATCH 08/34] 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 89934c8f1d..9124e3e77e 100644
+index 44140bc7b6..19fd92bce7 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -385,8 +385,10 @@
+@@ -387,8 +387,10 @@
                 { "type": "pkgConfig", "args": "libpng" },
                 { "libs": "-llibpng16", "condition": "config.msvc" },
                 { "libs": "-llibpng", "condition": "config.msvc" },
@ -26,5 +26,5 @@ index 89934c8f1d..9124e3e77e 100644
             ],
             "use": [
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64-static/0009-Fix-linking-against-static-D-Bus.patch
@ -1,4 +1,4 @@
-From 5c645a6510d3ac66a845b695c5e30c76944f22a0 Mon Sep 17 00:00:00 2001
+From 1ca21f0dc5e507ad26f16232dd75cb351ded1d6a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
 Subject: [PATCH 09/34] Fix linking against static D-Bus
@ -54,5 +54,5 @@ index 7cce0d71aa..4d3d774d45 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64-static/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@ -1,4 +1,4 @@
-From 75d943609ad0a9814656ce151a353fb391b5df33 Mon Sep 17 00:00:00 2001
+From aef97271acabe3732d92e6c291f9b9f844bc1f29 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
 Subject: [PATCH 10/34] Don't try to use debug version of D-Bus library
@ -25,5 +25,5 @@ index c673f9a5fc..15b0f21e58 100644
                     },
                     "condition": "config.win32 && features.shared"
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64-static/0011-Fix-linking-against-static-freetype2.patch
@ -1,4 +1,4 @@
-From 54e2fd21f8daa2f61c44d764ea19f31e03390b1d Mon Sep 17 00:00:00 2001
+From d318f8d851e848936b2e171d38ebda142f733455 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
 Subject: [PATCH 11/34] Fix linking against static freetype2
@ -8,10 +8,10 @@ Subject: [PATCH 11/34] 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 9124e3e77e..f3628f415d 100644
+index 19fd92bce7..822214a0aa 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -237,8 +237,11 @@
+@@ -238,8 +238,11 @@
             },
             "headers": "ft2build.h",
             "sources": [
@ -22,9 +22,9 @@ index 9124e3e77e..f3628f415d 100644
 +                { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
 +                { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
-                 { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
+                 { "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" },
+                 { "libs": "-lfreetype" }
             ],
-             "use": [
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64-static/0012-Fix-linking-against-static-harfbuzz.patch
@ -1,4 +1,4 @@
-From bdfd1226b5fcf7ede805676a2bb4bb8fbe047d6a Mon Sep 17 00:00:00 2001
+From 49fd90a7d66176f95ace73a34d7c2b3aca3206bd Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
 Subject: [PATCH 12/34] Fix linking against static harfbuzz
@ -8,10 +8,10 @@ Subject: [PATCH 12/34] 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 f3628f415d..b12a0e8ff2 100644
+index 822214a0aa..da4cab79a0 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -304,7 +304,11 @@
+@@ -306,7 +306,11 @@
             },
             "headers": "harfbuzz/hb.h",
             "sources": [
@ -25,5 +25,5 @@ index f3628f415d..b12a0e8ff2 100644
         },
         "imf": {
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64-static/0013-Fix-linking-against-static-pcre.patch
@ -1,4 +1,4 @@
-From 52634efb9b9b2f3de1a2941297c7670ec7d4bdfc Mon Sep 17 00:00:00 2001
+From 1b56343203f3a75b0e1ae237da4f42f6b235940b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
 Subject: [PATCH 13/34] Fix linking against static pcre
@ -24,5 +24,5 @@ index bdaa2d3243..90f8250c03 100644
 #include <pcre2.h>
 
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64-static/0014-Fix-linking-against-shared-static-MariaDB.patch
@ -1,4 +1,4 @@
-From 6d8c6ce62a3a418cc30a6e3016eaf38ff945697b Mon Sep 17 00:00:00 2001
+From 697338ba4c3626e99aa3a501c0942a411ce55a5f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 14/34] 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.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64-static/0015-Fix-linking-against-shared-static-PostgreSQL.patch
@ -1,4 +1,4 @@
-From 0c7b1782160144c9a0839f02efd365716816400d Mon Sep 17 00:00:00 2001
+From bc71e0b2ee8e5ce96091e0fc65f2fdc986438376 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 15/34] Fix linking against shared/static PostgreSQL
@ -24,5 +24,5 @@ index babd0465ce..b4b3bdec6b 100644
             ]
         },
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch
@ -1,4 +1,4 @@
-From c37572ff090abe65285eacaedf7e7022af92aae6 Mon Sep 17 00:00:00 2001
+From 53eb02bb30a316f3562e5886cd3fae8ad02af7a0 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
 Subject: [PATCH 16/34] Rename qtmain to qt5main
@ -53,7 +53,7 @@ index ecb167bf18..7c9368c3b3 100644
                 QMAKE_LIBS += -L$$QT.core.libs
             CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d
 diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
-index 61e9f29d23..a1795bf265 100644
+index 9cb6ab0c59..4327ba365e 100644
 --- a/src/winmain/winmain.pro
 +++ b/src/winmain/winmain.pro
@@ -2,7 +2,7 @@
@ -66,5 +66,5 @@ index 61e9f29d23..a1795bf265 100644
 
 CONFIG += static
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch
+++ b/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch
@ -1,4 +1,4 @@
-From 901d666dd3a5609f40b5fce75620b9016660b4c5 Mon Sep 17 00:00:00 2001
+From 1289a32f82d05281db146165a94fc4d06d432972 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
 Subject: [PATCH 17/34] Build dynamic host libraries
@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.20.1
+2.21.0

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

--- a/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64-static/0019-Use-system-zlib-for-build-tools.patch
@ -1,4 +1,4 @@
-From 9056f0faf07d8493969ead198f30edc958f86fd7 Mon Sep 17 00:00:00 2001
+From 6e6bc8bbffff9972c86d660d3fdd99029e6c7c8a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
 Subject: [PATCH 19/34] Use system zlib for build tools
@ -23,5 +23,5 @@ index 83e44ff9a4..4734623936 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64-static/0020-Use-.dll.a-as-import-lib-extension.patch
@ -1,4 +1,4 @@
-From 5e28a49dd99a5b682fcc9cd78985fc138a1cbc2f Mon Sep 17 00:00:00 2001
+From cf9f7a67dedc858d1f8b1e16747a31747787cb4e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 20/34] Use *.dll.a as import lib extension
@ -62,5 +62,5 @@ index 87157f31ae..4592fed7b2 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64-static/0021-Merge-shared-and-static-library-trees.patch
@ -1,4 +1,4 @@
-From d21a2fde18007e8abbde3407ae20b967b137069e Mon Sep 17 00:00:00 2001
+From 0e8a2cab1c1a9257ad85cfa3869433c9b454f860 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 21/34] Merge shared and static library trees
@ -13,10 +13,10 @@ Allow installation of shared and static build in the same prefix
 5 files changed, 51 insertions(+), 6 deletions(-)

 diff --git a/configure.pri b/configure.pri
-index b3b3e27c44..3136889a2f 100644
+index 629ca78ff1..b4822af13f 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) {
+@@ -1315,3 +1315,12 @@ defineTest(createConfigStatus) {
 
 QMAKE_POST_CONFIGURE += \
     "createConfigStatus()"
@ -51,10 +51,10 @@ index fbf1f3b8df..c261c46e72 100644
 
 !have_target:!force_qt: CONFIG -= qt
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 5da82fdb5b..5b05aa9e2a 100644
+index d8d5acaafd..167b8dbf2c 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -246,6 +246,23 @@ for(ever) {
+@@ -238,6 +238,23 @@ for(ever) {
             !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
                 WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
         }
@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644
 QMAKE_EXT_YACC          = .y
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index e640fb8079..fc7f729ae6 100644
+index 67d97f520a..a802c645c7 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
     if (project->isActiveConfig("debug")) {
         ret += "d";
     }
@ -114,7 +114,7 @@ index e640fb8079..fc7f729ae6 100644
     ret += Option::pkgcfg_ext;
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
-@@ -3418,9 +3421,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3421,9 +3424,9 @@ MakefileGenerator::writePkgConfigFile()
     t << endl;
 
     // requires
@ -128,5 +128,5 @@ index e640fb8079..fc7f729ae6 100644
 
     t << endl;
 -- 
-2.20.1
+2.21.0

--- a/qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64-static/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@ -1,4 +1,4 @@
-From 7f561d87a70af23d5d2a0c89e08ba5744b2f9585 Mon Sep 17 00:00:00 2001
+From b2d749f5e3b7b6d35345dff54c7eb76d2e1a3a44 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 22/34] Pull dependencies of static libraries in CMake modules
@ -7,18 +7,78 @@ When doing a static build of Qt, the dependencies of the Qt
 libraries and plugins itself must be specified when linking
 the final application.
 ---
- .../data/cmake/Qt5BasicConfig.cmake.in        | 148 ++++++++++++++----
+ .../data/cmake/Qt5BasicConfig.cmake.in        | 207 +++++++++++++++---
 .../data/cmake/Qt5PluginTarget.cmake.in       |  11 +-
 qmake/generators/makefile.cpp                 |  16 +-
- 3 files changed, 133 insertions(+), 42 deletions(-)
+ 3 files changed, 192 insertions(+), 42 deletions(-)

 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 3ed6dd5889..15d8b8372e 100644
+index 3ed6dd5889..9325bb3190 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -49,35 +49,52 @@ but not all the files it references.
+@@ -48,36 +48,110 @@ but not all the files it references.
+     endif()
 endmacro()
 
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+if(NOT COMMAND _qt5_add_dependencies)
+    # add dependencies via imported targets with their absolute file path so CMake does not mess with them
+    macro(_qt5_add_dependencies IMPORTED_TARGET_NAME IMPORTED_TARGET_CONFIG STATIC_DEPENDENCIES)
+        # prefer static libs
+        set(DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES \"${CMAKE_FIND_LIBRARY_SUFFIXES}\")
+        set(DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES \"${CMAKE_FIND_LIBRARY_PREFIXES}\")
+        set(CMAKE_FIND_LIBRARY_SUFFIXES .a .lib)
+        set(CMAKE_FIND_LIBRARY_PREFIXES lib \"\")
+
+        set(DEPENDENCY_INDEX 0)
+        unset(EXTRA_PATHS)
+        unset(DEPENDENCY_TARGETS)
+
+        foreach(LIBRARY_NAME ${STATIC_DEPENDENCIES})
+            if (TARGET \"${LIBRARY_NAME}\")
+                list(APPEND DEPENDENCY_TARGETS \"${LIBRARY_NAME}\")
+                continue()
+            endif()
+            set(DEPENDENCY_NAME ${IMPORTED_TARGET_NAME}_DEPENDENCY_${DEPENDENCY_INDEX})
+            if (NOT TARGET \"${DEPENDENCY_NAME}\")
+                if(EXISTS \"${LIBRARY_NAME}\")
+                    set(IMPORTED_LOCATION ${LIBRARY_NAME})
+                elseif(\"${LIBRARY_NAME}\" MATCHES \" *-l(.*)\")
+                    set(LIBRARY_NAME \"${CMAKE_MATCH_1}\")
+                    find_library(\"${DEPENDENCY_NAME}_LIBRARY_PATH\" \"${LIBRARY_NAME}\" PATHS \"${EXTRA_PATHS}\")
+                    if (NOT EXISTS "${${DEPENDENCY_NAME}_LIBRARY_PATH}")
+                        message(WARNING \"Unable to find dependency ${LIBRARY_NAME} for static Qt target (was looking in ${EXTRA_PATHS}).\")
+                        continue()
+                    endif()
+                    set(IMPORTED_LOCATION \"${${DEPENDENCY_NAME}_LIBRARY_PATH}\")
+                elseif(\"${LIBRARY_NAME}\" MATCHES \" *-L(.*)\")
+                    list(APPEND EXTRA_PATHS \"${CMAKE_MATCH_1}\")
+                else()
+                    set(IMPORTED_LOCATION ${LIBRARY_NAME})
+                    message(WARNING \"Format of dependency unknown: ${LIBRARY_NAME}\")
+                endif()
+                add_library(${DEPENDENCY_NAME} STATIC IMPORTED)
+                set_property(TARGET ${DEPENDENCY_NAME} PROPERTY IMPORTED_LOCATION ${IMPORTED_LOCATION})
+            endif()
+            if (TARGET ${DEPENDENCY_NAME})
+                list(APPEND DEPENDENCY_TARGETS ${DEPENDENCY_NAME})
+            endif()
+            math(EXPR DEPENDENCY_INDEX \"${DEPENDENCY_INDEX} + 1\")
+        endforeach()
+
+        if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\")
+            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${DEPENDENCY_TARGETS})
+        else()
+            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES_${IMPORTED_TARGET_CONFIG} ${DEPENDENCY_TARGETS})
+        endif()
+
+        # restore previous setup
+        set(CMAKE_FIND_LIBRARY_SUFFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_SUFFIXES}\")
+        set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\")
+    endmacro()
+endif()
+!!ENDIF
+
 !!IF !equals(TEMPLATE, aux)
 -macro(_populate_$${CMAKE_MODULE_NAME}_target_properties Configuration LIB_LOCATION IMPLIB_LOCATION)
 -    set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${Configuration})
@ -38,14 +98,12 @@ index 3ed6dd5889..15d8b8372e 100644
 +        set(_list_sep \";\")
 +    endif()
 +    set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
-+        \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
 +        \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
 +!!IF !isEmpty(CMAKE_LIB_SONAME)
 +        \"IMPORTED_SONAME_${TARGET_CONFIG}\" \"$${CMAKE_LIB_SONAME}\"
 +!!ENDIF
-+        # For backward compatibility with CMake < 2.8.12
-+        \"IMPORTED_LINK_INTERFACE_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\"
 +    )
+    _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME} \"${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}${_list_sep}${_Qt5$${CMAKE_MODULE_NAME}_STATIC_${TARGET_CONFIG}_LIB_DEPENDENCIES}\")
 +!!ELSE
     set_target_properties(Qt5::$${CMAKE_MODULE_NAME} PROPERTIES
 -        \"INTERFACE_LINK_LIBRARIES\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
@ -77,7 +135,7 @@ index 3ed6dd5889..15d8b8372e 100644
         )
     endif()
 !!ENDIF
-@@ -217,13 +234,47 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -217,13 +291,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!IF !isEmpty(CMAKE_STATIC_TYPE)
     add_library(Qt5::$${CMAKE_MODULE_NAME} STATIC IMPORTED)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
@ -98,19 +156,17 @@ index 3ed6dd5889..15d8b8372e 100644
 +        file(STRINGS "${PRL_FILE_LOCATION}" prl_strings REGEX "QMAKE_PRL_LIBS_FOR_CMAKE")
 +        string(REGEX REPLACE \"QMAKE_PRL_LIBS_FOR_CMAKE *= *([^\n]*)\" \"\\\\1\" static_depends ${prl_strings})
 +        string(REGEX REPLACE \"\\\\$\\\\$\\\\[QT_INSTALL_LIBS\\\\]\" \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" static_depends \"${static_depends}\")
-+        set_property(TARGET ${PLUGIN_TARGET_NAME} PROPERTY
-+            INTERFACE_LINK_LIBRARIES ${static_depends}
-+        )
+        _qt5_add_dependencies(\"${PLUGIN_TARGET_NAME}\" ALL \"${static_depends}\")
 +    endmacro()
 +
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG)
- !!ELSE
+!!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_DEBUG}\" DEBUG)
 +!!ENDIF
 +!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
 +    _process_prl_file(\"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE)
-+!!ELSE
+ !!ELSE
 +    _process_prl_file(\"$${CMAKE_LIB_DIR}$${CMAKE_PRL_FILE_LOCATION_RELEASE}\" RELEASE)
 +!!ENDIF
 +
@ -126,7 +182,7 @@ index 3ed6dd5889..15d8b8372e 100644
 !!IF !equals(TEMPLATE, aux)
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-@@ -238,6 +289,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -238,6 +344,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_ENABLED_FEATURES $$join(QT.$${MODULE}.enabled_features, ";"))
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY INTERFACE_QT_DISABLED_FEATURES $$join(QT.$${MODULE}.disabled_features, ";"))
 
@ -183,7 +239,21 @@ index 3ed6dd5889..15d8b8372e 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})
-@@ -328,9 +429,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -256,9 +412,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+                 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
+             endif()
+         endforeach()
+!!IF !isEmpty(CMAKE_STATIC_TYPE)
+        _qt5_add_dependencies(Qt5::$${CMAKE_MODULE_NAME}Private ALL \"Qt5::$${CMAKE_MODULE_NAME};${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}\")
+!!ELSE
+         set_property(TARGET Qt5::$${CMAKE_MODULE_NAME}Private PROPERTY
+             INTERFACE_LINK_LIBRARIES Qt5::$${CMAKE_MODULE_NAME} ${_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS}
+         )
+!!ENDIF // CMAKE_STATIC_TYPE
+     endif()
+ 
+ !!IF !equals(TEMPLATE, aux)
+@@ -328,9 +488,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -197,7 +267,7 @@ index 3ed6dd5889..15d8b8372e 100644
 !!ENDIF // CMAKE_RELEASE_TYPE
 !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
 
-@@ -341,29 +444,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -341,29 +503,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     )
 !!ENDIF // TEMPLATE != aux
 
@ -251,7 +321,7 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index fc7f729ae6..095b4d2720 100644
+index a802c645c7..30756d9b64 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
@@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
@ -278,5 +348,5 @@ index fc7f729ae6..095b4d2720 100644
 }
 
 -- 
-2.20.1
+2.21.0

--- a/Show More
+++ b/Show More