diff --git a/devel/versions.sh b/devel/versions.sh
index 5020e08a..9cdf88d0 100755
--- a/devel/versions.sh
+++ b/devel/versions.sh
@@ -11,7 +11,7 @@ declare -A versions=(
     [reflective-rapidjson]=0.0.7
     [blackwidowcontrol]=1.0.1
     [dbus-soundrecorder]=1.2.2
-    [qt5]=5.12.2
+    [qt5]=5.12.3
 )
 declare -A github_names=(
     [c++utilities]=cpp-utilities
diff --git a/qt5-3d/mingw-w64/PKGBUILD b/qt5-3d/mingw-w64/PKGBUILD
index c3599158..37a5ba39 100644
--- 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.2
+pkgver=5.12.3
 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=('d4036e7ac146ba78784dde0dd99e8182372b7c38e832e33b61fed4187de0ad06')
+sha256sums=('8997f07c816bbc6dd43fc2171801178bc65e704d35039998530cfa49837eaa7d')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git 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
index d03491bc..c1df0f34 100644
--- 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 39cbdd617fe7d154bb77c62378ef4fa939cad59c Mon Sep 17 00:00:00 2001
+From 9a8e40418c822f46bf1b6394a26de24e576f455d 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
diff --git 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
index 0257af09..8b625189 100644
--- 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 e6e5e75c12ff1c0cc96662fb20a2eddb25022922 Mon Sep 17 00:00:00 2001
+From 5422de18cdf70893fbe166644a3687c99a08038f 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
diff --git a/qt5-activeqt/mingw-w64/PKGBUILD b/qt5-activeqt/mingw-w64/PKGBUILD
index 6be09112..c21bcc89 100644
--- 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.2
+pkgver=5.12.3
 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=('281ec22e43c5e8385ed7da0ad7f317cf200bc6c2b72e6980e7c1c318635c636b'
-            'f6a82b00428d8da4a794740addc39293322a6f3c0e04c3d1aafba357ec3d46f2'
-            '9d1cf3315c79b3e81b21c336c7953d9c2d472a02298a2c1750a47faab0ae555e')
+sha256sums=('15a5fde0a069f402bea9f422d8d2c46af440d202122c6307c2a6be642d20dc0f'
+            '5b111b064fcb4d9cb72c52b71e9bc852ccb87983e5396edf6db8f8e923cb0c30'
+            '1cc9636f58d4f393d936a5b64e0fb2ae1115edf8599df15203c1e98f30e6d96f')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-base/apple-darwin/PKGBUILD b/qt5-base/apple-darwin/PKGBUILD
index be4e15f4..19562f96 100644
--- 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.2
+pkgver=5.12.3
 pkgrel=1
 pkgdesc='A cross-platform application and UI framework (apple-darwin)'
 arch=('i686' 'x86_64')
diff --git 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
index a705f71a..fc70d85e 100644
--- 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 7b26289a1e7fafff7da844cdaac26b997febbc94 Mon Sep 17 00:00:00 2001
+From 9a22842c6ec7d34b1edba1a18411e73bf90a1567 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
@@ -143,7 +143,7 @@ index 4630ec4602..3f9fdc72b1 100644
  
  QMAKE_LINK              = $${CROSS_COMPILE}clang++
 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
-index ed131c6823..b8e08df0be 100644
+index 5e9923357f..67805c29a7 100644
 --- a/mkspecs/win32-g++/qmake.conf
 +++ b/mkspecs/win32-g++/qmake.conf
 @@ -12,11 +12,11 @@ include(../common/g++-win32.conf)
diff --git 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
index c7649a9c..2ce49556 100644
--- 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 71303c275da3c576a5386dc50d4916ce21a58b16 Mon Sep 17 00:00:00 2001
+From a1aebd2231ed102c84b992058c1de1a02817214e 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
diff --git a/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-angle/0003-Use-external-ANGLE-library.patch
index 43cc3f94..d491f963 100644
--- 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 1e421ad10dfb855e5a8626124854fb6e9ab568ca Mon Sep 17 00:00:00 2001
+From c05b912a91f424375d6b44cb0cebdec7c44c967c 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
@@ -12,7 +12,7 @@ Subject: [PATCH 03/34] Use external ANGLE library
  5 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 07869efd7d..2e32911a64 100644
+index 84dbbfebd4..46a8696ff3 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
 @@ -2,9 +2,9 @@
diff --git 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
index 2d00f691..a8f88d01 100644
--- 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 200e74dca03f63bac8ef550403454e069c450239 Mon Sep 17 00:00:00 2001
+From c92307d539cd71249031bd42eac1d7d4a78fa939 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
diff --git 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
index 194b1fc0..f6e3ee03 100644
--- 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 77b28d91f16838274c5e6ac28cf10a0d8794c225 Mon Sep 17 00:00:00 2001
+From 70435bc3ad5e60f9330a833094635e73eb9bc6a8 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,7 +10,7 @@ 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 7762e47f41..bc466d35b3 100644
+index ab261d02f1..aa4c96be49 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
@@ -49,10 +49,10 @@ index 350ebd377a..d0c234b864 100644
      void writePkgConfigFile();   // for pkg-config
  
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 6046e5791e..87157f31ae 100644
+index 208af1327f..5a37b218de 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -751,7 +751,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -753,7 +753,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
                  }
                  if(!ret.isEmpty())
                      ret += "\n\t";
diff --git 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
index 2f8e9c3b..46320085 100644
--- 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 81db0b14c6a54d49f9150f20a30a3e188ec97052 Mon Sep 17 00:00:00 2001
+From 75f422a35a62d1693e5d84d6745590d8088f6344 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
diff --git 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
index ae6ecec7..962201fc 100644
--- 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 5242deeb9bda4e9e692bb56a2cc681d4311cb0e5 Mon Sep 17 00:00:00 2001
+From 185e54d2c46014b51579261068b14f1483ba3aa1 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,7 +15,7 @@ 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 bc466d35b3..67d97f520a 100644
+index aa4c96be49..b005da931e 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
diff --git 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
index e61a9a3e..69f37f17 100644
--- 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 658b08047664f3f83caa324dcbfd3281e2a375cc Mon Sep 17 00:00:00 2001
+From a21de39b50f538d9dce89bab8fc12cfb631d3f6b 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,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 44140bc7b6..19fd92bce7 100644
+index 6fdcd562a7..7733db0206 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -387,8 +387,10 @@
diff --git 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
index 913bc60e..40086a48 100644
--- 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 1ca21f0dc5e507ad26f16232dd75cb351ded1d6a Mon Sep 17 00:00:00 2001
+From bef46a6c727a1370768b9d270bd76fc9b4ded4cd 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
diff --git 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
index 7c5998b6..ff817a7a 100644
--- 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 aef97271acabe3732d92e6c291f9b9f844bc1f29 Mon Sep 17 00:00:00 2001
+From 961a060a30e67a4a1062cd97fed2d08fbcfb804b 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
diff --git 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
index 0908b405..63c78f08 100644
--- 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 d318f8d851e848936b2e171d38ebda142f733455 Mon Sep 17 00:00:00 2001
+From bc6d72e7347436e3a1db35311eaf6c1240a65fc3 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,7 +8,7 @@ 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 19fd92bce7..822214a0aa 100644
+index 7733db0206..184c9368f2 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -238,8 +238,11 @@
diff --git 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
index c552550a..c492b0ba 100644
--- 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 49fd90a7d66176f95ace73a34d7c2b3aca3206bd Mon Sep 17 00:00:00 2001
+From 95f8ae9b5c7600313f1c6f3f4a7c1f50afef3069 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,7 +8,7 @@ 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 822214a0aa..da4cab79a0 100644
+index 184c9368f2..db6d4d68c9 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -306,7 +306,11 @@
diff --git 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
index 598b53c7..fb2652b7 100644
--- 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 1b56343203f3a75b0e1ae237da4f42f6b235940b Mon Sep 17 00:00:00 2001
+From 8f9fe88a5643aafe2aeb8cb44bbbac17d6d67808 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
diff --git 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
index cdbca05c..5ec2a7e1 100644
--- 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 697338ba4c3626e99aa3a501c0942a411ce55a5f Mon Sep 17 00:00:00 2001
+From b35664794a3658470c900c4a7c1b8dbf436359ca 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
diff --git 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
index 1ef4aa2c..f6ff1d42 100644
--- 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 bc71e0b2ee8e5ce96091e0fc65f2fdc986438376 Mon Sep 17 00:00:00 2001
+From 12167c0f3c19d677ca681d58765c3c49f13ba9e2 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
diff --git a/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-angle/0016-Rename-qtmain-to-qt5main.patch
index c97528bf..80d4054c 100644
--- 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 53eb02bb30a316f3562e5886cd3fae8ad02af7a0 Mon Sep 17 00:00:00 2001
+From ff46ecb2fdcfc203d55e9fcef8b29c62742c61ae 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
@@ -25,10 +25,10 @@ index 07e2b6a88e..5bfbcfdca6 100644
  QMAKE_IDL               = $${CROSS_COMPILE}widl
  QMAKE_LIB               = $${CROSS_COMPILE}ar -rc
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 2ed708e085..e67917cc96 100644
+index 6bf1380716..74a9160628 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -227,8 +227,8 @@ mac {
+@@ -229,8 +229,8 @@ mac {
      CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
  
      mingw {
diff --git a/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-angle/0017-Build-dynamic-host-libraries.patch
index 72e387e7..8679cdfa 100644
--- 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 1289a32f82d05281db146165a94fc4d06d432972 Mon Sep 17 00:00:00 2001
+From 9ae3b38009637d7455dc7c30295beb9de8f137fc 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
diff --git 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
index 67323501..e9bd6717 100644
--- 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 8f12c750711b71fded02ad3e6bee6e88f93f4bae Mon Sep 17 00:00:00 2001
+From 1937d98580d1988eb1422ec431bb7bf214ccb964 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
diff --git 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
index 075f79e0..25d5a0df 100644
--- 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 6e6bc8bbffff9972c86d660d3fdd99029e6c7c8a Mon Sep 17 00:00:00 2001
+From 1249cece89416ca3aae9f8edef37738d6405b846 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
diff --git 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
index 3fe7ac92..01cfa8e1 100644
--- 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 cf9f7a67dedc858d1f8b1e16747a31747787cb4e Mon Sep 17 00:00:00 2001
+From 83340c970109edc6400a8f74f1728affec4024c5 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
@@ -11,10 +11,10 @@ mingw-w64 specific mkspec
  2 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index e67917cc96..2a94964b49 100644
+index 74a9160628..7694d1c7ae 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -238,8 +238,9 @@ mac {
+@@ -240,8 +240,9 @@ mac {
              CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
              CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
          } else {
@@ -27,7 +27,7 @@ index e67917cc96..2a94964b49 100644
      } else {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 87157f31ae..4592fed7b2 100644
+index 5a37b218de..29bf9441f7 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
@@ -45,9 +45,9 @@ index 87157f31ae..4592fed7b2 100644
 +      impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
 +    }
      QList<QMakeLocalFileName> dirs;
+     int libidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-         dirs.append(QMakeLocalFileName(dlib.toQString()));
-@@ -255,9 +259,12 @@ void Win32MakefileGenerator::fixTargetExt()
+@@ -257,9 +261,12 @@ void Win32MakefileGenerator::fixTargetExt()
      if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
          project->values("TARGET_EXT").append(".exe");
      } else if (project->isActiveConfig("shared")) {
diff --git 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
index 82176cd2..dbec06bb 100644
--- 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 0e8a2cab1c1a9257ad85cfa3869433c9b454f860 Mon Sep 17 00:00:00 2001
+From 814b3a23dd94818101265df95b1051987faf440d 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 629ca78ff1..b4822af13f 100644
+index 131aa868c2..75203c4572 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -1315,3 +1315,12 @@ defineTest(createConfigStatus) {
+@@ -1318,3 +1318,12 @@ defineTest(createConfigStatus) {
  
  QMAKE_POST_CONFIGURE += \
      "createConfigStatus()"
@@ -101,7 +101,7 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 67d97f520a..a802c645c7 100644
+index b005da931e..e0c42131f8 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
diff --git 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
index fc9e517e..4ab26a2a 100644
--- 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 b2d749f5e3b7b6d35345dff54c7eb76d2e1a3a44 Mon Sep 17 00:00:00 2001
+From 71f297d50afe7143f6754a5ea95013cddf25c3ea 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,16 +7,16 @@ 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        | 207 +++++++++++++++---
+ .../data/cmake/Qt5BasicConfig.cmake.in        | 208 +++++++++++++++---
  .../data/cmake/Qt5PluginTarget.cmake.in       |  11 +-
  qmake/generators/makefile.cpp                 |  16 +-
- 3 files changed, 192 insertions(+), 42 deletions(-)
+ 3 files changed, 193 insertions(+), 42 deletions(-)
 
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 3ed6dd5889..9325bb3190 100644
+index 3ed6dd5889..9073046205 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -48,36 +48,110 @@ but not all the files it references.
+@@ -48,36 +48,111 @@ but not all the files it references.
      endif()
  endmacro()
  
@@ -66,9 +66,10 @@ index 3ed6dd5889..9325bb3190 100644
 +            math(EXPR DEPENDENCY_INDEX \"${DEPENDENCY_INDEX} + 1\")
 +        endforeach()
 +
-+        if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\")
++        if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\" OR \"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"RELEASE\")
 +            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${DEPENDENCY_TARGETS})
-+        else()
++        endif()
++        if (NOT \"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\")
 +            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES_${IMPORTED_TARGET_CONFIG} ${DEPENDENCY_TARGETS})
 +        endif()
 +
@@ -135,7 +136,7 @@ index 3ed6dd5889..9325bb3190 100644
          )
      endif()
  !!ENDIF
-@@ -217,13 +291,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -217,13 +292,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")
@@ -161,12 +162,12 @@ index 3ed6dd5889..9325bb3190 100644
 +
 +!!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
 +
@@ -182,7 +183,7 @@ index 3ed6dd5889..9325bb3190 100644
  !!IF !equals(TEMPLATE, aux)
  !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
      set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-@@ -238,6 +344,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -238,6 +345,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, ";"))
  
@@ -239,7 +240,7 @@ index 3ed6dd5889..9325bb3190 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})
-@@ -256,9 +412,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -256,9 +413,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
                  list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
              endif()
          endforeach()
@@ -253,7 +254,7 @@ index 3ed6dd5889..9325bb3190 100644
      endif()
  
  !!IF !equals(TEMPLATE, aux)
-@@ -328,9 +488,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -328,9 +489,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
@@ -267,7 +268,7 @@ index 3ed6dd5889..9325bb3190 100644
  !!ENDIF // CMAKE_RELEASE_TYPE
  !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
  
-@@ -341,29 +503,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -341,29 +504,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      )
  !!ENDIF // TEMPLATE != aux
  
@@ -321,7 +322,7 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a802c645c7..30756d9b64 100644
+index e0c42131f8..94dfed92b3 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
diff --git 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
index bc5a767d..4a4eb42b 100644
--- 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 af97d60e4f62cffec74c0c4905b79b49aab598af Mon Sep 17 00:00:00 2001
+From d9e7255dcfbf1d5775712902d9ce513d3e235128 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
@@ -22,7 +22,7 @@ installed in the same prefix
  create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 2a94964b49..839a51f377 100644
+index 7694d1c7ae..38887a6ccf 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -42,7 +42,7 @@ split_incpath {
@@ -83,7 +83,7 @@ index 2a94964b49..839a51f377 100644
      INSTALLS += cmake_qt5_plugin_file
  
      return()
-@@ -182,27 +186,36 @@ mod_deps =
+@@ -182,29 +186,38 @@ mod_deps =
  lib_deps =
  aux_mod_deps =
  aux_lib_deps =
@@ -117,14 +117,16 @@ index 2a94964b49..839a51f377 100644
 +CMAKE_INTERFACE_COMPILE_DEFINITIONS_STATIC = $$join(aux_compile_defs_static, ";")
 +
  
- CMAKE_QT_STEM = Qt$$QT_MAJOR_VERSION$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}
+ # TARGET here is the one changed at the end of qt_module.prf,
+ # which already contains the Qt5 prefix and QT_LIBINFIX suffix
+ CMAKE_QT_STEM = $${TARGET}
  
  mac {
 +    # this branch is broken by the patch, only apply when building for Windows
      !isEmpty(CMAKE_STATIC_TYPE) {
          CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
          CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -230,35 +243,33 @@ mac {
+@@ -232,35 +245,33 @@ mac {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
  
@@ -179,7 +181,7 @@ index 2a94964b49..839a51f377 100644
      !isEmpty(CMAKE_STATIC_TYPE) {
          CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
          CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -278,12 +289,12 @@ mac {
+@@ -280,12 +291,12 @@ mac {
  INSTALLS += cmake_qt5_module_files
  
  cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@@ -194,7 +196,7 @@ index 2a94964b49..839a51f377 100644
  
  !build_pass:QMAKE_SUBSTITUTES += \
      cmake_config_file \
-@@ -293,11 +304,29 @@ cmake_qt5_module_files.files = \
+@@ -295,11 +306,29 @@ cmake_qt5_module_files.files = \
      $$cmake_config_file.output \
      $$cmake_config_version_file.output
  
@@ -225,7 +227,7 @@ index 2a94964b49..839a51f377 100644
  
      !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
  
-@@ -309,7 +338,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -311,7 +340,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
  exists($$cmake_macros_file.input) {
      CMAKE_MODULE_MACROS = "true"
  
@@ -234,7 +236,7 @@ index 2a94964b49..839a51f377 100644
      cmake_macros_file.CONFIG = verbatim
  
      !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -317,7 +346,7 @@ exists($$cmake_macros_file.input) {
+@@ -319,7 +348,7 @@ exists($$cmake_macros_file.input) {
      cmake_qt5_module_files.files += $$cmake_macros_file.output
  }
  
@@ -244,7 +246,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 9325bb3190..7ee0c86130 100644
+index 9073046205..9b6cc352b5 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,7 +309,7 @@ index 9325bb3190..7ee0c86130 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.
-@@ -105,33 +136,68 @@ if(NOT COMMAND _qt5_add_dependencies)
+@@ -106,33 +137,68 @@ if(NOT COMMAND _qt5_add_dependencies)
          set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\")
      endmacro()
  endif()
@@ -381,7 +383,7 @@ index 9325bb3190..7ee0c86130 100644
          \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
          \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
  !!IF !isEmpty(CMAKE_LIB_SONAME)
-@@ -148,9 +214,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
+@@ -149,9 +215,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
@@ -396,7 +398,7 @@ index 9325bb3190..7ee0c86130 100644
          \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib}
          )
      endif()
-@@ -158,8 +228,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
+@@ -159,8 +229,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
  endmacro()
  !!ENDIF
  
@@ -407,7 +409,7 @@ index 9325bb3190..7ee0c86130 100644
  !!IF !no_module_headers
  !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
      set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -167,46 +238,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -168,46 +239,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)
@@ -475,7 +477,7 @@ index 9325bb3190..7ee0c86130 100644
      endforeach()
  
  !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -215,16 +290,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -216,16 +291,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})
@@ -499,7 +501,7 @@ index 9325bb3190..7ee0c86130 100644
  !!ENDIF // TEMPLATE != aux
      set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
  
-@@ -232,10 +311,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -233,10 +312,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\")
  !!ENDIF
  
@@ -512,7 +514,7 @@ index 9325bb3190..7ee0c86130 100644
          set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
      endif()
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
-@@ -243,17 +322,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -244,17 +323,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)
@@ -534,7 +536,7 @@ index 9325bb3190..7ee0c86130 100644
                  $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
                  ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
                  ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
-@@ -261,36 +340,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -262,36 +341,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
              )
          endif()
  
@@ -590,7 +592,7 @@ index 9325bb3190..7ee0c86130 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\")
-@@ -312,37 +396,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -313,37 +397,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      endmacro()
  
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -651,7 +653,7 @@ index 9325bb3190..7ee0c86130 100644
  
      # Find plugin targets
      file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
-@@ -356,7 +451,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -357,7 +452,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
          endforeach()
      endif()
  
@@ -663,7 +665,7 @@ index 9325bb3190..7ee0c86130 100644
          set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
  
  !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-@@ -364,7 +463,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -365,7 +464,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
  !!ENDIF
@@ -675,7 +677,7 @@ index 9325bb3190..7ee0c86130 100644
          set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
              \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
          )
-@@ -395,16 +498,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -396,16 +499,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      endif()
  
      set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
@@ -696,7 +698,7 @@ index 9325bb3190..7ee0c86130 100644
          )
          set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
          foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -413,69 +516,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -414,69 +517,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
              endif()
          endforeach()
  !!IF !isEmpty(CMAKE_STATIC_TYPE)
@@ -792,7 +794,7 @@ index 9325bb3190..7ee0c86130 100644
      if (EXISTS
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
          \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -488,7 +594,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -489,7 +595,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
@@ -801,7 +803,7 @@ index 9325bb3190..7ee0c86130 100644
      endif()
  !!ENDIF // CMAKE_STATIC_TYPE
  
-@@ -498,19 +604,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -499,19 +605,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  
  !!ENDIF // CMAKE_DEBUG_TYPE
  !!ELSE // TEMPLATE != aux
@@ -960,7 +962,7 @@ index e0652fdcf9..f0add757bb 100644
                      $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt5::WinMain>
              )
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 2e32911a64..6b02a12944 100644
+index 46a8696ff3..2783f7f9e9 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
 @@ -1,4 +1,6 @@
@@ -979,7 +981,7 @@ index 2e32911a64..6b02a12944 100644
  
  unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE)
  
-@@ -170,9 +172,9 @@ _qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\"
+@@ -183,9 +185,9 @@ _qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\"
  
  set(Qt5Gui_OPENGL_IMPLEMENTATION $$CMAKE_QT_OPENGL_IMPLEMENTATION)
  
diff --git 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
index 802c6e2c..b626f51c 100644
--- 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 25143b06d43a9a4cceb6d038f4f97d5f2af53c8e Mon Sep 17 00:00:00 2001
+From 96e14e82726f32e222c506c41b3917897ec8482c 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
diff --git 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
index f7b5d243..c155450e 100644
--- 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 348b46baa42d1001d2a650a0fe44a2254068bb8e Mon Sep 17 00:00:00 2001
+From 1bcc8c23d8acce7855ebba3ad97d088f19831414 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 b4822af13f..addb27b6d7 100644
+index 75203c4572..377788d653 100644
 --- a/configure.pri
 +++ b/configure.pri
 @@ -328,6 +328,9 @@ defineTest(qtConfTest_detectPkgConfig) {
diff --git 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
index 2050d214..216c33d3 100644
--- 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 7fc63fcd9c5e8a2c864c7de9fa14338ce3e82969 Mon Sep 17 00:00:00 2001
+From 52682db5b750289cdd3dc68682861da8507db2b3 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
diff --git 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
index 1dfa7de0..24028c87 100644
--- 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 93aba1e6a5106bc91b34fada1d5343ff25b9ce43 Mon Sep 17 00:00:00 2001
+From 0dd39f4bc9414441e8cdfe2cff1636102d15ee53 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
diff --git 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
index 4a1c752f..fba4a80e 100644
--- 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 512be5eb5add4a5f2146ca0a0b3a8b7a434c600a Mon Sep 17 00:00:00 2001
+From 837aab47427a3c3a2d44b321d2d64d4220293e07 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
@@ -49,7 +49,7 @@ index 9c39727946..cc14036b25 100644
  #else
      char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index a22a7459bd..b7ed2f7281 100644
+index 5f5a00a64f..d779c3c4ff 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
 @@ -71,7 +71,7 @@
@@ -61,7 +61,7 @@ index a22a7459bd..b7ed2f7281 100644
                      "char *outp;",
                      "size_t inbytes, outbytes;",
                      "iconv(x, &inp, &inbytes, &outp, &outbytes);",
-@@ -615,9 +615,9 @@
+@@ -631,9 +631,9 @@
          },
          "gnu-libiconv": {
              "label": "GNU iconv",
diff --git 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
index 4ff09302..9c49adfb 100644
--- 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 41e9bbfc0c70d1a94f7c90aef50493e3341389b7 Mon Sep 17 00:00:00 2001
+From 48f35ff2e010746ee29e5e38f67e11680c420fa0 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
diff --git 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
index 1bf91a24..7d3b41d2 100644
--- 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 f41ba61108dd735410e4feac87fa23b321d0a20f Mon Sep 17 00:00:00 2001
+From 70d1ba494a9d2498ca79dab847cb8d4b6598bdc1 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
@@ -25,7 +25,7 @@ index 7f42fbe09e..e27428c0f2 100644
      int libidx = 0, fwidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 4592fed7b2..b93d0df473 100644
+index 29bf9441f7..cc4c031ce7 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
@@ -36,8 +36,8 @@ index 4592fed7b2..b93d0df473 100644
 +        return false; // prevent qmake from messing static lib dependencies
 +    }
      QList<QMakeLocalFileName> dirs;
+     int libidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-         dirs.append(QMakeLocalFileName(dlib.toQString()));
 -- 
 2.21.0
 
diff --git 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
index 35a1cd46..3fd01678 100644
--- 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 2c28928b34fc030330b00f16fcb546a477c48621 Mon Sep 17 00:00:00 2001
+From c64b26908cc7cdeb19bb41fab98f328174ccfea0 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
diff --git 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
index 7f7d9551..f01fa5d6 100644
--- 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 00034061c0b8ad7c875ef00a687d95c2100f15f3 Mon Sep 17 00:00:00 2001
+From 05a8d15d8f9e5b0bc6489ef29bdc94e4a047df13 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
diff --git 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
index 502a8a95..011ecfa6 100644
--- 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 f3ec9ba64cd4a80639959abbef537ce718dc70d6 Mon Sep 17 00:00:00 2001
+From 2fb77d4fad4edc257562f29347e1279c001b3f89 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
@@ -19,7 +19,7 @@ during RTL pass: ira
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
-index 6195c324e7..480af00ebc 100644
+index 90df8653a7..50725dc5cb 100644
 --- a/src/corelib/global/qrandom.cpp
 +++ b/src/corelib/global/qrandom.cpp
 @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando
diff --git 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
index 4f5f7b1a..692db419 100644
--- 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 ee1d9dbd64b6123280c47b8633daf3d407f12ae6 Mon Sep 17 00:00:00 2001
+From 7ca7ebb16733d10658c7135c5948cf21eafac8fe 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 7ca65c92b3..48fa54a166 100644
+index 62ad972796..866ffdb6ad 100644
 --- a/mkspecs/features/qt_configure.prf
 +++ b/mkspecs/features/qt_configure.prf
-@@ -553,12 +553,12 @@ defineTest(qtConfResolveLibs) {
+@@ -561,12 +561,12 @@ defineTest(qtConfResolveLibs) {
                  # Under Windows, we look only for static libraries, as even for DLLs
                  # one actually links against a static import library.
                  mingw {
diff --git a/qt5-base/mingw-w64-angle/PKGBUILD b/qt5-base/mingw-w64-angle/PKGBUILD
index 9159d897..5682c9f2 100644
--- 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.2
+pkgver=5.12.3
 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
@@ -87,40 +87,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
         '0033-Disable-hardware-randomizer-for-32-bit.patch'
         '0034-Prevent-static-build-to-prefer-dynamic-libraries.patch')
 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')
+            '813332969dbfd7fcc8af3d23457eea0ce3b3a54ed9b9eae62b431529b8f60b22'
+            '96b9e2fb177de9c8cfe8c8cd601705981d4c223eef9fc582ec0f45d26c6b6d7f'
+            'b1aa13e0e6e28718edb11520660954101c662f6b6945a83cb4e84ff7de5c0922'
+            '2be87f841ac2104f44114ec65dbd35f8bf8280176b9341015b99aa7dd6756967'
+            'c61a62a241b0d03354b523dd9d4ae811e55b12e6e2683c45a3bfd67574e2ad8a'
+            '1050833662659481606f94a2f4a95f764e7d1ae8b9d015a497b508884cd755d0'
+            'eea4870ab1394e9473fe1cee2d856bb5d0d31b68ec91b20d45c882893049a9f6'
+            '11a4267ae9fa3d49046945ba7e0867b400364f0475c2d36814af45fbc4c3f2f0'
+            '2b977aba78484cb01208300d02a9ce945edfa0ac73ad91c9331cb73851c9b85d'
+            'd9e8736c57f5f8841238fe131508d29d9de0fa3d0c0554e1a443aab33147b430'
+            'f30bd604cf3da044f38da38d873a988870d0413aafa5f437d11286d2d3dbb42b'
+            '00b84c1b66212797876b1793b36e3537dc866770f632b4d98b91d84e6766c2d8'
+            '2fdf313e492061c7a34b63b25129c253088714a632616437c7ab473b43eca5be'
+            '6cde53dd184b5aa79e3c471392eaa6e2ac9dc72e8394dab7248cb8a0ac3e856f'
+            '64b37f777b45bc1b134ea5723ccc6c430784ebbf53b428addeb73ba1108c9225'
+            '7b4398060dd40fcf8f23b5ca908a0f79be7adfe7f15ad9ec77f23913b5c6c3fc'
+            'bfb28bde40b37d74585174414a647af051a8da251107513d3c5e160c72fa7af5'
+            '9809aab5b4fadf65c2704654ac2c171877b634d5b874af6c96574159ba9f2002'
+            '374b0ed5fe0285389dda11a6fbccabd3094d2aaa7489d3e59d9b31ead444ce27'
+            '0961354456c56fa6041758ee35f26d563e60f4ed3bcae214abec2ffbd89f3e80'
+            '78681b7f7a6456cda9ca4bef34bf4caf3dfbeb36e7fc8b12a834b5e4da328926'
+            'a95252d2305437fe5ada214162b9952efbc6f3e97399e55cb003d1c394f1770a'
+            'b7b16afef904785a9681b2c03c98a54e8edb224568c63d155bd3f0f1b0508054'
+            'd883c7c1148e2177c7ff23a3fdbdc3956b9b963c82661f227e2c57829358c7f4'
+            '0b90abe95bbe585ba2b39b98b7e3cdb85d6827a2afdb8ed677e6a83e33a31009'
+            'bcbe378ec13c845939cf69899bdeb50a7711eef1e5e5127cdc1c9b020f1edd20'
+            'eaa58ae6a0fa740fbd376a39b1c2fab9d77c3eae1456ecef47caef9cc4587638'
+            'd183ee330c718b440c72ebd90cea389bf13cc99e6a34bf15d4818d663b06ec50'
+            '673b15ce54ff120d17e7ddc20bcc8c9467bee16935b7ab1ec45946307c8caf56'
+            'c1d67dfed8e9b43fe0e4ab20c5f9c918c83ecc8ba8930e9cf123beb90d11318b'
+            '9df19c8cb6017640944211186ce9a6e21715411e896938de2a6d48368372f23e'
+            '043ad519351be44de7d93f775abce8da2880e4eb698ff9444558f4795dab26cc'
+            '4180fbc2315ddfc1a7763333c1dc507661bd30689c9162f1e58bf01a6fc9f9f2'
+            '0d981d8a25039ff57e5375f34ea036021890fe7302f5f710beb1e5ca1e019e48')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git 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
index a705f71a..fc70d85e 100644
--- 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 7b26289a1e7fafff7da844cdaac26b997febbc94 Mon Sep 17 00:00:00 2001
+From 9a22842c6ec7d34b1edba1a18411e73bf90a1567 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
@@ -143,7 +143,7 @@ index 4630ec4602..3f9fdc72b1 100644
  
  QMAKE_LINK              = $${CROSS_COMPILE}clang++
 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
-index ed131c6823..b8e08df0be 100644
+index 5e9923357f..67805c29a7 100644
 --- a/mkspecs/win32-g++/qmake.conf
 +++ b/mkspecs/win32-g++/qmake.conf
 @@ -12,11 +12,11 @@ include(../common/g++-win32.conf)
diff --git 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
index c7649a9c..2ce49556 100644
--- 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 71303c275da3c576a5386dc50d4916ce21a58b16 Mon Sep 17 00:00:00 2001
+From a1aebd2231ed102c84b992058c1de1a02817214e 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
diff --git a/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-dynamic/0003-Use-external-ANGLE-library.patch
index 43cc3f94..d491f963 100644
--- 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 1e421ad10dfb855e5a8626124854fb6e9ab568ca Mon Sep 17 00:00:00 2001
+From c05b912a91f424375d6b44cb0cebdec7c44c967c 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
@@ -12,7 +12,7 @@ Subject: [PATCH 03/34] Use external ANGLE library
  5 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 07869efd7d..2e32911a64 100644
+index 84dbbfebd4..46a8696ff3 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
 @@ -2,9 +2,9 @@
diff --git 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
index 2d00f691..a8f88d01 100644
--- 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 200e74dca03f63bac8ef550403454e069c450239 Mon Sep 17 00:00:00 2001
+From c92307d539cd71249031bd42eac1d7d4a78fa939 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
diff --git 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
index 194b1fc0..f6e3ee03 100644
--- 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 77b28d91f16838274c5e6ac28cf10a0d8794c225 Mon Sep 17 00:00:00 2001
+From 70435bc3ad5e60f9330a833094635e73eb9bc6a8 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,7 +10,7 @@ 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 7762e47f41..bc466d35b3 100644
+index ab261d02f1..aa4c96be49 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
@@ -49,10 +49,10 @@ index 350ebd377a..d0c234b864 100644
      void writePkgConfigFile();   // for pkg-config
  
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 6046e5791e..87157f31ae 100644
+index 208af1327f..5a37b218de 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -751,7 +751,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -753,7 +753,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
                  }
                  if(!ret.isEmpty())
                      ret += "\n\t";
diff --git 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
index 2f8e9c3b..46320085 100644
--- 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 81db0b14c6a54d49f9150f20a30a3e188ec97052 Mon Sep 17 00:00:00 2001
+From 75f422a35a62d1693e5d84d6745590d8088f6344 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
diff --git 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
index ae6ecec7..962201fc 100644
--- 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 5242deeb9bda4e9e692bb56a2cc681d4311cb0e5 Mon Sep 17 00:00:00 2001
+From 185e54d2c46014b51579261068b14f1483ba3aa1 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,7 +15,7 @@ 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 bc466d35b3..67d97f520a 100644
+index aa4c96be49..b005da931e 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
diff --git 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
index e61a9a3e..69f37f17 100644
--- 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 658b08047664f3f83caa324dcbfd3281e2a375cc Mon Sep 17 00:00:00 2001
+From a21de39b50f538d9dce89bab8fc12cfb631d3f6b 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,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 44140bc7b6..19fd92bce7 100644
+index 6fdcd562a7..7733db0206 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -387,8 +387,10 @@
diff --git 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
index 913bc60e..40086a48 100644
--- 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 1ca21f0dc5e507ad26f16232dd75cb351ded1d6a Mon Sep 17 00:00:00 2001
+From bef46a6c727a1370768b9d270bd76fc9b4ded4cd 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
diff --git 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
index 7c5998b6..ff817a7a 100644
--- 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 aef97271acabe3732d92e6c291f9b9f844bc1f29 Mon Sep 17 00:00:00 2001
+From 961a060a30e67a4a1062cd97fed2d08fbcfb804b 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
diff --git 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
index 0908b405..63c78f08 100644
--- 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 d318f8d851e848936b2e171d38ebda142f733455 Mon Sep 17 00:00:00 2001
+From bc6d72e7347436e3a1db35311eaf6c1240a65fc3 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,7 +8,7 @@ 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 19fd92bce7..822214a0aa 100644
+index 7733db0206..184c9368f2 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -238,8 +238,11 @@
diff --git 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
index c552550a..c492b0ba 100644
--- 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 49fd90a7d66176f95ace73a34d7c2b3aca3206bd Mon Sep 17 00:00:00 2001
+From 95f8ae9b5c7600313f1c6f3f4a7c1f50afef3069 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,7 +8,7 @@ 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 822214a0aa..da4cab79a0 100644
+index 184c9368f2..db6d4d68c9 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -306,7 +306,11 @@
diff --git 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
index 598b53c7..fb2652b7 100644
--- 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 1b56343203f3a75b0e1ae237da4f42f6b235940b Mon Sep 17 00:00:00 2001
+From 8f9fe88a5643aafe2aeb8cb44bbbac17d6d67808 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
diff --git 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
index cdbca05c..5ec2a7e1 100644
--- 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 697338ba4c3626e99aa3a501c0942a411ce55a5f Mon Sep 17 00:00:00 2001
+From b35664794a3658470c900c4a7c1b8dbf436359ca 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
diff --git 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
index 1ef4aa2c..f6ff1d42 100644
--- 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 bc71e0b2ee8e5ce96091e0fc65f2fdc986438376 Mon Sep 17 00:00:00 2001
+From 12167c0f3c19d677ca681d58765c3c49f13ba9e2 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
diff --git a/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-dynamic/0016-Rename-qtmain-to-qt5main.patch
index c97528bf..80d4054c 100644
--- 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 53eb02bb30a316f3562e5886cd3fae8ad02af7a0 Mon Sep 17 00:00:00 2001
+From ff46ecb2fdcfc203d55e9fcef8b29c62742c61ae 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
@@ -25,10 +25,10 @@ index 07e2b6a88e..5bfbcfdca6 100644
  QMAKE_IDL               = $${CROSS_COMPILE}widl
  QMAKE_LIB               = $${CROSS_COMPILE}ar -rc
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 2ed708e085..e67917cc96 100644
+index 6bf1380716..74a9160628 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -227,8 +227,8 @@ mac {
+@@ -229,8 +229,8 @@ mac {
      CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
  
      mingw {
diff --git a/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-dynamic/0017-Build-dynamic-host-libraries.patch
index 72e387e7..8679cdfa 100644
--- 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 1289a32f82d05281db146165a94fc4d06d432972 Mon Sep 17 00:00:00 2001
+From 9ae3b38009637d7455dc7c30295beb9de8f137fc 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
diff --git 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
index 67323501..e9bd6717 100644
--- 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 8f12c750711b71fded02ad3e6bee6e88f93f4bae Mon Sep 17 00:00:00 2001
+From 1937d98580d1988eb1422ec431bb7bf214ccb964 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
diff --git 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
index 075f79e0..25d5a0df 100644
--- 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 6e6bc8bbffff9972c86d660d3fdd99029e6c7c8a Mon Sep 17 00:00:00 2001
+From 1249cece89416ca3aae9f8edef37738d6405b846 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
diff --git 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
index 3fe7ac92..01cfa8e1 100644
--- 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 cf9f7a67dedc858d1f8b1e16747a31747787cb4e Mon Sep 17 00:00:00 2001
+From 83340c970109edc6400a8f74f1728affec4024c5 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
@@ -11,10 +11,10 @@ mingw-w64 specific mkspec
  2 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index e67917cc96..2a94964b49 100644
+index 74a9160628..7694d1c7ae 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -238,8 +238,9 @@ mac {
+@@ -240,8 +240,9 @@ mac {
              CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
              CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
          } else {
@@ -27,7 +27,7 @@ index e67917cc96..2a94964b49 100644
      } else {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 87157f31ae..4592fed7b2 100644
+index 5a37b218de..29bf9441f7 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
@@ -45,9 +45,9 @@ index 87157f31ae..4592fed7b2 100644
 +      impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
 +    }
      QList<QMakeLocalFileName> dirs;
+     int libidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-         dirs.append(QMakeLocalFileName(dlib.toQString()));
-@@ -255,9 +259,12 @@ void Win32MakefileGenerator::fixTargetExt()
+@@ -257,9 +261,12 @@ void Win32MakefileGenerator::fixTargetExt()
      if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
          project->values("TARGET_EXT").append(".exe");
      } else if (project->isActiveConfig("shared")) {
diff --git 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
index 82176cd2..dbec06bb 100644
--- 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 0e8a2cab1c1a9257ad85cfa3869433c9b454f860 Mon Sep 17 00:00:00 2001
+From 814b3a23dd94818101265df95b1051987faf440d 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 629ca78ff1..b4822af13f 100644
+index 131aa868c2..75203c4572 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -1315,3 +1315,12 @@ defineTest(createConfigStatus) {
+@@ -1318,3 +1318,12 @@ defineTest(createConfigStatus) {
  
  QMAKE_POST_CONFIGURE += \
      "createConfigStatus()"
@@ -101,7 +101,7 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 67d97f520a..a802c645c7 100644
+index b005da931e..e0c42131f8 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
diff --git 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
index fc9e517e..4ab26a2a 100644
--- 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 b2d749f5e3b7b6d35345dff54c7eb76d2e1a3a44 Mon Sep 17 00:00:00 2001
+From 71f297d50afe7143f6754a5ea95013cddf25c3ea 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,16 +7,16 @@ 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        | 207 +++++++++++++++---
+ .../data/cmake/Qt5BasicConfig.cmake.in        | 208 +++++++++++++++---
  .../data/cmake/Qt5PluginTarget.cmake.in       |  11 +-
  qmake/generators/makefile.cpp                 |  16 +-
- 3 files changed, 192 insertions(+), 42 deletions(-)
+ 3 files changed, 193 insertions(+), 42 deletions(-)
 
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 3ed6dd5889..9325bb3190 100644
+index 3ed6dd5889..9073046205 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -48,36 +48,110 @@ but not all the files it references.
+@@ -48,36 +48,111 @@ but not all the files it references.
      endif()
  endmacro()
  
@@ -66,9 +66,10 @@ index 3ed6dd5889..9325bb3190 100644
 +            math(EXPR DEPENDENCY_INDEX \"${DEPENDENCY_INDEX} + 1\")
 +        endforeach()
 +
-+        if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\")
++        if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\" OR \"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"RELEASE\")
 +            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${DEPENDENCY_TARGETS})
-+        else()
++        endif()
++        if (NOT \"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\")
 +            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES_${IMPORTED_TARGET_CONFIG} ${DEPENDENCY_TARGETS})
 +        endif()
 +
@@ -135,7 +136,7 @@ index 3ed6dd5889..9325bb3190 100644
          )
      endif()
  !!ENDIF
-@@ -217,13 +291,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -217,13 +292,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")
@@ -161,12 +162,12 @@ index 3ed6dd5889..9325bb3190 100644
 +
 +!!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
 +
@@ -182,7 +183,7 @@ index 3ed6dd5889..9325bb3190 100644
  !!IF !equals(TEMPLATE, aux)
  !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
      set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-@@ -238,6 +344,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -238,6 +345,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, ";"))
  
@@ -239,7 +240,7 @@ index 3ed6dd5889..9325bb3190 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})
-@@ -256,9 +412,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -256,9 +413,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
                  list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
              endif()
          endforeach()
@@ -253,7 +254,7 @@ index 3ed6dd5889..9325bb3190 100644
      endif()
  
  !!IF !equals(TEMPLATE, aux)
-@@ -328,9 +488,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -328,9 +489,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
@@ -267,7 +268,7 @@ index 3ed6dd5889..9325bb3190 100644
  !!ENDIF // CMAKE_RELEASE_TYPE
  !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
  
-@@ -341,29 +503,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -341,29 +504,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      )
  !!ENDIF // TEMPLATE != aux
  
@@ -321,7 +322,7 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a802c645c7..30756d9b64 100644
+index e0c42131f8..94dfed92b3 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
diff --git 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
index bc5a767d..4a4eb42b 100644
--- 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 af97d60e4f62cffec74c0c4905b79b49aab598af Mon Sep 17 00:00:00 2001
+From d9e7255dcfbf1d5775712902d9ce513d3e235128 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
@@ -22,7 +22,7 @@ installed in the same prefix
  create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 2a94964b49..839a51f377 100644
+index 7694d1c7ae..38887a6ccf 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -42,7 +42,7 @@ split_incpath {
@@ -83,7 +83,7 @@ index 2a94964b49..839a51f377 100644
      INSTALLS += cmake_qt5_plugin_file
  
      return()
-@@ -182,27 +186,36 @@ mod_deps =
+@@ -182,29 +186,38 @@ mod_deps =
  lib_deps =
  aux_mod_deps =
  aux_lib_deps =
@@ -117,14 +117,16 @@ index 2a94964b49..839a51f377 100644
 +CMAKE_INTERFACE_COMPILE_DEFINITIONS_STATIC = $$join(aux_compile_defs_static, ";")
 +
  
- CMAKE_QT_STEM = Qt$$QT_MAJOR_VERSION$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}
+ # TARGET here is the one changed at the end of qt_module.prf,
+ # which already contains the Qt5 prefix and QT_LIBINFIX suffix
+ CMAKE_QT_STEM = $${TARGET}
  
  mac {
 +    # this branch is broken by the patch, only apply when building for Windows
      !isEmpty(CMAKE_STATIC_TYPE) {
          CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
          CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -230,35 +243,33 @@ mac {
+@@ -232,35 +245,33 @@ mac {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
  
@@ -179,7 +181,7 @@ index 2a94964b49..839a51f377 100644
      !isEmpty(CMAKE_STATIC_TYPE) {
          CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
          CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -278,12 +289,12 @@ mac {
+@@ -280,12 +291,12 @@ mac {
  INSTALLS += cmake_qt5_module_files
  
  cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@@ -194,7 +196,7 @@ index 2a94964b49..839a51f377 100644
  
  !build_pass:QMAKE_SUBSTITUTES += \
      cmake_config_file \
-@@ -293,11 +304,29 @@ cmake_qt5_module_files.files = \
+@@ -295,11 +306,29 @@ cmake_qt5_module_files.files = \
      $$cmake_config_file.output \
      $$cmake_config_version_file.output
  
@@ -225,7 +227,7 @@ index 2a94964b49..839a51f377 100644
  
      !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
  
-@@ -309,7 +338,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -311,7 +340,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
  exists($$cmake_macros_file.input) {
      CMAKE_MODULE_MACROS = "true"
  
@@ -234,7 +236,7 @@ index 2a94964b49..839a51f377 100644
      cmake_macros_file.CONFIG = verbatim
  
      !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -317,7 +346,7 @@ exists($$cmake_macros_file.input) {
+@@ -319,7 +348,7 @@ exists($$cmake_macros_file.input) {
      cmake_qt5_module_files.files += $$cmake_macros_file.output
  }
  
@@ -244,7 +246,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 9325bb3190..7ee0c86130 100644
+index 9073046205..9b6cc352b5 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,7 +309,7 @@ index 9325bb3190..7ee0c86130 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.
-@@ -105,33 +136,68 @@ if(NOT COMMAND _qt5_add_dependencies)
+@@ -106,33 +137,68 @@ if(NOT COMMAND _qt5_add_dependencies)
          set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\")
      endmacro()
  endif()
@@ -381,7 +383,7 @@ index 9325bb3190..7ee0c86130 100644
          \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
          \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
  !!IF !isEmpty(CMAKE_LIB_SONAME)
-@@ -148,9 +214,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
+@@ -149,9 +215,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
@@ -396,7 +398,7 @@ index 9325bb3190..7ee0c86130 100644
          \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib}
          )
      endif()
-@@ -158,8 +228,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
+@@ -159,8 +229,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
  endmacro()
  !!ENDIF
  
@@ -407,7 +409,7 @@ index 9325bb3190..7ee0c86130 100644
  !!IF !no_module_headers
  !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
      set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -167,46 +238,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -168,46 +239,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)
@@ -475,7 +477,7 @@ index 9325bb3190..7ee0c86130 100644
      endforeach()
  
  !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -215,16 +290,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -216,16 +291,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})
@@ -499,7 +501,7 @@ index 9325bb3190..7ee0c86130 100644
  !!ENDIF // TEMPLATE != aux
      set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
  
-@@ -232,10 +311,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -233,10 +312,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\")
  !!ENDIF
  
@@ -512,7 +514,7 @@ index 9325bb3190..7ee0c86130 100644
          set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
      endif()
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
-@@ -243,17 +322,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -244,17 +323,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)
@@ -534,7 +536,7 @@ index 9325bb3190..7ee0c86130 100644
                  $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
                  ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
                  ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
-@@ -261,36 +340,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -262,36 +341,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
              )
          endif()
  
@@ -590,7 +592,7 @@ index 9325bb3190..7ee0c86130 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\")
-@@ -312,37 +396,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -313,37 +397,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      endmacro()
  
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -651,7 +653,7 @@ index 9325bb3190..7ee0c86130 100644
  
      # Find plugin targets
      file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
-@@ -356,7 +451,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -357,7 +452,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
          endforeach()
      endif()
  
@@ -663,7 +665,7 @@ index 9325bb3190..7ee0c86130 100644
          set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
  
  !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-@@ -364,7 +463,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -365,7 +464,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
  !!ENDIF
@@ -675,7 +677,7 @@ index 9325bb3190..7ee0c86130 100644
          set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
              \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
          )
-@@ -395,16 +498,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -396,16 +499,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      endif()
  
      set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
@@ -696,7 +698,7 @@ index 9325bb3190..7ee0c86130 100644
          )
          set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
          foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -413,69 +516,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -414,69 +517,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
              endif()
          endforeach()
  !!IF !isEmpty(CMAKE_STATIC_TYPE)
@@ -792,7 +794,7 @@ index 9325bb3190..7ee0c86130 100644
      if (EXISTS
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
          \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -488,7 +594,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -489,7 +595,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
@@ -801,7 +803,7 @@ index 9325bb3190..7ee0c86130 100644
      endif()
  !!ENDIF // CMAKE_STATIC_TYPE
  
-@@ -498,19 +604,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -499,19 +605,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  
  !!ENDIF // CMAKE_DEBUG_TYPE
  !!ELSE // TEMPLATE != aux
@@ -960,7 +962,7 @@ index e0652fdcf9..f0add757bb 100644
                      $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt5::WinMain>
              )
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 2e32911a64..6b02a12944 100644
+index 46a8696ff3..2783f7f9e9 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
 @@ -1,4 +1,6 @@
@@ -979,7 +981,7 @@ index 2e32911a64..6b02a12944 100644
  
  unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE)
  
-@@ -170,9 +172,9 @@ _qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\"
+@@ -183,9 +185,9 @@ _qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\"
  
  set(Qt5Gui_OPENGL_IMPLEMENTATION $$CMAKE_QT_OPENGL_IMPLEMENTATION)
  
diff --git 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
index 802c6e2c..b626f51c 100644
--- 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 25143b06d43a9a4cceb6d038f4f97d5f2af53c8e Mon Sep 17 00:00:00 2001
+From 96e14e82726f32e222c506c41b3917897ec8482c 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
diff --git 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
index f7b5d243..c155450e 100644
--- 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 348b46baa42d1001d2a650a0fe44a2254068bb8e Mon Sep 17 00:00:00 2001
+From 1bcc8c23d8acce7855ebba3ad97d088f19831414 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 b4822af13f..addb27b6d7 100644
+index 75203c4572..377788d653 100644
 --- a/configure.pri
 +++ b/configure.pri
 @@ -328,6 +328,9 @@ defineTest(qtConfTest_detectPkgConfig) {
diff --git 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
index 2050d214..216c33d3 100644
--- 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 7fc63fcd9c5e8a2c864c7de9fa14338ce3e82969 Mon Sep 17 00:00:00 2001
+From 52682db5b750289cdd3dc68682861da8507db2b3 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
diff --git 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
index 1dfa7de0..24028c87 100644
--- 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 93aba1e6a5106bc91b34fada1d5343ff25b9ce43 Mon Sep 17 00:00:00 2001
+From 0dd39f4bc9414441e8cdfe2cff1636102d15ee53 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
diff --git 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
index 4a1c752f..fba4a80e 100644
--- 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 512be5eb5add4a5f2146ca0a0b3a8b7a434c600a Mon Sep 17 00:00:00 2001
+From 837aab47427a3c3a2d44b321d2d64d4220293e07 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
@@ -49,7 +49,7 @@ index 9c39727946..cc14036b25 100644
  #else
      char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index a22a7459bd..b7ed2f7281 100644
+index 5f5a00a64f..d779c3c4ff 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
 @@ -71,7 +71,7 @@
@@ -61,7 +61,7 @@ index a22a7459bd..b7ed2f7281 100644
                      "char *outp;",
                      "size_t inbytes, outbytes;",
                      "iconv(x, &inp, &inbytes, &outp, &outbytes);",
-@@ -615,9 +615,9 @@
+@@ -631,9 +631,9 @@
          },
          "gnu-libiconv": {
              "label": "GNU iconv",
diff --git 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
index 4ff09302..9c49adfb 100644
--- 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 41e9bbfc0c70d1a94f7c90aef50493e3341389b7 Mon Sep 17 00:00:00 2001
+From 48f35ff2e010746ee29e5e38f67e11680c420fa0 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
diff --git 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
index 1bf91a24..7d3b41d2 100644
--- 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 f41ba61108dd735410e4feac87fa23b321d0a20f Mon Sep 17 00:00:00 2001
+From 70d1ba494a9d2498ca79dab847cb8d4b6598bdc1 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
@@ -25,7 +25,7 @@ index 7f42fbe09e..e27428c0f2 100644
      int libidx = 0, fwidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 4592fed7b2..b93d0df473 100644
+index 29bf9441f7..cc4c031ce7 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
@@ -36,8 +36,8 @@ index 4592fed7b2..b93d0df473 100644
 +        return false; // prevent qmake from messing static lib dependencies
 +    }
      QList<QMakeLocalFileName> dirs;
+     int libidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-         dirs.append(QMakeLocalFileName(dlib.toQString()));
 -- 
 2.21.0
 
diff --git 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
index 35a1cd46..3fd01678 100644
--- 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 2c28928b34fc030330b00f16fcb546a477c48621 Mon Sep 17 00:00:00 2001
+From c64b26908cc7cdeb19bb41fab98f328174ccfea0 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
diff --git 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
index 7f7d9551..f01fa5d6 100644
--- 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 00034061c0b8ad7c875ef00a687d95c2100f15f3 Mon Sep 17 00:00:00 2001
+From 05a8d15d8f9e5b0bc6489ef29bdc94e4a047df13 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
diff --git 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
index 502a8a95..011ecfa6 100644
--- 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 f3ec9ba64cd4a80639959abbef537ce718dc70d6 Mon Sep 17 00:00:00 2001
+From 2fb77d4fad4edc257562f29347e1279c001b3f89 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
@@ -19,7 +19,7 @@ during RTL pass: ira
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
-index 6195c324e7..480af00ebc 100644
+index 90df8653a7..50725dc5cb 100644
 --- a/src/corelib/global/qrandom.cpp
 +++ b/src/corelib/global/qrandom.cpp
 @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando
diff --git 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
index 4f5f7b1a..692db419 100644
--- 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 ee1d9dbd64b6123280c47b8633daf3d407f12ae6 Mon Sep 17 00:00:00 2001
+From 7ca7ebb16733d10658c7135c5948cf21eafac8fe 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 7ca65c92b3..48fa54a166 100644
+index 62ad972796..866ffdb6ad 100644
 --- a/mkspecs/features/qt_configure.prf
 +++ b/mkspecs/features/qt_configure.prf
-@@ -553,12 +553,12 @@ defineTest(qtConfResolveLibs) {
+@@ -561,12 +561,12 @@ defineTest(qtConfResolveLibs) {
                  # Under Windows, we look only for static libraries, as even for DLLs
                  # one actually links against a static import library.
                  mingw {
diff --git a/qt5-base/mingw-w64-dynamic/PKGBUILD b/qt5-base/mingw-w64-dynamic/PKGBUILD
index 45f75fe2..fa2b082b 100644
--- 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.2
+pkgver=5.12.3
 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
@@ -87,40 +87,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
         '0033-Disable-hardware-randomizer-for-32-bit.patch'
         '0034-Prevent-static-build-to-prefer-dynamic-libraries.patch')
 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')
+            '813332969dbfd7fcc8af3d23457eea0ce3b3a54ed9b9eae62b431529b8f60b22'
+            '96b9e2fb177de9c8cfe8c8cd601705981d4c223eef9fc582ec0f45d26c6b6d7f'
+            'b1aa13e0e6e28718edb11520660954101c662f6b6945a83cb4e84ff7de5c0922'
+            '2be87f841ac2104f44114ec65dbd35f8bf8280176b9341015b99aa7dd6756967'
+            'c61a62a241b0d03354b523dd9d4ae811e55b12e6e2683c45a3bfd67574e2ad8a'
+            '1050833662659481606f94a2f4a95f764e7d1ae8b9d015a497b508884cd755d0'
+            'eea4870ab1394e9473fe1cee2d856bb5d0d31b68ec91b20d45c882893049a9f6'
+            '11a4267ae9fa3d49046945ba7e0867b400364f0475c2d36814af45fbc4c3f2f0'
+            '2b977aba78484cb01208300d02a9ce945edfa0ac73ad91c9331cb73851c9b85d'
+            'd9e8736c57f5f8841238fe131508d29d9de0fa3d0c0554e1a443aab33147b430'
+            'f30bd604cf3da044f38da38d873a988870d0413aafa5f437d11286d2d3dbb42b'
+            '00b84c1b66212797876b1793b36e3537dc866770f632b4d98b91d84e6766c2d8'
+            '2fdf313e492061c7a34b63b25129c253088714a632616437c7ab473b43eca5be'
+            '6cde53dd184b5aa79e3c471392eaa6e2ac9dc72e8394dab7248cb8a0ac3e856f'
+            '64b37f777b45bc1b134ea5723ccc6c430784ebbf53b428addeb73ba1108c9225'
+            '7b4398060dd40fcf8f23b5ca908a0f79be7adfe7f15ad9ec77f23913b5c6c3fc'
+            'bfb28bde40b37d74585174414a647af051a8da251107513d3c5e160c72fa7af5'
+            '9809aab5b4fadf65c2704654ac2c171877b634d5b874af6c96574159ba9f2002'
+            '374b0ed5fe0285389dda11a6fbccabd3094d2aaa7489d3e59d9b31ead444ce27'
+            '0961354456c56fa6041758ee35f26d563e60f4ed3bcae214abec2ffbd89f3e80'
+            '78681b7f7a6456cda9ca4bef34bf4caf3dfbeb36e7fc8b12a834b5e4da328926'
+            'a95252d2305437fe5ada214162b9952efbc6f3e97399e55cb003d1c394f1770a'
+            'b7b16afef904785a9681b2c03c98a54e8edb224568c63d155bd3f0f1b0508054'
+            'd883c7c1148e2177c7ff23a3fdbdc3956b9b963c82661f227e2c57829358c7f4'
+            '0b90abe95bbe585ba2b39b98b7e3cdb85d6827a2afdb8ed677e6a83e33a31009'
+            'bcbe378ec13c845939cf69899bdeb50a7711eef1e5e5127cdc1c9b020f1edd20'
+            'eaa58ae6a0fa740fbd376a39b1c2fab9d77c3eae1456ecef47caef9cc4587638'
+            'd183ee330c718b440c72ebd90cea389bf13cc99e6a34bf15d4818d663b06ec50'
+            '673b15ce54ff120d17e7ddc20bcc8c9467bee16935b7ab1ec45946307c8caf56'
+            'c1d67dfed8e9b43fe0e4ab20c5f9c918c83ecc8ba8930e9cf123beb90d11318b'
+            '9df19c8cb6017640944211186ce9a6e21715411e896938de2a6d48368372f23e'
+            '043ad519351be44de7d93f775abce8da2880e4eb698ff9444558f4795dab26cc'
+            '4180fbc2315ddfc1a7763333c1dc507661bd30689c9162f1e58bf01a6fc9f9f2'
+            '0d981d8a25039ff57e5375f34ea036021890fe7302f5f710beb1e5ca1e019e48')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git 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
index a705f71a..fc70d85e 100644
--- 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 7b26289a1e7fafff7da844cdaac26b997febbc94 Mon Sep 17 00:00:00 2001
+From 9a22842c6ec7d34b1edba1a18411e73bf90a1567 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
@@ -143,7 +143,7 @@ index 4630ec4602..3f9fdc72b1 100644
  
  QMAKE_LINK              = $${CROSS_COMPILE}clang++
 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
-index ed131c6823..b8e08df0be 100644
+index 5e9923357f..67805c29a7 100644
 --- a/mkspecs/win32-g++/qmake.conf
 +++ b/mkspecs/win32-g++/qmake.conf
 @@ -12,11 +12,11 @@ include(../common/g++-win32.conf)
diff --git 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
index c7649a9c..2ce49556 100644
--- 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 71303c275da3c576a5386dc50d4916ce21a58b16 Mon Sep 17 00:00:00 2001
+From a1aebd2231ed102c84b992058c1de1a02817214e 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
diff --git a/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64-static/0003-Use-external-ANGLE-library.patch
index 43cc3f94..d491f963 100644
--- 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 1e421ad10dfb855e5a8626124854fb6e9ab568ca Mon Sep 17 00:00:00 2001
+From c05b912a91f424375d6b44cb0cebdec7c44c967c 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
@@ -12,7 +12,7 @@ Subject: [PATCH 03/34] Use external ANGLE library
  5 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 07869efd7d..2e32911a64 100644
+index 84dbbfebd4..46a8696ff3 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
 @@ -2,9 +2,9 @@
diff --git 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
index 2d00f691..a8f88d01 100644
--- 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 200e74dca03f63bac8ef550403454e069c450239 Mon Sep 17 00:00:00 2001
+From c92307d539cd71249031bd42eac1d7d4a78fa939 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
diff --git 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
index 194b1fc0..f6e3ee03 100644
--- 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 77b28d91f16838274c5e6ac28cf10a0d8794c225 Mon Sep 17 00:00:00 2001
+From 70435bc3ad5e60f9330a833094635e73eb9bc6a8 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,7 +10,7 @@ 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 7762e47f41..bc466d35b3 100644
+index ab261d02f1..aa4c96be49 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
@@ -49,10 +49,10 @@ index 350ebd377a..d0c234b864 100644
      void writePkgConfigFile();   // for pkg-config
  
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 6046e5791e..87157f31ae 100644
+index 208af1327f..5a37b218de 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -751,7 +751,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -753,7 +753,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
                  }
                  if(!ret.isEmpty())
                      ret += "\n\t";
diff --git 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
index 2f8e9c3b..46320085 100644
--- 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 81db0b14c6a54d49f9150f20a30a3e188ec97052 Mon Sep 17 00:00:00 2001
+From 75f422a35a62d1693e5d84d6745590d8088f6344 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
diff --git 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
index ae6ecec7..962201fc 100644
--- 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 5242deeb9bda4e9e692bb56a2cc681d4311cb0e5 Mon Sep 17 00:00:00 2001
+From 185e54d2c46014b51579261068b14f1483ba3aa1 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,7 +15,7 @@ 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 bc466d35b3..67d97f520a 100644
+index aa4c96be49..b005da931e 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
diff --git 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
index e61a9a3e..69f37f17 100644
--- 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 658b08047664f3f83caa324dcbfd3281e2a375cc Mon Sep 17 00:00:00 2001
+From a21de39b50f538d9dce89bab8fc12cfb631d3f6b 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,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 44140bc7b6..19fd92bce7 100644
+index 6fdcd562a7..7733db0206 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -387,8 +387,10 @@
diff --git 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
index 913bc60e..40086a48 100644
--- 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 1ca21f0dc5e507ad26f16232dd75cb351ded1d6a Mon Sep 17 00:00:00 2001
+From bef46a6c727a1370768b9d270bd76fc9b4ded4cd 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
diff --git 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
index 7c5998b6..ff817a7a 100644
--- 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 aef97271acabe3732d92e6c291f9b9f844bc1f29 Mon Sep 17 00:00:00 2001
+From 961a060a30e67a4a1062cd97fed2d08fbcfb804b 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
diff --git 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
index 0908b405..63c78f08 100644
--- 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 d318f8d851e848936b2e171d38ebda142f733455 Mon Sep 17 00:00:00 2001
+From bc6d72e7347436e3a1db35311eaf6c1240a65fc3 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,7 +8,7 @@ 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 19fd92bce7..822214a0aa 100644
+index 7733db0206..184c9368f2 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -238,8 +238,11 @@
diff --git 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
index c552550a..c492b0ba 100644
--- 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 49fd90a7d66176f95ace73a34d7c2b3aca3206bd Mon Sep 17 00:00:00 2001
+From 95f8ae9b5c7600313f1c6f3f4a7c1f50afef3069 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,7 +8,7 @@ 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 822214a0aa..da4cab79a0 100644
+index 184c9368f2..db6d4d68c9 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -306,7 +306,11 @@
diff --git 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
index 598b53c7..fb2652b7 100644
--- 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 1b56343203f3a75b0e1ae237da4f42f6b235940b Mon Sep 17 00:00:00 2001
+From 8f9fe88a5643aafe2aeb8cb44bbbac17d6d67808 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
diff --git 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
index cdbca05c..5ec2a7e1 100644
--- 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 697338ba4c3626e99aa3a501c0942a411ce55a5f Mon Sep 17 00:00:00 2001
+From b35664794a3658470c900c4a7c1b8dbf436359ca 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
diff --git 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
index 1ef4aa2c..f6ff1d42 100644
--- 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 bc71e0b2ee8e5ce96091e0fc65f2fdc986438376 Mon Sep 17 00:00:00 2001
+From 12167c0f3c19d677ca681d58765c3c49f13ba9e2 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
diff --git a/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64-static/0016-Rename-qtmain-to-qt5main.patch
index c97528bf..80d4054c 100644
--- 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 53eb02bb30a316f3562e5886cd3fae8ad02af7a0 Mon Sep 17 00:00:00 2001
+From ff46ecb2fdcfc203d55e9fcef8b29c62742c61ae 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
@@ -25,10 +25,10 @@ index 07e2b6a88e..5bfbcfdca6 100644
  QMAKE_IDL               = $${CROSS_COMPILE}widl
  QMAKE_LIB               = $${CROSS_COMPILE}ar -rc
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 2ed708e085..e67917cc96 100644
+index 6bf1380716..74a9160628 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -227,8 +227,8 @@ mac {
+@@ -229,8 +229,8 @@ mac {
      CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
  
      mingw {
diff --git a/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64-static/0017-Build-dynamic-host-libraries.patch
index 72e387e7..8679cdfa 100644
--- 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 1289a32f82d05281db146165a94fc4d06d432972 Mon Sep 17 00:00:00 2001
+From 9ae3b38009637d7455dc7c30295beb9de8f137fc 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
diff --git 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
index 67323501..e9bd6717 100644
--- 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 8f12c750711b71fded02ad3e6bee6e88f93f4bae Mon Sep 17 00:00:00 2001
+From 1937d98580d1988eb1422ec431bb7bf214ccb964 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
diff --git 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
index 075f79e0..25d5a0df 100644
--- 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 6e6bc8bbffff9972c86d660d3fdd99029e6c7c8a Mon Sep 17 00:00:00 2001
+From 1249cece89416ca3aae9f8edef37738d6405b846 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
diff --git 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
index 3fe7ac92..01cfa8e1 100644
--- 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 cf9f7a67dedc858d1f8b1e16747a31747787cb4e Mon Sep 17 00:00:00 2001
+From 83340c970109edc6400a8f74f1728affec4024c5 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
@@ -11,10 +11,10 @@ mingw-w64 specific mkspec
  2 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index e67917cc96..2a94964b49 100644
+index 74a9160628..7694d1c7ae 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -238,8 +238,9 @@ mac {
+@@ -240,8 +240,9 @@ mac {
              CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
              CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
          } else {
@@ -27,7 +27,7 @@ index e67917cc96..2a94964b49 100644
      } else {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 87157f31ae..4592fed7b2 100644
+index 5a37b218de..29bf9441f7 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
@@ -45,9 +45,9 @@ index 87157f31ae..4592fed7b2 100644
 +      impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
 +    }
      QList<QMakeLocalFileName> dirs;
+     int libidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-         dirs.append(QMakeLocalFileName(dlib.toQString()));
-@@ -255,9 +259,12 @@ void Win32MakefileGenerator::fixTargetExt()
+@@ -257,9 +261,12 @@ void Win32MakefileGenerator::fixTargetExt()
      if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
          project->values("TARGET_EXT").append(".exe");
      } else if (project->isActiveConfig("shared")) {
diff --git 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
index 82176cd2..dbec06bb 100644
--- 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 0e8a2cab1c1a9257ad85cfa3869433c9b454f860 Mon Sep 17 00:00:00 2001
+From 814b3a23dd94818101265df95b1051987faf440d 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 629ca78ff1..b4822af13f 100644
+index 131aa868c2..75203c4572 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -1315,3 +1315,12 @@ defineTest(createConfigStatus) {
+@@ -1318,3 +1318,12 @@ defineTest(createConfigStatus) {
  
  QMAKE_POST_CONFIGURE += \
      "createConfigStatus()"
@@ -101,7 +101,7 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 67d97f520a..a802c645c7 100644
+index b005da931e..e0c42131f8 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
diff --git 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
index fc9e517e..4ab26a2a 100644
--- 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 b2d749f5e3b7b6d35345dff54c7eb76d2e1a3a44 Mon Sep 17 00:00:00 2001
+From 71f297d50afe7143f6754a5ea95013cddf25c3ea 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,16 +7,16 @@ 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        | 207 +++++++++++++++---
+ .../data/cmake/Qt5BasicConfig.cmake.in        | 208 +++++++++++++++---
  .../data/cmake/Qt5PluginTarget.cmake.in       |  11 +-
  qmake/generators/makefile.cpp                 |  16 +-
- 3 files changed, 192 insertions(+), 42 deletions(-)
+ 3 files changed, 193 insertions(+), 42 deletions(-)
 
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 3ed6dd5889..9325bb3190 100644
+index 3ed6dd5889..9073046205 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -48,36 +48,110 @@ but not all the files it references.
+@@ -48,36 +48,111 @@ but not all the files it references.
      endif()
  endmacro()
  
@@ -66,9 +66,10 @@ index 3ed6dd5889..9325bb3190 100644
 +            math(EXPR DEPENDENCY_INDEX \"${DEPENDENCY_INDEX} + 1\")
 +        endforeach()
 +
-+        if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\")
++        if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\" OR \"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"RELEASE\")
 +            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${DEPENDENCY_TARGETS})
-+        else()
++        endif()
++        if (NOT \"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\")
 +            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES_${IMPORTED_TARGET_CONFIG} ${DEPENDENCY_TARGETS})
 +        endif()
 +
@@ -135,7 +136,7 @@ index 3ed6dd5889..9325bb3190 100644
          )
      endif()
  !!ENDIF
-@@ -217,13 +291,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -217,13 +292,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")
@@ -161,12 +162,12 @@ index 3ed6dd5889..9325bb3190 100644
 +
 +!!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
 +
@@ -182,7 +183,7 @@ index 3ed6dd5889..9325bb3190 100644
  !!IF !equals(TEMPLATE, aux)
  !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
      set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-@@ -238,6 +344,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -238,6 +345,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, ";"))
  
@@ -239,7 +240,7 @@ index 3ed6dd5889..9325bb3190 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})
-@@ -256,9 +412,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -256,9 +413,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
                  list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
              endif()
          endforeach()
@@ -253,7 +254,7 @@ index 3ed6dd5889..9325bb3190 100644
      endif()
  
  !!IF !equals(TEMPLATE, aux)
-@@ -328,9 +488,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -328,9 +489,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
@@ -267,7 +268,7 @@ index 3ed6dd5889..9325bb3190 100644
  !!ENDIF // CMAKE_RELEASE_TYPE
  !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
  
-@@ -341,29 +503,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -341,29 +504,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      )
  !!ENDIF // TEMPLATE != aux
  
@@ -321,7 +322,7 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a802c645c7..30756d9b64 100644
+index e0c42131f8..94dfed92b3 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
diff --git a/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch
index bc5a767d..4a4eb42b 100644
--- a/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64-static/0023-Allow-usage-of-static-version-with-CMake.patch
@@ -1,4 +1,4 @@
-From af97d60e4f62cffec74c0c4905b79b49aab598af Mon Sep 17 00:00:00 2001
+From d9e7255dcfbf1d5775712902d9ce513d3e235128 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
@@ -22,7 +22,7 @@ installed in the same prefix
  create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 2a94964b49..839a51f377 100644
+index 7694d1c7ae..38887a6ccf 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -42,7 +42,7 @@ split_incpath {
@@ -83,7 +83,7 @@ index 2a94964b49..839a51f377 100644
      INSTALLS += cmake_qt5_plugin_file
  
      return()
-@@ -182,27 +186,36 @@ mod_deps =
+@@ -182,29 +186,38 @@ mod_deps =
  lib_deps =
  aux_mod_deps =
  aux_lib_deps =
@@ -117,14 +117,16 @@ index 2a94964b49..839a51f377 100644
 +CMAKE_INTERFACE_COMPILE_DEFINITIONS_STATIC = $$join(aux_compile_defs_static, ";")
 +
  
- CMAKE_QT_STEM = Qt$$QT_MAJOR_VERSION$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}
+ # TARGET here is the one changed at the end of qt_module.prf,
+ # which already contains the Qt5 prefix and QT_LIBINFIX suffix
+ CMAKE_QT_STEM = $${TARGET}
  
  mac {
 +    # this branch is broken by the patch, only apply when building for Windows
      !isEmpty(CMAKE_STATIC_TYPE) {
          CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
          CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -230,35 +243,33 @@ mac {
+@@ -232,35 +245,33 @@ mac {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
  
@@ -179,7 +181,7 @@ index 2a94964b49..839a51f377 100644
      !isEmpty(CMAKE_STATIC_TYPE) {
          CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
          CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -278,12 +289,12 @@ mac {
+@@ -280,12 +291,12 @@ mac {
  INSTALLS += cmake_qt5_module_files
  
  cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@@ -194,7 +196,7 @@ index 2a94964b49..839a51f377 100644
  
  !build_pass:QMAKE_SUBSTITUTES += \
      cmake_config_file \
-@@ -293,11 +304,29 @@ cmake_qt5_module_files.files = \
+@@ -295,11 +306,29 @@ cmake_qt5_module_files.files = \
      $$cmake_config_file.output \
      $$cmake_config_version_file.output
  
@@ -225,7 +227,7 @@ index 2a94964b49..839a51f377 100644
  
      !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
  
-@@ -309,7 +338,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -311,7 +340,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
  exists($$cmake_macros_file.input) {
      CMAKE_MODULE_MACROS = "true"
  
@@ -234,7 +236,7 @@ index 2a94964b49..839a51f377 100644
      cmake_macros_file.CONFIG = verbatim
  
      !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -317,7 +346,7 @@ exists($$cmake_macros_file.input) {
+@@ -319,7 +348,7 @@ exists($$cmake_macros_file.input) {
      cmake_qt5_module_files.files += $$cmake_macros_file.output
  }
  
@@ -244,7 +246,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 9325bb3190..7ee0c86130 100644
+index 9073046205..9b6cc352b5 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,7 +309,7 @@ index 9325bb3190..7ee0c86130 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.
-@@ -105,33 +136,68 @@ if(NOT COMMAND _qt5_add_dependencies)
+@@ -106,33 +137,68 @@ if(NOT COMMAND _qt5_add_dependencies)
          set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\")
      endmacro()
  endif()
@@ -381,7 +383,7 @@ index 9325bb3190..7ee0c86130 100644
          \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
          \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
  !!IF !isEmpty(CMAKE_LIB_SONAME)
-@@ -148,9 +214,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
+@@ -149,9 +215,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
@@ -396,7 +398,7 @@ index 9325bb3190..7ee0c86130 100644
          \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib}
          )
      endif()
-@@ -158,8 +228,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
+@@ -159,8 +229,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
  endmacro()
  !!ENDIF
  
@@ -407,7 +409,7 @@ index 9325bb3190..7ee0c86130 100644
  !!IF !no_module_headers
  !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
      set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -167,46 +238,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -168,46 +239,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)
@@ -475,7 +477,7 @@ index 9325bb3190..7ee0c86130 100644
      endforeach()
  
  !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -215,16 +290,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -216,16 +291,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})
@@ -499,7 +501,7 @@ index 9325bb3190..7ee0c86130 100644
  !!ENDIF // TEMPLATE != aux
      set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
  
-@@ -232,10 +311,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -233,10 +312,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\")
  !!ENDIF
  
@@ -512,7 +514,7 @@ index 9325bb3190..7ee0c86130 100644
          set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
      endif()
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
-@@ -243,17 +322,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -244,17 +323,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)
@@ -534,7 +536,7 @@ index 9325bb3190..7ee0c86130 100644
                  $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
                  ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
                  ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
-@@ -261,36 +340,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -262,36 +341,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
              )
          endif()
  
@@ -590,7 +592,7 @@ index 9325bb3190..7ee0c86130 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\")
-@@ -312,37 +396,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -313,37 +397,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      endmacro()
  
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -651,7 +653,7 @@ index 9325bb3190..7ee0c86130 100644
  
      # Find plugin targets
      file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
-@@ -356,7 +451,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -357,7 +452,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
          endforeach()
      endif()
  
@@ -663,7 +665,7 @@ index 9325bb3190..7ee0c86130 100644
          set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
  
  !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-@@ -364,7 +463,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -365,7 +464,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
  !!ENDIF
@@ -675,7 +677,7 @@ index 9325bb3190..7ee0c86130 100644
          set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
              \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
          )
-@@ -395,16 +498,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -396,16 +499,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      endif()
  
      set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
@@ -696,7 +698,7 @@ index 9325bb3190..7ee0c86130 100644
          )
          set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
          foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -413,69 +516,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -414,69 +517,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
              endif()
          endforeach()
  !!IF !isEmpty(CMAKE_STATIC_TYPE)
@@ -792,7 +794,7 @@ index 9325bb3190..7ee0c86130 100644
      if (EXISTS
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
          \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -488,7 +594,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -489,7 +595,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
@@ -801,7 +803,7 @@ index 9325bb3190..7ee0c86130 100644
      endif()
  !!ENDIF // CMAKE_STATIC_TYPE
  
-@@ -498,19 +604,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -499,19 +605,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  
  !!ENDIF // CMAKE_DEBUG_TYPE
  !!ELSE // TEMPLATE != aux
@@ -960,7 +962,7 @@ index e0652fdcf9..f0add757bb 100644
                      $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt5::WinMain>
              )
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 2e32911a64..6b02a12944 100644
+index 46a8696ff3..2783f7f9e9 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
 @@ -1,4 +1,6 @@
@@ -979,7 +981,7 @@ index 2e32911a64..6b02a12944 100644
  
  unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE)
  
-@@ -170,9 +172,9 @@ _qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\"
+@@ -183,9 +185,9 @@ _qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\"
  
  set(Qt5Gui_OPENGL_IMPLEMENTATION $$CMAKE_QT_OPENGL_IMPLEMENTATION)
  
diff --git a/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
index 802c6e2c..b626f51c 100644
--- a/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64-static/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@@ -1,4 +1,4 @@
-From 25143b06d43a9a4cceb6d038f4f97d5f2af53c8e Mon Sep 17 00:00:00 2001
+From 96e14e82726f32e222c506c41b3917897ec8482c 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
diff --git a/qt5-base/mingw-w64-static/0025-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64-static/0025-Use-correct-pkg-config-static-flag.patch
index f7b5d243..c155450e 100644
--- a/qt5-base/mingw-w64-static/0025-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64-static/0025-Use-correct-pkg-config-static-flag.patch
@@ -1,4 +1,4 @@
-From 348b46baa42d1001d2a650a0fe44a2254068bb8e Mon Sep 17 00:00:00 2001
+From 1bcc8c23d8acce7855ebba3ad97d088f19831414 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 b4822af13f..addb27b6d7 100644
+index 75203c4572..377788d653 100644
 --- a/configure.pri
 +++ b/configure.pri
 @@ -328,6 +328,9 @@ defineTest(qtConfTest_detectPkgConfig) {
diff --git a/qt5-base/mingw-w64-static/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64-static/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
index 2050d214..216c33d3 100644
--- a/qt5-base/mingw-w64-static/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64-static/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,4 +1,4 @@
-From 7fc63fcd9c5e8a2c864c7de9fa14338ce3e82969 Mon Sep 17 00:00:00 2001
+From 52682db5b750289cdd3dc68682861da8507db2b3 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
diff --git a/qt5-base/mingw-w64-static/0027-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64-static/0027-Ignore-errors-about-missing-feature-static.patch
index 1dfa7de0..24028c87 100644
--- a/qt5-base/mingw-w64-static/0027-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64-static/0027-Ignore-errors-about-missing-feature-static.patch
@@ -1,4 +1,4 @@
-From 93aba1e6a5106bc91b34fada1d5343ff25b9ce43 Mon Sep 17 00:00:00 2001
+From 0dd39f4bc9414441e8cdfe2cff1636102d15ee53 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
diff --git a/qt5-base/mingw-w64-static/0028-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64-static/0028-Enable-and-fix-use-of-iconv.patch
index 4a1c752f..fba4a80e 100644
--- a/qt5-base/mingw-w64-static/0028-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64-static/0028-Enable-and-fix-use-of-iconv.patch
@@ -1,4 +1,4 @@
-From 512be5eb5add4a5f2146ca0a0b3a8b7a434c600a Mon Sep 17 00:00:00 2001
+From 837aab47427a3c3a2d44b321d2d64d4220293e07 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
@@ -49,7 +49,7 @@ index 9c39727946..cc14036b25 100644
  #else
      char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index a22a7459bd..b7ed2f7281 100644
+index 5f5a00a64f..d779c3c4ff 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
 @@ -71,7 +71,7 @@
@@ -61,7 +61,7 @@ index a22a7459bd..b7ed2f7281 100644
                      "char *outp;",
                      "size_t inbytes, outbytes;",
                      "iconv(x, &inp, &inbytes, &outp, &outbytes);",
-@@ -615,9 +615,9 @@
+@@ -631,9 +631,9 @@
          },
          "gnu-libiconv": {
              "label": "GNU iconv",
diff --git a/qt5-base/mingw-w64-static/0029-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64-static/0029-Ignore-failing-pkg-config-test.patch
index 4ff09302..9c49adfb 100644
--- a/qt5-base/mingw-w64-static/0029-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64-static/0029-Ignore-failing-pkg-config-test.patch
@@ -1,4 +1,4 @@
-From 41e9bbfc0c70d1a94f7c90aef50493e3341389b7 Mon Sep 17 00:00:00 2001
+From 48f35ff2e010746ee29e5e38f67e11680c420fa0 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
diff --git a/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 1bf91a24..7d3b41d2 100644
--- a/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64-static/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,4 +1,4 @@
-From f41ba61108dd735410e4feac87fa23b321d0a20f Mon Sep 17 00:00:00 2001
+From 70d1ba494a9d2498ca79dab847cb8d4b6598bdc1 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
@@ -25,7 +25,7 @@ index 7f42fbe09e..e27428c0f2 100644
      int libidx = 0, fwidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 4592fed7b2..b93d0df473 100644
+index 29bf9441f7..cc4c031ce7 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
@@ -36,8 +36,8 @@ index 4592fed7b2..b93d0df473 100644
 +        return false; // prevent qmake from messing static lib dependencies
 +    }
      QList<QMakeLocalFileName> dirs;
+     int libidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-         dirs.append(QMakeLocalFileName(dlib.toQString()));
 -- 
 2.21.0
 
diff --git a/qt5-base/mingw-w64-static/0031-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64-static/0031-Hardcode-linker-flags-for-platform-plugins.patch
index 35a1cd46..3fd01678 100644
--- a/qt5-base/mingw-w64-static/0031-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64-static/0031-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,4 +1,4 @@
-From 2c28928b34fc030330b00f16fcb546a477c48621 Mon Sep 17 00:00:00 2001
+From c64b26908cc7cdeb19bb41fab98f328174ccfea0 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
diff --git a/qt5-base/mingw-w64-static/0032-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64-static/0032-Fix-linking-against-static-plugins-with-qmake.patch
index 7f7d9551..f01fa5d6 100644
--- a/qt5-base/mingw-w64-static/0032-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64-static/0032-Fix-linking-against-static-plugins-with-qmake.patch
@@ -1,4 +1,4 @@
-From 00034061c0b8ad7c875ef00a687d95c2100f15f3 Mon Sep 17 00:00:00 2001
+From 05a8d15d8f9e5b0bc6489ef29bdc94e4a047df13 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
diff --git a/qt5-base/mingw-w64-static/0033-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64-static/0033-Disable-hardware-randomizer-for-32-bit.patch
index 502a8a95..011ecfa6 100644
--- a/qt5-base/mingw-w64-static/0033-Disable-hardware-randomizer-for-32-bit.patch
+++ b/qt5-base/mingw-w64-static/0033-Disable-hardware-randomizer-for-32-bit.patch
@@ -1,4 +1,4 @@
-From f3ec9ba64cd4a80639959abbef537ce718dc70d6 Mon Sep 17 00:00:00 2001
+From 2fb77d4fad4edc257562f29347e1279c001b3f89 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
@@ -19,7 +19,7 @@ during RTL pass: ira
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
-index 6195c324e7..480af00ebc 100644
+index 90df8653a7..50725dc5cb 100644
 --- a/src/corelib/global/qrandom.cpp
 +++ b/src/corelib/global/qrandom.cpp
 @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando
diff --git a/qt5-base/mingw-w64-static/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch b/qt5-base/mingw-w64-static/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch
index 4f5f7b1a..692db419 100644
--- a/qt5-base/mingw-w64-static/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch
+++ b/qt5-base/mingw-w64-static/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch
@@ -1,4 +1,4 @@
-From ee1d9dbd64b6123280c47b8633daf3d407f12ae6 Mon Sep 17 00:00:00 2001
+From 7ca7ebb16733d10658c7135c5948cf21eafac8fe 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 7ca65c92b3..48fa54a166 100644
+index 62ad972796..866ffdb6ad 100644
 --- a/mkspecs/features/qt_configure.prf
 +++ b/mkspecs/features/qt_configure.prf
-@@ -553,12 +553,12 @@ defineTest(qtConfResolveLibs) {
+@@ -561,12 +561,12 @@ defineTest(qtConfResolveLibs) {
                  # Under Windows, we look only for static libraries, as even for DLLs
                  # one actually links against a static import library.
                  mingw {
diff --git a/qt5-base/mingw-w64-static/PKGBUILD b/qt5-base/mingw-w64-static/PKGBUILD
index 3a52687c..85dd7e70 100644
--- a/qt5-base/mingw-w64-static/PKGBUILD
+++ b/qt5-base/mingw-w64-static/PKGBUILD
@@ -36,7 +36,7 @@ isNoOpenGL() {
 }
 
 pkgname=mingw-w64-qt5-base-static
-pkgver=5.12.2
+pkgver=5.12.3
 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=('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')
+sha256sums=('fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701'
+            '813332969dbfd7fcc8af3d23457eea0ce3b3a54ed9b9eae62b431529b8f60b22'
+            '96b9e2fb177de9c8cfe8c8cd601705981d4c223eef9fc582ec0f45d26c6b6d7f'
+            'b1aa13e0e6e28718edb11520660954101c662f6b6945a83cb4e84ff7de5c0922'
+            '2be87f841ac2104f44114ec65dbd35f8bf8280176b9341015b99aa7dd6756967'
+            'c61a62a241b0d03354b523dd9d4ae811e55b12e6e2683c45a3bfd67574e2ad8a'
+            '1050833662659481606f94a2f4a95f764e7d1ae8b9d015a497b508884cd755d0'
+            'eea4870ab1394e9473fe1cee2d856bb5d0d31b68ec91b20d45c882893049a9f6'
+            '11a4267ae9fa3d49046945ba7e0867b400364f0475c2d36814af45fbc4c3f2f0'
+            '2b977aba78484cb01208300d02a9ce945edfa0ac73ad91c9331cb73851c9b85d'
+            'd9e8736c57f5f8841238fe131508d29d9de0fa3d0c0554e1a443aab33147b430'
+            'f30bd604cf3da044f38da38d873a988870d0413aafa5f437d11286d2d3dbb42b'
+            '00b84c1b66212797876b1793b36e3537dc866770f632b4d98b91d84e6766c2d8'
+            '2fdf313e492061c7a34b63b25129c253088714a632616437c7ab473b43eca5be'
+            '6cde53dd184b5aa79e3c471392eaa6e2ac9dc72e8394dab7248cb8a0ac3e856f'
+            '64b37f777b45bc1b134ea5723ccc6c430784ebbf53b428addeb73ba1108c9225'
+            '7b4398060dd40fcf8f23b5ca908a0f79be7adfe7f15ad9ec77f23913b5c6c3fc'
+            'bfb28bde40b37d74585174414a647af051a8da251107513d3c5e160c72fa7af5'
+            '9809aab5b4fadf65c2704654ac2c171877b634d5b874af6c96574159ba9f2002'
+            '374b0ed5fe0285389dda11a6fbccabd3094d2aaa7489d3e59d9b31ead444ce27'
+            '0961354456c56fa6041758ee35f26d563e60f4ed3bcae214abec2ffbd89f3e80'
+            '78681b7f7a6456cda9ca4bef34bf4caf3dfbeb36e7fc8b12a834b5e4da328926'
+            'a95252d2305437fe5ada214162b9952efbc6f3e97399e55cb003d1c394f1770a'
+            'b7b16afef904785a9681b2c03c98a54e8edb224568c63d155bd3f0f1b0508054'
+            'd883c7c1148e2177c7ff23a3fdbdc3956b9b963c82661f227e2c57829358c7f4'
+            '0b90abe95bbe585ba2b39b98b7e3cdb85d6827a2afdb8ed677e6a83e33a31009'
+            'bcbe378ec13c845939cf69899bdeb50a7711eef1e5e5127cdc1c9b020f1edd20'
+            'eaa58ae6a0fa740fbd376a39b1c2fab9d77c3eae1456ecef47caef9cc4587638'
+            'd183ee330c718b440c72ebd90cea389bf13cc99e6a34bf15d4818d663b06ec50'
+            '673b15ce54ff120d17e7ddc20bcc8c9467bee16935b7ab1ec45946307c8caf56'
+            'c1d67dfed8e9b43fe0e4ab20c5f9c918c83ecc8ba8930e9cf123beb90d11318b'
+            '9df19c8cb6017640944211186ce9a6e21715411e896938de2a6d48368372f23e'
+            '043ad519351be44de7d93f775abce8da2880e4eb698ff9444558f4795dab26cc'
+            '4180fbc2315ddfc1a7763333c1dc507661bd30689c9162f1e58bf01a6fc9f9f2'
+            '0d981d8a25039ff57e5375f34ea036021890fe7302f5f710beb1e5ca1e019e48')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch b/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
index a705f71a..fc70d85e 100644
--- a/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
+++ b/qt5-base/mingw-w64/0001-Adjust-win32-g-profile-for-cross-compilation-with-mi.patch
@@ -1,4 +1,4 @@
-From 7b26289a1e7fafff7da844cdaac26b997febbc94 Mon Sep 17 00:00:00 2001
+From 9a22842c6ec7d34b1edba1a18411e73bf90a1567 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
@@ -143,7 +143,7 @@ index 4630ec4602..3f9fdc72b1 100644
  
  QMAKE_LINK              = $${CROSS_COMPILE}clang++
 diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
-index ed131c6823..b8e08df0be 100644
+index 5e9923357f..67805c29a7 100644
 --- a/mkspecs/win32-g++/qmake.conf
 +++ b/mkspecs/win32-g++/qmake.conf
 @@ -12,11 +12,11 @@ include(../common/g++-win32.conf)
diff --git a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
index c7649a9c..2ce49556 100644
--- a/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
+++ b/qt5-base/mingw-w64/0002-Ensure-GLdouble-is-defined-when-using-dynamic-OpenGL.patch
@@ -1,4 +1,4 @@
-From 71303c275da3c576a5386dc50d4916ce21a58b16 Mon Sep 17 00:00:00 2001
+From a1aebd2231ed102c84b992058c1de1a02817214e 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
diff --git a/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch b/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch
index 43cc3f94..d491f963 100644
--- a/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch
+++ b/qt5-base/mingw-w64/0003-Use-external-ANGLE-library.patch
@@ -1,4 +1,4 @@
-From 1e421ad10dfb855e5a8626124854fb6e9ab568ca Mon Sep 17 00:00:00 2001
+From c05b912a91f424375d6b44cb0cebdec7c44c967c 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
@@ -12,7 +12,7 @@ Subject: [PATCH 03/34] Use external ANGLE library
  5 files changed, 6 insertions(+), 12 deletions(-)
 
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 07869efd7d..2e32911a64 100644
+index 84dbbfebd4..46a8696ff3 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
 @@ -2,9 +2,9 @@
diff --git a/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch b/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
index 2d00f691..a8f88d01 100644
--- a/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
+++ b/qt5-base/mingw-w64/0004-Fix-too-many-sections-assemler-error-in-OpenGL-facto.patch
@@ -1,4 +1,4 @@
-From 200e74dca03f63bac8ef550403454e069c450239 Mon Sep 17 00:00:00 2001
+From c92307d539cd71249031bd42eac1d7d4a78fa939 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
diff --git a/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch b/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch
index 194b1fc0..f6e3ee03 100644
--- a/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch
+++ b/qt5-base/mingw-w64/0005-Make-sure-.pc-files-are-installed-correctly.patch
@@ -1,4 +1,4 @@
-From 77b28d91f16838274c5e6ac28cf10a0d8794c225 Mon Sep 17 00:00:00 2001
+From 70435bc3ad5e60f9330a833094635e73eb9bc6a8 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,7 +10,7 @@ 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 7762e47f41..bc466d35b3 100644
+index ab261d02f1..aa4c96be49 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
@@ -49,10 +49,10 @@ index 350ebd377a..d0c234b864 100644
      void writePkgConfigFile();   // for pkg-config
  
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 6046e5791e..87157f31ae 100644
+index 208af1327f..5a37b218de 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -751,7 +751,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -753,7 +753,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
                  }
                  if(!ret.isEmpty())
                      ret += "\n\t";
diff --git a/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
index 2f8e9c3b..46320085 100644
--- a/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/qt5-base/mingw-w64/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -1,4 +1,4 @@
-From 81db0b14c6a54d49f9150f20a30a3e188ec97052 Mon Sep 17 00:00:00 2001
+From 75f422a35a62d1693e5d84d6745590d8088f6344 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
diff --git a/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch b/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch
index ae6ecec7..962201fc 100644
--- a/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch
+++ b/qt5-base/mingw-w64/0007-Prevent-debug-library-names-in-pkg-config-files.patch
@@ -1,4 +1,4 @@
-From 5242deeb9bda4e9e692bb56a2cc681d4311cb0e5 Mon Sep 17 00:00:00 2001
+From 185e54d2c46014b51579261068b14f1483ba3aa1 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,7 +15,7 @@ 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 bc466d35b3..67d97f520a 100644
+index aa4c96be49..b005da931e 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3244,6 +3244,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
diff --git a/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch b/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch
index e61a9a3e..69f37f17 100644
--- a/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch
+++ b/qt5-base/mingw-w64/0008-Fix-linking-against-shared-static-libpng.patch
@@ -1,4 +1,4 @@
-From 658b08047664f3f83caa324dcbfd3281e2a375cc Mon Sep 17 00:00:00 2001
+From a21de39b50f538d9dce89bab8fc12cfb631d3f6b 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,7 +9,7 @@ Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 44140bc7b6..19fd92bce7 100644
+index 6fdcd562a7..7733db0206 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -387,8 +387,10 @@
diff --git a/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch b/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch
index 913bc60e..40086a48 100644
--- a/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch
+++ b/qt5-base/mingw-w64/0009-Fix-linking-against-static-D-Bus.patch
@@ -1,4 +1,4 @@
-From 1ca21f0dc5e507ad26f16232dd75cb351ded1d6a Mon Sep 17 00:00:00 2001
+From bef46a6c727a1370768b9d270bd76fc9b4ded4cd 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
diff --git a/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch b/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
index 7c5998b6..ff817a7a 100644
--- a/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
+++ b/qt5-base/mingw-w64/0010-Don-t-try-to-use-debug-version-of-D-Bus-library.patch
@@ -1,4 +1,4 @@
-From aef97271acabe3732d92e6c291f9b9f844bc1f29 Mon Sep 17 00:00:00 2001
+From 961a060a30e67a4a1062cd97fed2d08fbcfb804b 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
diff --git a/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch b/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch
index 0908b405..63c78f08 100644
--- a/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch
+++ b/qt5-base/mingw-w64/0011-Fix-linking-against-static-freetype2.patch
@@ -1,4 +1,4 @@
-From d318f8d851e848936b2e171d38ebda142f733455 Mon Sep 17 00:00:00 2001
+From bc6d72e7347436e3a1db35311eaf6c1240a65fc3 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,7 +8,7 @@ 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 19fd92bce7..822214a0aa 100644
+index 7733db0206..184c9368f2 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -238,8 +238,11 @@
diff --git a/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch b/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch
index c552550a..c492b0ba 100644
--- a/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch
+++ b/qt5-base/mingw-w64/0012-Fix-linking-against-static-harfbuzz.patch
@@ -1,4 +1,4 @@
-From 49fd90a7d66176f95ace73a34d7c2b3aca3206bd Mon Sep 17 00:00:00 2001
+From 95f8ae9b5c7600313f1c6f3f4a7c1f50afef3069 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,7 +8,7 @@ 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 822214a0aa..da4cab79a0 100644
+index 184c9368f2..db6d4d68c9 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
 @@ -306,7 +306,11 @@
diff --git a/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch b/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch
index 598b53c7..fb2652b7 100644
--- a/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch
+++ b/qt5-base/mingw-w64/0013-Fix-linking-against-static-pcre.patch
@@ -1,4 +1,4 @@
-From 1b56343203f3a75b0e1ae237da4f42f6b235940b Mon Sep 17 00:00:00 2001
+From 8f9fe88a5643aafe2aeb8cb44bbbac17d6d67808 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
diff --git a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch
index cdbca05c..5ec2a7e1 100644
--- a/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch
+++ b/qt5-base/mingw-w64/0014-Fix-linking-against-shared-static-MariaDB.patch
@@ -1,4 +1,4 @@
-From 697338ba4c3626e99aa3a501c0942a411ce55a5f Mon Sep 17 00:00:00 2001
+From b35664794a3658470c900c4a7c1b8dbf436359ca 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
diff --git a/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch b/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch
index 1ef4aa2c..f6ff1d42 100644
--- a/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch
+++ b/qt5-base/mingw-w64/0015-Fix-linking-against-shared-static-PostgreSQL.patch
@@ -1,4 +1,4 @@
-From bc71e0b2ee8e5ce96091e0fc65f2fdc986438376 Mon Sep 17 00:00:00 2001
+From 12167c0f3c19d677ca681d58765c3c49f13ba9e2 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
diff --git a/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch b/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch
index c97528bf..80d4054c 100644
--- a/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch
+++ b/qt5-base/mingw-w64/0016-Rename-qtmain-to-qt5main.patch
@@ -1,4 +1,4 @@
-From 53eb02bb30a316f3562e5886cd3fae8ad02af7a0 Mon Sep 17 00:00:00 2001
+From ff46ecb2fdcfc203d55e9fcef8b29c62742c61ae 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
@@ -25,10 +25,10 @@ index 07e2b6a88e..5bfbcfdca6 100644
  QMAKE_IDL               = $${CROSS_COMPILE}widl
  QMAKE_LIB               = $${CROSS_COMPILE}ar -rc
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 2ed708e085..e67917cc96 100644
+index 6bf1380716..74a9160628 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -227,8 +227,8 @@ mac {
+@@ -229,8 +229,8 @@ mac {
      CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll
  
      mingw {
diff --git a/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch b/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch
index 72e387e7..8679cdfa 100644
--- a/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch
+++ b/qt5-base/mingw-w64/0017-Build-dynamic-host-libraries.patch
@@ -1,4 +1,4 @@
-From 1289a32f82d05281db146165a94fc4d06d432972 Mon Sep 17 00:00:00 2001
+From 9ae3b38009637d7455dc7c30295beb9de8f137fc 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
diff --git a/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch b/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch
index 67323501..e9bd6717 100644
--- a/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0018-Enable-rpath-for-build-tools.patch
@@ -1,4 +1,4 @@
-From 8f12c750711b71fded02ad3e6bee6e88f93f4bae Mon Sep 17 00:00:00 2001
+From 1937d98580d1988eb1422ec431bb7bf214ccb964 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
diff --git a/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch b/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch
index 075f79e0..25d5a0df 100644
--- a/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch
+++ b/qt5-base/mingw-w64/0019-Use-system-zlib-for-build-tools.patch
@@ -1,4 +1,4 @@
-From 6e6bc8bbffff9972c86d660d3fdd99029e6c7c8a Mon Sep 17 00:00:00 2001
+From 1249cece89416ca3aae9f8edef37738d6405b846 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
diff --git a/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch b/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch
index 3fe7ac92..01cfa8e1 100644
--- a/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/qt5-base/mingw-w64/0020-Use-.dll.a-as-import-lib-extension.patch
@@ -1,4 +1,4 @@
-From cf9f7a67dedc858d1f8b1e16747a31747787cb4e Mon Sep 17 00:00:00 2001
+From 83340c970109edc6400a8f74f1728affec4024c5 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
@@ -11,10 +11,10 @@ mingw-w64 specific mkspec
  2 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index e67917cc96..2a94964b49 100644
+index 74a9160628..7694d1c7ae 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
-@@ -238,8 +238,9 @@ mac {
+@@ -240,8 +240,9 @@ mac {
              CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
              CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
          } else {
@@ -27,7 +27,7 @@ index e67917cc96..2a94964b49 100644
      } else {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 87157f31ae..4592fed7b2 100644
+index 5a37b218de..29bf9441f7 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
@@ -45,9 +45,9 @@ index 87157f31ae..4592fed7b2 100644
 +      impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
 +    }
      QList<QMakeLocalFileName> dirs;
+     int libidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-         dirs.append(QMakeLocalFileName(dlib.toQString()));
-@@ -255,9 +259,12 @@ void Win32MakefileGenerator::fixTargetExt()
+@@ -257,9 +261,12 @@ void Win32MakefileGenerator::fixTargetExt()
      if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
          project->values("TARGET_EXT").append(".exe");
      } else if (project->isActiveConfig("shared")) {
diff --git a/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch b/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch
index 82176cd2..dbec06bb 100644
--- a/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch
+++ b/qt5-base/mingw-w64/0021-Merge-shared-and-static-library-trees.patch
@@ -1,4 +1,4 @@
-From 0e8a2cab1c1a9257ad85cfa3869433c9b454f860 Mon Sep 17 00:00:00 2001
+From 814b3a23dd94818101265df95b1051987faf440d 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 629ca78ff1..b4822af13f 100644
+index 131aa868c2..75203c4572 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -1315,3 +1315,12 @@ defineTest(createConfigStatus) {
+@@ -1318,3 +1318,12 @@ defineTest(createConfigStatus) {
  
  QMAKE_POST_CONFIGURE += \
      "createConfigStatus()"
@@ -101,7 +101,7 @@ index 51ea3a8321..275e080ae4 100644
  QMAKE_EXT_YACC          = .y
  
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 67d97f520a..a802c645c7 100644
+index b005da931e..e0c42131f8 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -3247,6 +3247,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
diff --git a/qt5-base/mingw-w64/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch b/qt5-base/mingw-w64/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
index fc9e517e..4ab26a2a 100644
--- a/qt5-base/mingw-w64/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
+++ b/qt5-base/mingw-w64/0022-Pull-dependencies-of-static-libraries-in-CMake-modul.patch
@@ -1,4 +1,4 @@
-From b2d749f5e3b7b6d35345dff54c7eb76d2e1a3a44 Mon Sep 17 00:00:00 2001
+From 71f297d50afe7143f6754a5ea95013cddf25c3ea 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,16 +7,16 @@ 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        | 207 +++++++++++++++---
+ .../data/cmake/Qt5BasicConfig.cmake.in        | 208 +++++++++++++++---
  .../data/cmake/Qt5PluginTarget.cmake.in       |  11 +-
  qmake/generators/makefile.cpp                 |  16 +-
- 3 files changed, 192 insertions(+), 42 deletions(-)
+ 3 files changed, 193 insertions(+), 42 deletions(-)
 
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 3ed6dd5889..9325bb3190 100644
+index 3ed6dd5889..9073046205 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-@@ -48,36 +48,110 @@ but not all the files it references.
+@@ -48,36 +48,111 @@ but not all the files it references.
      endif()
  endmacro()
  
@@ -66,9 +66,10 @@ index 3ed6dd5889..9325bb3190 100644
 +            math(EXPR DEPENDENCY_INDEX \"${DEPENDENCY_INDEX} + 1\")
 +        endforeach()
 +
-+        if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\")
++        if (\"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\" OR \"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"RELEASE\")
 +            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES ${DEPENDENCY_TARGETS})
-+        else()
++        endif()
++        if (NOT \"${IMPORTED_TARGET_CONFIG}\" STREQUAL \"ALL\")
 +            set_property(TARGET ${IMPORTED_TARGET_NAME} PROPERTY INTERFACE_LINK_LIBRARIES_${IMPORTED_TARGET_CONFIG} ${DEPENDENCY_TARGETS})
 +        endif()
 +
@@ -135,7 +136,7 @@ index 3ed6dd5889..9325bb3190 100644
          )
      endif()
  !!ENDIF
-@@ -217,13 +291,45 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -217,13 +292,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")
@@ -161,12 +162,12 @@ index 3ed6dd5889..9325bb3190 100644
 +
 +!!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
 +
@@ -182,7 +183,7 @@ index 3ed6dd5889..9325bb3190 100644
  !!IF !equals(TEMPLATE, aux)
  !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
      set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-@@ -238,6 +344,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -238,6 +345,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, ";"))
  
@@ -239,7 +240,7 @@ index 3ed6dd5889..9325bb3190 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})
-@@ -256,9 +412,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -256,9 +413,13 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
                  list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
              endif()
          endforeach()
@@ -253,7 +254,7 @@ index 3ed6dd5889..9325bb3190 100644
      endif()
  
  !!IF !equals(TEMPLATE, aux)
-@@ -328,9 +488,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -328,9 +489,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
@@ -267,7 +268,7 @@ index 3ed6dd5889..9325bb3190 100644
  !!ENDIF // CMAKE_RELEASE_TYPE
  !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
  
-@@ -341,29 +503,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -341,29 +504,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      )
  !!ENDIF // TEMPLATE != aux
  
@@ -321,7 +322,7 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index a802c645c7..30756d9b64 100644
+index e0c42131f8..94dfed92b3 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
 @@ -1019,10 +1019,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
diff --git a/qt5-base/mingw-w64/0023-Allow-usage-of-static-version-with-CMake.patch b/qt5-base/mingw-w64/0023-Allow-usage-of-static-version-with-CMake.patch
index bc5a767d..4a4eb42b 100644
--- a/qt5-base/mingw-w64/0023-Allow-usage-of-static-version-with-CMake.patch
+++ b/qt5-base/mingw-w64/0023-Allow-usage-of-static-version-with-CMake.patch
@@ -1,4 +1,4 @@
-From af97d60e4f62cffec74c0c4905b79b49aab598af Mon Sep 17 00:00:00 2001
+From d9e7255dcfbf1d5775712902d9ce513d3e235128 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
@@ -22,7 +22,7 @@ installed in the same prefix
  create mode 100644 mkspecs/features/data/cmake/Qt5StaticOnlyRedirection.cmake.in
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 2a94964b49..839a51f377 100644
+index 7694d1c7ae..38887a6ccf 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -42,7 +42,7 @@ split_incpath {
@@ -83,7 +83,7 @@ index 2a94964b49..839a51f377 100644
      INSTALLS += cmake_qt5_plugin_file
  
      return()
-@@ -182,27 +186,36 @@ mod_deps =
+@@ -182,29 +186,38 @@ mod_deps =
  lib_deps =
  aux_mod_deps =
  aux_lib_deps =
@@ -117,14 +117,16 @@ index 2a94964b49..839a51f377 100644
 +CMAKE_INTERFACE_COMPILE_DEFINITIONS_STATIC = $$join(aux_compile_defs_static, ";")
 +
  
- CMAKE_QT_STEM = Qt$$QT_MAJOR_VERSION$${CMAKE_MODULE_NAME}$${QT_LIBINFIX}
+ # TARGET here is the one changed at the end of qt_module.prf,
+ # which already contains the Qt5 prefix and QT_LIBINFIX suffix
+ CMAKE_QT_STEM = $${TARGET}
  
  mac {
 +    # this branch is broken by the patch, only apply when building for Windows
      !isEmpty(CMAKE_STATIC_TYPE) {
          CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}_debug.a
          CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -230,35 +243,33 @@ mac {
+@@ -232,35 +245,33 @@ mac {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}.a
          CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
  
@@ -179,7 +181,7 @@ index 2a94964b49..839a51f377 100644
      !isEmpty(CMAKE_STATIC_TYPE) {
          CMAKE_LIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}.a
          CMAKE_LIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
-@@ -278,12 +289,12 @@ mac {
+@@ -280,12 +291,12 @@ mac {
  INSTALLS += cmake_qt5_module_files
  
  cmake_config_file.input = $$PWD/data/cmake/Qt5BasicConfig.cmake.in
@@ -194,7 +196,7 @@ index 2a94964b49..839a51f377 100644
  
  !build_pass:QMAKE_SUBSTITUTES += \
      cmake_config_file \
-@@ -293,11 +304,29 @@ cmake_qt5_module_files.files = \
+@@ -295,11 +306,29 @@ cmake_qt5_module_files.files = \
      $$cmake_config_file.output \
      $$cmake_config_version_file.output
  
@@ -225,7 +227,7 @@ index 2a94964b49..839a51f377 100644
  
      !build_pass:QMAKE_SUBSTITUTES += cmake_extras_file
  
-@@ -309,7 +338,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
+@@ -311,7 +340,7 @@ cmake_macros_file.input = $$_PRO_FILE_PWD_/Qt5$${CMAKE_MODULE_NAME}Macros.cmake
  exists($$cmake_macros_file.input) {
      CMAKE_MODULE_MACROS = "true"
  
@@ -234,7 +236,7 @@ index 2a94964b49..839a51f377 100644
      cmake_macros_file.CONFIG = verbatim
  
      !build_pass:QMAKE_SUBSTITUTES += cmake_macros_file
-@@ -317,7 +346,7 @@ exists($$cmake_macros_file.input) {
+@@ -319,7 +348,7 @@ exists($$cmake_macros_file.input) {
      cmake_qt5_module_files.files += $$cmake_macros_file.output
  }
  
@@ -244,7 +246,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 9325bb3190..7ee0c86130 100644
+index 9073046205..9b6cc352b5 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,7 +309,7 @@ index 9325bb3190..7ee0c86130 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.
-@@ -105,33 +136,68 @@ if(NOT COMMAND _qt5_add_dependencies)
+@@ -106,33 +137,68 @@ if(NOT COMMAND _qt5_add_dependencies)
          set(CMAKE_FIND_LIBRARY_PREFIXES \"${DEFAULT_CMAKE_FIND_LIBRARY_PREFIXES}\")
      endmacro()
  endif()
@@ -381,7 +383,7 @@ index 9325bb3190..7ee0c86130 100644
          \"INTERFACE_LINK_LIBRARIES_${TARGET_CONFIG}\" \"${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES}\"
          \"IMPORTED_LOCATION_${TARGET_CONFIG}\" ${imported_location}
  !!IF !isEmpty(CMAKE_LIB_SONAME)
-@@ -148,9 +214,13 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
+@@ -149,9 +215,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
@@ -396,7 +398,7 @@ index 9325bb3190..7ee0c86130 100644
          \"IMPORTED_IMPLIB_${TARGET_CONFIG}\" ${imported_implib}
          )
      endif()
-@@ -158,8 +228,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
+@@ -159,8 +229,9 @@ macro(_populate_$${CMAKE_MODULE_NAME}_target_properties TARGET_CONFIG LIB_LOCATI
  endmacro()
  !!ENDIF
  
@@ -407,7 +409,7 @@ index 9325bb3190..7ee0c86130 100644
  !!IF !no_module_headers
  !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
      set(_Qt5$${CMAKE_MODULE_NAME}_OWN_INCLUDE_DIRS
-@@ -167,46 +238,50 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -168,46 +239,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)
@@ -475,7 +477,7 @@ index 9325bb3190..7ee0c86130 100644
      endforeach()
  
  !!IF isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
-@@ -215,16 +290,20 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -216,16 +291,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})
@@ -499,7 +501,7 @@ index 9325bb3190..7ee0c86130 100644
  !!ENDIF // TEMPLATE != aux
      set(_Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_MODULE_DEPS}\")
  
-@@ -232,10 +311,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -233,10 +312,10 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      list(APPEND _Qt5$${CMAKE_MODULE_NAME}_MODULE_DEPENDENCIES \"$${CMAKE_INTERFACE_MODULE_DEPS}\")
  !!ENDIF
  
@@ -512,7 +514,7 @@ index 9325bb3190..7ee0c86130 100644
          set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED REQUIRED)
      endif()
      set(_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_QUIET)
-@@ -243,17 +322,17 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -244,17 +323,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)
@@ -534,7 +536,7 @@ index 9325bb3190..7ee0c86130 100644
                  $$VERSION ${_Qt5$${CMAKE_MODULE_NAME}_FIND_VERSION_EXACT}
                  ${_Qt5$${CMAKE_MODULE_NAME}_DEPENDENCIES_FIND_QUIET}
                  ${_Qt5$${CMAKE_MODULE_NAME}_FIND_DEPENDENCIES_REQUIRED}
-@@ -261,36 +340,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -262,36 +341,41 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
              )
          endif()
  
@@ -590,7 +592,7 @@ index 9325bb3190..7ee0c86130 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\")
-@@ -312,37 +396,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -313,37 +397,48 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      endmacro()
  
  !!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
@@ -651,7 +653,7 @@ index 9325bb3190..7ee0c86130 100644
  
      # Find plugin targets
      file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
-@@ -356,7 +451,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -357,7 +452,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
          endforeach()
      endif()
  
@@ -663,7 +665,7 @@ index 9325bb3190..7ee0c86130 100644
          set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
  
  !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-@@ -364,7 +463,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -365,7 +464,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
  !!ENDIF
@@ -675,7 +677,7 @@ index 9325bb3190..7ee0c86130 100644
          set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
              \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
          )
-@@ -395,16 +498,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -396,16 +499,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
      endif()
  
      set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
@@ -696,7 +698,7 @@ index 9325bb3190..7ee0c86130 100644
          )
          set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
          foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -413,69 +516,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -414,69 +517,72 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
              endif()
          endforeach()
  !!IF !isEmpty(CMAKE_STATIC_TYPE)
@@ -792,7 +794,7 @@ index 9325bb3190..7ee0c86130 100644
      if (EXISTS
  !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
          \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -488,7 +594,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -489,7 +595,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  !!ELSE
          \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
  !!ENDIF
@@ -801,7 +803,7 @@ index 9325bb3190..7ee0c86130 100644
      endif()
  !!ENDIF // CMAKE_STATIC_TYPE
  
-@@ -498,19 +604,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -499,19 +605,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
  
  !!ENDIF // CMAKE_DEBUG_TYPE
  !!ELSE // TEMPLATE != aux
@@ -960,7 +962,7 @@ index e0652fdcf9..f0add757bb 100644
                      $<$<AND:${_isExe},${_isWin32},${_isNotExcluded},${_isPolicyNEW}>:Qt5::WinMain>
              )
 diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
-index 2e32911a64..6b02a12944 100644
+index 46a8696ff3..2783f7f9e9 100644
 --- a/src/gui/Qt5GuiConfigExtras.cmake.in
 +++ b/src/gui/Qt5GuiConfigExtras.cmake.in
 @@ -1,4 +1,6 @@
@@ -979,7 +981,7 @@ index 2e32911a64..6b02a12944 100644
  
  unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE)
  
-@@ -170,9 +172,9 @@ _qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\"
+@@ -183,9 +185,9 @@ _qt5gui_find_extra_libs(OPENGL \"$$CMAKE_OPENGL_LIBS\" \"$$CMAKE_OPENGL_LIBDIR\"
  
  set(Qt5Gui_OPENGL_IMPLEMENTATION $$CMAKE_QT_OPENGL_IMPLEMENTATION)
  
diff --git a/qt5-base/mingw-w64/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch b/qt5-base/mingw-w64/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
index 802c6e2c..b626f51c 100644
--- a/qt5-base/mingw-w64/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
+++ b/qt5-base/mingw-w64/0024-Adjust-linker-flags-for-static-build-with-cmake-ming.patch
@@ -1,4 +1,4 @@
-From 25143b06d43a9a4cceb6d038f4f97d5f2af53c8e Mon Sep 17 00:00:00 2001
+From 96e14e82726f32e222c506c41b3917897ec8482c 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
diff --git a/qt5-base/mingw-w64/0025-Use-correct-pkg-config-static-flag.patch b/qt5-base/mingw-w64/0025-Use-correct-pkg-config-static-flag.patch
index f7b5d243..c155450e 100644
--- a/qt5-base/mingw-w64/0025-Use-correct-pkg-config-static-flag.patch
+++ b/qt5-base/mingw-w64/0025-Use-correct-pkg-config-static-flag.patch
@@ -1,4 +1,4 @@
-From 348b46baa42d1001d2a650a0fe44a2254068bb8e Mon Sep 17 00:00:00 2001
+From 1bcc8c23d8acce7855ebba3ad97d088f19831414 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 b4822af13f..addb27b6d7 100644
+index 75203c4572..377788d653 100644
 --- a/configure.pri
 +++ b/configure.pri
 @@ -328,6 +328,9 @@ defineTest(qtConfTest_detectPkgConfig) {
diff --git a/qt5-base/mingw-w64/0026-Fix-macro-invoking-moc-rcc-and-uic.patch b/qt5-base/mingw-w64/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
index 2050d214..216c33d3 100644
--- a/qt5-base/mingw-w64/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
+++ b/qt5-base/mingw-w64/0026-Fix-macro-invoking-moc-rcc-and-uic.patch
@@ -1,4 +1,4 @@
-From 7fc63fcd9c5e8a2c864c7de9fa14338ce3e82969 Mon Sep 17 00:00:00 2001
+From 52682db5b750289cdd3dc68682861da8507db2b3 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
diff --git a/qt5-base/mingw-w64/0027-Ignore-errors-about-missing-feature-static.patch b/qt5-base/mingw-w64/0027-Ignore-errors-about-missing-feature-static.patch
index 1dfa7de0..24028c87 100644
--- a/qt5-base/mingw-w64/0027-Ignore-errors-about-missing-feature-static.patch
+++ b/qt5-base/mingw-w64/0027-Ignore-errors-about-missing-feature-static.patch
@@ -1,4 +1,4 @@
-From 93aba1e6a5106bc91b34fada1d5343ff25b9ce43 Mon Sep 17 00:00:00 2001
+From 0dd39f4bc9414441e8cdfe2cff1636102d15ee53 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
diff --git a/qt5-base/mingw-w64/0028-Enable-and-fix-use-of-iconv.patch b/qt5-base/mingw-w64/0028-Enable-and-fix-use-of-iconv.patch
index 4a1c752f..fba4a80e 100644
--- a/qt5-base/mingw-w64/0028-Enable-and-fix-use-of-iconv.patch
+++ b/qt5-base/mingw-w64/0028-Enable-and-fix-use-of-iconv.patch
@@ -1,4 +1,4 @@
-From 512be5eb5add4a5f2146ca0a0b3a8b7a434c600a Mon Sep 17 00:00:00 2001
+From 837aab47427a3c3a2d44b321d2d64d4220293e07 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
@@ -49,7 +49,7 @@ index 9c39727946..cc14036b25 100644
  #else
      char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index a22a7459bd..b7ed2f7281 100644
+index 5f5a00a64f..d779c3c4ff 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
 @@ -71,7 +71,7 @@
@@ -61,7 +61,7 @@ index a22a7459bd..b7ed2f7281 100644
                      "char *outp;",
                      "size_t inbytes, outbytes;",
                      "iconv(x, &inp, &inbytes, &outp, &outbytes);",
-@@ -615,9 +615,9 @@
+@@ -631,9 +631,9 @@
          },
          "gnu-libiconv": {
              "label": "GNU iconv",
diff --git a/qt5-base/mingw-w64/0029-Ignore-failing-pkg-config-test.patch b/qt5-base/mingw-w64/0029-Ignore-failing-pkg-config-test.patch
index 4ff09302..9c49adfb 100644
--- a/qt5-base/mingw-w64/0029-Ignore-failing-pkg-config-test.patch
+++ b/qt5-base/mingw-w64/0029-Ignore-failing-pkg-config-test.patch
@@ -1,4 +1,4 @@
-From 41e9bbfc0c70d1a94f7c90aef50493e3341389b7 Mon Sep 17 00:00:00 2001
+From 48f35ff2e010746ee29e5e38f67e11680c420fa0 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
diff --git a/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch b/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
index 1bf91a24..7d3b41d2 100644
--- a/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
+++ b/qt5-base/mingw-w64/0030-Prevent-qmake-from-messing-static-lib-dependencies.patch
@@ -1,4 +1,4 @@
-From f41ba61108dd735410e4feac87fa23b321d0a20f Mon Sep 17 00:00:00 2001
+From 70d1ba494a9d2498ca79dab847cb8d4b6598bdc1 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
@@ -25,7 +25,7 @@ index 7f42fbe09e..e27428c0f2 100644
      int libidx = 0, fwidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 4592fed7b2..b93d0df473 100644
+index 29bf9441f7..cc4c031ce7 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -87,6 +87,9 @@ Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
@@ -36,8 +36,8 @@ index 4592fed7b2..b93d0df473 100644
 +        return false; // prevent qmake from messing static lib dependencies
 +    }
      QList<QMakeLocalFileName> dirs;
+     int libidx = 0;
      for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
-         dirs.append(QMakeLocalFileName(dlib.toQString()));
 -- 
 2.21.0
 
diff --git a/qt5-base/mingw-w64/0031-Hardcode-linker-flags-for-platform-plugins.patch b/qt5-base/mingw-w64/0031-Hardcode-linker-flags-for-platform-plugins.patch
index 35a1cd46..3fd01678 100644
--- a/qt5-base/mingw-w64/0031-Hardcode-linker-flags-for-platform-plugins.patch
+++ b/qt5-base/mingw-w64/0031-Hardcode-linker-flags-for-platform-plugins.patch
@@ -1,4 +1,4 @@
-From 2c28928b34fc030330b00f16fcb546a477c48621 Mon Sep 17 00:00:00 2001
+From c64b26908cc7cdeb19bb41fab98f328174ccfea0 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
diff --git a/qt5-base/mingw-w64/0032-Fix-linking-against-static-plugins-with-qmake.patch b/qt5-base/mingw-w64/0032-Fix-linking-against-static-plugins-with-qmake.patch
index 7f7d9551..f01fa5d6 100644
--- a/qt5-base/mingw-w64/0032-Fix-linking-against-static-plugins-with-qmake.patch
+++ b/qt5-base/mingw-w64/0032-Fix-linking-against-static-plugins-with-qmake.patch
@@ -1,4 +1,4 @@
-From 00034061c0b8ad7c875ef00a687d95c2100f15f3 Mon Sep 17 00:00:00 2001
+From 05a8d15d8f9e5b0bc6489ef29bdc94e4a047df13 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
diff --git a/qt5-base/mingw-w64/0033-Disable-hardware-randomizer-for-32-bit.patch b/qt5-base/mingw-w64/0033-Disable-hardware-randomizer-for-32-bit.patch
index 502a8a95..011ecfa6 100644
--- a/qt5-base/mingw-w64/0033-Disable-hardware-randomizer-for-32-bit.patch
+++ b/qt5-base/mingw-w64/0033-Disable-hardware-randomizer-for-32-bit.patch
@@ -1,4 +1,4 @@
-From f3ec9ba64cd4a80639959abbef537ce718dc70d6 Mon Sep 17 00:00:00 2001
+From 2fb77d4fad4edc257562f29347e1279c001b3f89 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
@@ -19,7 +19,7 @@ during RTL pass: ira
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp
-index 6195c324e7..480af00ebc 100644
+index 90df8653a7..50725dc5cb 100644
 --- a/src/corelib/global/qrandom.cpp
 +++ b/src/corelib/global/qrandom.cpp
 @@ -90,7 +90,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando
diff --git a/qt5-base/mingw-w64/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch b/qt5-base/mingw-w64/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch
index 4f5f7b1a..692db419 100644
--- a/qt5-base/mingw-w64/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch
+++ b/qt5-base/mingw-w64/0034-Prevent-static-build-to-prefer-dynamic-libraries.patch
@@ -1,4 +1,4 @@
-From ee1d9dbd64b6123280c47b8633daf3d407f12ae6 Mon Sep 17 00:00:00 2001
+From 7ca7ebb16733d10658c7135c5948cf21eafac8fe 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 7ca65c92b3..48fa54a166 100644
+index 62ad972796..866ffdb6ad 100644
 --- a/mkspecs/features/qt_configure.prf
 +++ b/mkspecs/features/qt_configure.prf
-@@ -553,12 +553,12 @@ defineTest(qtConfResolveLibs) {
+@@ -561,12 +561,12 @@ defineTest(qtConfResolveLibs) {
                  # Under Windows, we look only for static libraries, as even for DLLs
                  # one actually links against a static import library.
                  mingw {
diff --git a/qt5-base/mingw-w64/PKGBUILD b/qt5-base/mingw-w64/PKGBUILD
index 64e28842..663b51fb 100644
--- a/qt5-base/mingw-w64/PKGBUILD
+++ b/qt5-base/mingw-w64/PKGBUILD
@@ -36,7 +36,7 @@ isNoOpenGL() {
 }
 
 pkgname=mingw-w64-qt5-base
-pkgver=5.12.2
+pkgver=5.12.3
 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=('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')
+sha256sums=('fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701'
+            '813332969dbfd7fcc8af3d23457eea0ce3b3a54ed9b9eae62b431529b8f60b22'
+            '96b9e2fb177de9c8cfe8c8cd601705981d4c223eef9fc582ec0f45d26c6b6d7f'
+            'b1aa13e0e6e28718edb11520660954101c662f6b6945a83cb4e84ff7de5c0922'
+            '2be87f841ac2104f44114ec65dbd35f8bf8280176b9341015b99aa7dd6756967'
+            'c61a62a241b0d03354b523dd9d4ae811e55b12e6e2683c45a3bfd67574e2ad8a'
+            '1050833662659481606f94a2f4a95f764e7d1ae8b9d015a497b508884cd755d0'
+            'eea4870ab1394e9473fe1cee2d856bb5d0d31b68ec91b20d45c882893049a9f6'
+            '11a4267ae9fa3d49046945ba7e0867b400364f0475c2d36814af45fbc4c3f2f0'
+            '2b977aba78484cb01208300d02a9ce945edfa0ac73ad91c9331cb73851c9b85d'
+            'd9e8736c57f5f8841238fe131508d29d9de0fa3d0c0554e1a443aab33147b430'
+            'f30bd604cf3da044f38da38d873a988870d0413aafa5f437d11286d2d3dbb42b'
+            '00b84c1b66212797876b1793b36e3537dc866770f632b4d98b91d84e6766c2d8'
+            '2fdf313e492061c7a34b63b25129c253088714a632616437c7ab473b43eca5be'
+            '6cde53dd184b5aa79e3c471392eaa6e2ac9dc72e8394dab7248cb8a0ac3e856f'
+            '64b37f777b45bc1b134ea5723ccc6c430784ebbf53b428addeb73ba1108c9225'
+            '7b4398060dd40fcf8f23b5ca908a0f79be7adfe7f15ad9ec77f23913b5c6c3fc'
+            'bfb28bde40b37d74585174414a647af051a8da251107513d3c5e160c72fa7af5'
+            '9809aab5b4fadf65c2704654ac2c171877b634d5b874af6c96574159ba9f2002'
+            '374b0ed5fe0285389dda11a6fbccabd3094d2aaa7489d3e59d9b31ead444ce27'
+            '0961354456c56fa6041758ee35f26d563e60f4ed3bcae214abec2ffbd89f3e80'
+            '78681b7f7a6456cda9ca4bef34bf4caf3dfbeb36e7fc8b12a834b5e4da328926'
+            'a95252d2305437fe5ada214162b9952efbc6f3e97399e55cb003d1c394f1770a'
+            'b7b16afef904785a9681b2c03c98a54e8edb224568c63d155bd3f0f1b0508054'
+            'd883c7c1148e2177c7ff23a3fdbdc3956b9b963c82661f227e2c57829358c7f4'
+            '0b90abe95bbe585ba2b39b98b7e3cdb85d6827a2afdb8ed677e6a83e33a31009'
+            'bcbe378ec13c845939cf69899bdeb50a7711eef1e5e5127cdc1c9b020f1edd20'
+            'eaa58ae6a0fa740fbd376a39b1c2fab9d77c3eae1456ecef47caef9cc4587638'
+            'd183ee330c718b440c72ebd90cea389bf13cc99e6a34bf15d4818d663b06ec50'
+            '673b15ce54ff120d17e7ddc20bcc8c9467bee16935b7ab1ec45946307c8caf56'
+            'c1d67dfed8e9b43fe0e4ab20c5f9c918c83ecc8ba8930e9cf123beb90d11318b'
+            '9df19c8cb6017640944211186ce9a6e21715411e896938de2a6d48368372f23e'
+            '043ad519351be44de7d93f775abce8da2880e4eb698ff9444558f4795dab26cc'
+            '4180fbc2315ddfc1a7763333c1dc507661bd30689c9162f1e58bf01a6fc9f9f2'
+            '0d981d8a25039ff57e5375f34ea036021890fe7302f5f710beb1e5ca1e019e48')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qt5-canvas3d/mingw-w64/PKGBUILD b/qt5-canvas3d/mingw-w64/PKGBUILD
index 7e98698a..c8b0583c 100644
--- a/qt5-canvas3d/mingw-w64/PKGBUILD
+++ b/qt5-canvas3d/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtcanvas3d
 pkgname="mingw-w64-qt5-canvas3d"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="A JavaScript 3D rendering API for Qt Quick (mingw-w64)"
@@ -20,7 +20,7 @@ license=('GPL3' 'LGPL' '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=('5e74b083294956505945621f6f56a3d7a314502277a109d6fb6b25c74dea2dca')
+sha256sums=('c0821f1232c6bcd00648af9a5d1eade8e0397c6bfff60621e0fcdfc75561baea')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-charts/mingw-w64/PKGBUILD b/qt5-charts/mingw-w64/PKGBUILD
index e3d3776c..4b3aa4f0 100644
--- a/qt5-charts/mingw-w64/PKGBUILD
+++ b/qt5-charts/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtcharts
 pkgname="mingw-w64-qt5-charts"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Provides a set of easy to use chart components (mingw-w64)"
@@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' '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=('11d88d3e0ec86730219f7c2efa17f696ec8766415c488b208bfcb8f3c3a68a31')
+sha256sums=('820c94b2bf5d73e921fe99be1e3a03a6f012d96574a08e504d68db237522b3a9')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-connectivity/mingw-w64/PKGBUILD b/qt5-connectivity/mingw-w64/PKGBUILD
index b1f74298..d2fcd35b 100644
--- a/qt5-connectivity/mingw-w64/PKGBUILD
+++ b/qt5-connectivity/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtconnectivity
 pkgname="mingw-w64-qt5-connectivity"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to Bluetooth hardware (mingw-w64)"
@@ -20,7 +20,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=('15eb21a1c102408e43c7204a82ad144e97ebe05dc4a15edb0900cd49762a226e')
+sha256sums=('01518cee71a8d53b9c2387f8c7facbcc2c4d63ab3b79462edfa06ba3bfeae661')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-datavis3d/mingw-w64/PKGBUILD b/qt5-datavis3d/mingw-w64/PKGBUILD
index bfb0cd13..459e4555 100644
--- a/qt5-datavis3d/mingw-w64/PKGBUILD
+++ b/qt5-datavis3d/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtdatavis3d
 pkgname="mingw-w64-qt5-datavis3d"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Qt Data Visualization module (mingw-w64)"
@@ -21,7 +21,7 @@ groups=('mingw-w64-qt5')
 url='https://www.qt.io/'
 _pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('4758a8126335e90f194c2a3aadd4db5eb2e3926e34faf908695945aa4f0d4690')
+sha256sums=('f6d073c4575542f8ff6de3ac3b6e8dde6ae2d87e98119de7a13bc984aa967313')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-declarative/apple-darwin/PKGBUILD b/qt5-declarative/apple-darwin/PKGBUILD
index 1e68d01d..291042e9 100644
--- a/qt5-declarative/apple-darwin/PKGBUILD
+++ b/qt5-declarative/apple-darwin/PKGBUILD
@@ -5,7 +5,7 @@
 
 _qt_module=qtdeclarative
 pkgname='apple-darwin-qt5-declarative'
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Classes for QML and JavaScript languages (apple-darwin)"
diff --git a/qt5-declarative/mingw-w64/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch b/qt5-declarative/mingw-w64/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch
index 8543f32d..e591c85c 100644
--- a/qt5-declarative/mingw-w64/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch
+++ b/qt5-declarative/mingw-w64/0001-Ensure-QML-dev-tools-is-built-as-static-library.patch
@@ -1,4 +1,4 @@
-From edcc561d4bc083ed0e084d94cc764d90fabe5e05 Mon Sep 17 00:00:00 2001
+From 5a03cad74e06b233dd926b22da4ca2ed7f3e40b3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:24:15 +0200
 Subject: [PATCH 1/3] Ensure QML dev tools is built as static library
diff --git a/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch b/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch
index fee12d79..f8950703 100644
--- a/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch
+++ b/qt5-declarative/mingw-w64/0002-Ensure-static-plugins-are-exported.patch
@@ -1,4 +1,4 @@
-From 25d470f26ed0dd8390d7554f0a52a0bbd7a62efa Mon Sep 17 00:00:00 2001
+From a41cc5047fadb1a20779ca2094f8f9c51246f237 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 23 Oct 2016 01:18:13 +0200
 Subject: [PATCH 2/3] Ensure static plugins are exported
diff --git a/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch b/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
index c3250b54..3a00a8a8 100644
--- a/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
+++ b/qt5-declarative/mingw-w64/0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch
@@ -1,4 +1,4 @@
-From 41520be651458402ce2c13c76a866d88aed1c680 Mon Sep 17 00:00:00 2001
+From a0055bc42f7b847d393732c4fb22618bdfac009e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 4 Feb 2017 01:59:59 +0100
 Subject: [PATCH 3/3] Prevent exporting QML parser symbols on static build
diff --git a/qt5-declarative/mingw-w64/PKGBUILD b/qt5-declarative/mingw-w64/PKGBUILD
index 3b8af0c9..92a5731d 100755
--- a/qt5-declarative/mingw-w64/PKGBUILD
+++ b/qt5-declarative/mingw-w64/PKGBUILD
@@ -12,7 +12,7 @@
 
 _qt_module=qtdeclarative
 pkgname=mingw-w64-qt5-declarative
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc='Classes for QML and JavaScript languages (mingw-w64)'
@@ -27,10 +27,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
         '0001-Ensure-QML-dev-tools-is-built-as-static-library.patch'
         '0002-Ensure-static-plugins-are-exported.patch'
         '0003-Prevent-exporting-QML-parser-symbols-on-static-build.patch')
-sha256sums=('470568745602e7fa21cdca42b1641162e4257cfeb7a2dcf8af24538c9516cc5b'
-            '1880f69559d8fd1947de64c43b706092fba2e99702a24586c4bd0785d1b09542'
-            'a91e94966a0550b3b0df185f6aaec06eb0a012f7855f603dee5befd889efbc40'
-            '695397421de70a456e0231ed7a5542cb86bd0f67627d62de9b8209dce662c403')
+sha256sums=('839881cd6996e35c351bc7d560372ebb91e61f3688957c33248c4f31ea007fa7'
+            'a21b730e650a9ebe3cdb72fccef909da783df3dc45fbd063e8c37f3618b3655d'
+            'b0c26b559483e740dae038d630b5994805642ef8673edacad7b244019c5b83ab'
+            '747db2313fc5759c913ebb920b717c990361075622fff11d242843526ea75fa8')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-gamepad/mingw-w64/PKGBUILD b/qt5-gamepad/mingw-w64/PKGBUILD
index d607eced..f168fc3c 100644
--- a/qt5-gamepad/mingw-w64/PKGBUILD
+++ b/qt5-gamepad/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtgamepad
 pkgname="mingw-w64-qt5-gamepad"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Adds support for getting events from gamepad devices (mingw-w64)"
@@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' '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=('d289d8c983f4e88018c9ccb22bbde196c9f97efd20ecd48ae92994885f2334a7')
+sha256sums=('5d046869e9646912936e3622efa755d85ccc8eddba91f5b12880cfb5e6489642')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-graphicaleffects/mingw-w64/PKGBUILD b/qt5-graphicaleffects/mingw-w64/PKGBUILD
index 6e33b478..f06d00c7 100644
--- a/qt5-graphicaleffects/mingw-w64/PKGBUILD
+++ b/qt5-graphicaleffects/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtgraphicaleffects
 pkgname="mingw-w64-qt5-graphicaleffects"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Graphical effects for use with Qt Quick 2 (mingw-w64)"
@@ -22,7 +22,7 @@ license=('GPL3' 'LGPL' '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=('429398b6c661897b3c7cd62fb3657a2de60ad9152578edeeca0abde6e7ae5a86')
+sha256sums=('772c98a009cc82ac290f868906c5aa719e4608ef3c5905d69ef7402b15924a73')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-imageformats/apple-darwin/PKGBUILD b/qt5-imageformats/apple-darwin/PKGBUILD
index cb499a11..f9e5184a 100644
--- a/qt5-imageformats/apple-darwin/PKGBUILD
+++ b/qt5-imageformats/apple-darwin/PKGBUILD
@@ -5,7 +5,7 @@
 
 _qt_module=qtimageformats
 pkgname='apple-darwin-qt5-imageformats'
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (apple-darwin)"
diff --git a/qt5-imageformats/mingw-w64/PKGBUILD b/qt5-imageformats/mingw-w64/PKGBUILD
index e92929bc..67676598 100644
--- a/qt5-imageformats/mingw-w64/PKGBUILD
+++ b/qt5-imageformats/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtimageformats
 pkgname="mingw-w64-qt5-imageformats"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Plugins for additional image formats: TIFF, MNG, TGA, WBMP (mingw-w64)"
@@ -26,7 +26,7 @@ license=('GPL3' 'LGPL' '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=('1ea757728f205deb6b3f5873f5c7c3129cded5993077500a9fb249559bee7a9c')
+sha256sums=('db5a9e784f9c327c1e6830b1550311024cc91202d3b8dde82cd0944164298be2')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch b/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
index 98dc7c3d..7a48bfd1 100644
--- a/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
+++ b/qt5-location/mingw-w64/0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch
@@ -1,4 +1,4 @@
-From 701a4e8a49e6aa78eba9debb2ccedbb4f5f26609 Mon Sep 17 00:00:00 2001
+From c04c2c96edd9a2922fbef4c6bf7c1dfa0de7fb0a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 22 Dec 2016 22:30:59 +0100
 Subject: [PATCH] Ensure static 3rdparty libs are linked correctly
diff --git a/qt5-location/mingw-w64/PKGBUILD b/qt5-location/mingw-w64/PKGBUILD
index 28ccfc7f..bc3de309 100644
--- a/qt5-location/mingw-w64/PKGBUILD
+++ b/qt5-location/mingw-w64/PKGBUILD
@@ -14,7 +14,7 @@ _mapboxcfg='QT.global.disabled_features+=geoservices_mapboxgl'
 
 _qt_module=qtlocation
 pkgname=mingw-w64-qt5-location
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc='Provides access to position, satellite and area monitoring classes (mingw-w64)'
@@ -27,8 +27,8 @@ 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"
         '0001-Ensure-static-3rdparty-libs-are-linked-correctly.patch')
-sha256sums=('a31f27f457ac57e7203ae808b95ba0053d182e22425de03840af761e343d8bef'
-            'e5cb1e46408fc8776f9345e21a7565d9b6a38fc0312cba66fc0228a0daaa29ad')
+sha256sums=('52d589be2852ada0c000b06cc411b61e521cd0797470be567fd1625bcc9d75c6'
+            'f67989072e3f7628dc9e5dd7a47574e31c95bd7a0352de5be0bfd25d97be5a63')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch b/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
index 2aa278f4..861acd50 100644
--- a/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
+++ b/qt5-multimedia/mingw-w64/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch
@@ -1,4 +1,4 @@
-From 43d59aa52d8a27d35e22e3a18d1ab8f101e403b6 Mon Sep 17 00:00:00 2001
+From f9c55f9c22621ac5d0ce28eb756169ce4d3a724d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:36:56 +0200
 Subject: [PATCH 1/3] Recorder includes to prevent conflict with vsnprintf
diff --git a/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch b/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch
index 742ee0a4..92ec8008 100644
--- a/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch
+++ b/qt5-multimedia/mingw-w64/0002-Fix-build-with-ANGLE.patch
@@ -1,4 +1,4 @@
-From a3f8d9f9a57e042a66586423b93bb0e37673fbdc Mon Sep 17 00:00:00 2001
+From 1fb6e1878cb639ef00059136a9be21576fd78834 Mon Sep 17 00:00:00 2001
 From: Jose Santiago <jsantiago@haivision.com>
 Date: Thu, 3 Nov 2016 14:36:10 -0500
 Subject: [PATCH 2/3] Fix build with ANGLE
diff --git a/qt5-multimedia/mingw-w64/0003-Link-directshow-plugin-against-libamstrmid.patch b/qt5-multimedia/mingw-w64/0003-Link-directshow-plugin-against-libamstrmid.patch
index bdf2ec13..2367d675 100644
--- a/qt5-multimedia/mingw-w64/0003-Link-directshow-plugin-against-libamstrmid.patch
+++ b/qt5-multimedia/mingw-w64/0003-Link-directshow-plugin-against-libamstrmid.patch
@@ -1,4 +1,4 @@
-From 96aabcf9e88901120924310bafd817de44e94ec3 Mon Sep 17 00:00:00 2001
+From 3cc8bd09cba19956e473e0444949745406936799 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Mon, 24 Sep 2018 20:10:19 +0200
 Subject: [PATCH 3/3] Link directshow plugin against libamstrmid
diff --git a/qt5-multimedia/mingw-w64/PKGBUILD b/qt5-multimedia/mingw-w64/PKGBUILD
index b4a6abd3..cc0174dd 100644
--- a/qt5-multimedia/mingw-w64/PKGBUILD
+++ b/qt5-multimedia/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtmultimedia
 pkgname=mingw-w64-qt5-multimedia
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc='Classes for audio, video, radio and camera functionality (mingw-w64)'
@@ -25,10 +25,10 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
         '0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch'
         '0002-Fix-build-with-ANGLE.patch'
         '0003-Link-directshow-plugin-against-libamstrmid.patch')
-sha256sums=('5d3c90c546e64abf523432a3df5e7a3f1b5ad72e7d0b5ea6260729fbefeb30f5'
-            '578aecc05c3be335c5921fa07daa174d5f6c9474ac95d0063ce6bbb45c5c2299'
-            'aa4b42522094bb924a216d4c0fd0e693b47a0c27876f57434da475a48dd0f351'
-            '76d3a346f309cfe1c5cff8e10891630a49fb0af61d3d95bfd591268b33e477d2')
+sha256sums=('a30beeb37fb284d93522e29c01fb8d12726f40e9248e80b70b1f8ab60197a301'
+            '4428ce103f7a5bc5b116f33c8df4279db282448aadad0e54b433220e853a2fef'
+            'fcb42fb9d03f69a886a61e958f4bb2a61699f5a2babf01543f26655873a57f4f'
+            '7e0fc4fab6ab5cdf6224ef2db4f8e83101727265a0d891b8f84e7d2d9d7e7331')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-networkauth/mingw-w64/PKGBUILD b/qt5-networkauth/mingw-w64/PKGBUILD
index 9d538356..5b8f8149 100644
--- a/qt5-networkauth/mingw-w64/PKGBUILD
+++ b/qt5-networkauth/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtnetworkauth
 pkgname="mingw-w64-qt5-networkauth"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Network authentication module (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=('5876c1d8e37238eca8d5fbc945dfeb90bac013597bcac5c5beff23c12a8a4383')
+sha256sums=('dd6bf334be29fb82adaeecb184779328b4ad33a069528b9954d9c07f2d889332')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-quickcontrols/mingw-w64/PKGBUILD b/qt5-quickcontrols/mingw-w64/PKGBUILD
index 856b94b4..f0c04f73 100644
--- a/qt5-quickcontrols/mingw-w64/PKGBUILD
+++ b/qt5-quickcontrols/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtquickcontrols
 pkgname="mingw-w64-qt5-quickcontrols"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)"
@@ -22,7 +22,7 @@ license=('GPL3' 'LGPL' '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=('9b5c87605d08849927dd09bf9b03a939511461372b7e20004abe1116cf9fc73e')
+sha256sums=('68ae03b35eaa44a24c3f663b842252053c9f2b00b18841fd39ff7d2150986f46')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-quickcontrols2/mingw-w64/PKGBUILD b/qt5-quickcontrols2/mingw-w64/PKGBUILD
index a9160c8e..57625f53 100644
--- a/qt5-quickcontrols2/mingw-w64/PKGBUILD
+++ b/qt5-quickcontrols2/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtquickcontrols2
 pkgname="mingw-w64-qt5-quickcontrols2"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Reusable Qt Quick based UI controls to create classic desktop-style user interfaces (mingw-w64)"
@@ -22,7 +22,7 @@ license=('GPL3' 'LGPL' '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=('1fbd703612a2c0257861e07a2b709f6fbad00cb6df70a1c2c1fafa9de522e549')
+sha256sums=('e855e8369c3cb5a2ebcd2028a2a195ba73945fd9d5bc26134706c2fa14e99b3a')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-remoteobjects/mingw-w64/PKGBUILD b/qt5-remoteobjects/mingw-w64/PKGBUILD
index 0e7328dd..ef1e51f4 100644
--- a/qt5-remoteobjects/mingw-w64/PKGBUILD
+++ b/qt5-remoteobjects/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtremoteobjects
 pkgname="mingw-w64-qt5-remoteobjects"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Inter-process communication (IPC) module developed for Qt (mingw-w64)"
@@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' '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=('2ae04817cd67c8550ccc685e6db9ca78ed2d7ec0b90e1de28a9fd7cda88d9811')
+sha256sums=('3475a409127739930e0bf833cea5f7f605adc66ab25fac39b72ce4bf3039cc42')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-script/mingw-w64/PKGBUILD b/qt5-script/mingw-w64/PKGBUILD
index 1018ed98..35da1e19 100644
--- a/qt5-script/mingw-w64/PKGBUILD
+++ b/qt5-script/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtscript
 pkgname="mingw-w64-qt5-script"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Classes for making Qt applications scriptable. Provided for Qt 4.x compatibility (mingw-w64)"
@@ -22,7 +22,7 @@ license=('GPL3' 'LGPL' '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=('f8717d51072b4d4455755ae081e45f23f3d0ce25602f96231dd7703bd818a2e6')
+sha256sums=('0f37bf032a2370bd08667aad053f5a57717ea49596c16bf6cfb32b0d6e5c1f9e')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-scxml/mingw-w64/PKGBUILD b/qt5-scxml/mingw-w64/PKGBUILD
index 243f76af..1029d24c 100644
--- a/qt5-scxml/mingw-w64/PKGBUILD
+++ b/qt5-scxml/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtscxml
 pkgname="mingw-w64-qt5-scxml"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="Static and runtime integration of SCXML models into Qt code (mingw-w64)"
@@ -22,7 +22,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=('69592542fdf4b2efe6a6378ecb1bfdda9e7f48007e191d7f77a0009e213a8623')
+sha256sums=('70c4b1f8e23560cf54e69aeb3ded4078434e6f78e1b9573fbad1ddace5fc4b19')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-sensors/mingw-w64/PKGBUILD b/qt5-sensors/mingw-w64/PKGBUILD
index 95584b68..11d1af75 100644
--- a/qt5-sensors/mingw-w64/PKGBUILD
+++ b/qt5-sensors/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtsensors
 pkgname=mingw-w64-qt5-sensors
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to sensor hardware and motion gesture recognition (mingw-w64)"
@@ -23,7 +23,7 @@ groups=('mingw-w64-qt5')
 url='https://www.qt.io/'
 _pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('758a131ad86c4b8b8364e48d659a680ed12d03c091c5ab2958d06b7b0aa2e50c')
+sha256sums=('7f63fedf60fdf110a3fc529568c7226d7acd59cc5eaee908f4d5a969e34005fc')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-serialport/mingw-w64/PKGBUILD b/qt5-serialport/mingw-w64/PKGBUILD
index 559e1503..cfdeba98 100644
--- a/qt5-serialport/mingw-w64/PKGBUILD
+++ b/qt5-serialport/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qtserialport
 pkgname="mingw-w64-qt5-serialport"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Provides access to hardware and virtual serial ports (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=('72163cedda4c6fa787db8666bec6b5057272dc87bf8de6addba3440dd472bd7f')
+sha256sums=('1faf7df4a1f9028bef1ce79330badb4e5cbbba9f717c53cafc5aea41eed1de51')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-speech/mingw-w64/PKGBUILD b/qt5-speech/mingw-w64/PKGBUILD
index efba0866..80f31847 100644
--- a/qt5-speech/mingw-w64/PKGBUILD
+++ b/qt5-speech/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtspeech
 pkgname="mingw-w64-qt5-speech"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Qt module to make text to speech and speech recognition easy (mingw-w64)"
@@ -24,7 +24,7 @@ license=('GPL3' 'LGPL' '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=('5ad4b5931d6a677d8c4569a2a9147b992653962b339bd2f233400ffb43955911')
+sha256sums=('ed211822765744553fb5abeb97058420668b18a50d985061d949a0e068ee64f5')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-svg/apple-darwin/PKGBUILD b/qt5-svg/apple-darwin/PKGBUILD
index f4cd4651..035b2107 100644
--- a/qt5-svg/apple-darwin/PKGBUILD
+++ b/qt5-svg/apple-darwin/PKGBUILD
@@ -5,7 +5,7 @@
 
 _qt_module=qtsvg
 pkgname='apple-darwin-qt5-svg'
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Classes for displaying the contents of SVG files (apple-darwin)"
diff --git a/qt5-svg/mingw-w64/PKGBUILD b/qt5-svg/mingw-w64/PKGBUILD
index ff79417a..7b0bffd3 100644
--- a/qt5-svg/mingw-w64/PKGBUILD
+++ b/qt5-svg/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qtsvg
 pkgname="mingw-w64-qt5-svg"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Classes for displaying the contents of SVG files (mingw-w64)"
@@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' '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=('ed9f2118a6d33f53e5d9ed18dcd36f252a4fbaf68382a1c4a663ba75b25ae7bd')
+sha256sums=('f666438dbf6816b7534e539b95e3fa4405f11d7e2e2bbcde34f2db5ae0f27dc2')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-tools/apple-darwin/PKGBUILD b/qt5-tools/apple-darwin/PKGBUILD
index 2f16acd8..ee2d94d0 100644
--- a/qt5-tools/apple-darwin/PKGBUILD
+++ b/qt5-tools/apple-darwin/PKGBUILD
@@ -5,7 +5,7 @@
 
 _qt_module=qttools
 pkgname="apple-darwin-qt5-tools"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; apple-darwin)"
diff --git a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch
index 953a2819..ca41e1f2 100644
--- a/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch
+++ b/qt5-tools/mingw-w64/0001-Fix-linguist-macro.patch
@@ -1,4 +1,4 @@
-From 98202039059e7f96c2d6962a83c416cdcc2fd0b4 Mon Sep 17 00:00:00 2001
+From 2a4c62ba3b7710848750e95c8124186a6c400062 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 25 Sep 2016 21:44:42 +0200
 Subject: [PATCH] Fix linguist macro
diff --git a/qt5-tools/mingw-w64/PKGBUILD b/qt5-tools/mingw-w64/PKGBUILD
index c5c5394f..672b718e 100755
--- a/qt5-tools/mingw-w64/PKGBUILD
+++ b/qt5-tools/mingw-w64/PKGBUILD
@@ -16,7 +16,7 @@
 
 _qt_module=qttools
 pkgname="mingw-w64-qt5-tools"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="A cross-platform application and UI framework (Development Tools, QtHelp; mingw-w64)"
@@ -29,8 +29,8 @@ 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"
         '0001-Fix-linguist-macro.patch')
-sha256sums=('4aa3a089794ab1c629b666fffb5da4371351a9e85ea691d5d988c2ff63586005'
-            '6b1c35f587b31a0ec6aa813b836ea671b31639e7832351a9960402708f7d7906')
+sha256sums=('c9e92d2f0d369e44bb1a60e9fa6d970f8d9893d653212305e04be5e6daec2cd8'
+            'e82c4ff19e429fa7cd74f44f748b0fa3b080129eb48305de2951eb33bf13f491')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qt5-translations/apple-darwin/PKGBUILD b/qt5-translations/apple-darwin/PKGBUILD
index 6b5199b2..91136785 100644
--- a/qt5-translations/apple-darwin/PKGBUILD
+++ b/qt5-translations/apple-darwin/PKGBUILD
@@ -5,7 +5,7 @@
 
 _qt_module=qttranslations
 pkgname='apple-darwin-qt5-translations'
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="A cross-platform application and UI framework (translations, apple-darwin)"
diff --git a/qt5-translations/mingw-w64/PKGBUILD b/qt5-translations/mingw-w64/PKGBUILD
index a572c198..a1a2fbdb 100644
--- a/qt5-translations/mingw-w64/PKGBUILD
+++ b/qt5-translations/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qttranslations
 pkgname="mingw-w64-qt5-translations"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="A cross-platform application and UI framework (translations, 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=('bbe47b3995be8528ee5e78eae263a5ec224cd18e588219191716a17802e60c7b')
+sha256sums=('eefcec0a91c302548f9d948a138b8ec77d78570ce818931bd8475b1bff1205ca')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 
diff --git a/qt5-virtualkeyboard/mingw-w64/PKGBUILD b/qt5-virtualkeyboard/mingw-w64/PKGBUILD
index f4874709..fc24bce5 100644
--- a/qt5-virtualkeyboard/mingw-w64/PKGBUILD
+++ b/qt5-virtualkeyboard/mingw-w64/PKGBUILD
@@ -11,7 +11,7 @@
 
 _qt_module=qtvirtualkeyboard
 pkgname="mingw-w64-qt5-virtualkeyboard"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Virtual keyboard framework (translations, mingw-w64)"
@@ -23,7 +23,7 @@ license=('GPL3')
 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=('7111de5c78f8a0d29394409727647b90ae5906fd5105c843af98c3ae3804248d')
+sha256sums=('7b83af4527310de4ab81146622f3a46677daabf05556d0e33a2e25ca2aa13b22')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-webchannel/mingw-w64/PKGBUILD b/qt5-webchannel/mingw-w64/PKGBUILD
index a1b627f5..82cece97 100644
--- a/qt5-webchannel/mingw-w64/PKGBUILD
+++ b/qt5-webchannel/mingw-w64/PKGBUILD
@@ -8,7 +8,7 @@
 
 _qt_module=qtwebchannel
 pkgname=mingw-w64-qt5-webchannel
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc='Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients (mingw-w64)'
@@ -21,7 +21,7 @@ url='https://www.qt.io/'
 _pkgfqn="${_qt_module}-everywhere-src-${pkgver}"
 groups=('mingw-w64-qt5')
 source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('8eb9cff9492937daa1bf5d001e39afec68c310ce5596807345e2a555dcc80b8e')
+sha256sums=('72d1620bcc94e14caa91ddf344c84cd1288aa9479e00b1bb3b5e51f92efe088a')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-webengine/mingw-w64/PKGBUILD b/qt5-webengine/mingw-w64/PKGBUILD
index 28ffa55e..b048e8e9 100644
--- a/qt5-webengine/mingw-w64/PKGBUILD
+++ b/qt5-webengine/mingw-w64/PKGBUILD
@@ -10,7 +10,7 @@
 
 _qt_module=qtwebengine
 pkgname=mingw-w64-qt5-webengine
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc='Provides support for web applications using the Chromium browser project (mingw-w64)'
diff --git a/qt5-webglplugin/mingw-w64/0001-Hardcode-linker-flags-for-platform-plugin.patch b/qt5-webglplugin/mingw-w64/0001-Hardcode-linker-flags-for-platform-plugin.patch
index 99296838..e9057a1f 100644
--- a/qt5-webglplugin/mingw-w64/0001-Hardcode-linker-flags-for-platform-plugin.patch
+++ b/qt5-webglplugin/mingw-w64/0001-Hardcode-linker-flags-for-platform-plugin.patch
@@ -1,4 +1,4 @@
-From 33cf02040a4933927da94fd1eed3fe1e7bac1d8e Mon Sep 17 00:00:00 2001
+From 0f04b0d5deb92eb7a12bb190ccc9d59fec0e2b6f Mon Sep 17 00:00:00 2001
 From: Marius Kittler <mkittler@suse.de>
 Date: Wed, 12 Dec 2018 18:16:54 +0100
 Subject: [PATCH] Hardcode linker flags for platform plugin
diff --git a/qt5-webglplugin/mingw-w64/PKGBUILD b/qt5-webglplugin/mingw-w64/PKGBUILD
index 126c7190..347643c4 100644
--- a/qt5-webglplugin/mingw-w64/PKGBUILD
+++ b/qt5-webglplugin/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qtwebglplugin
 pkgname="mingw-w64-qt5-webglplugin"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('i686' 'x86_64')
 pkgdesc="QPA plugin for running an application via a browser using streamed WebGL commands (mingw-w64)"
@@ -22,8 +22,8 @@ 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"
         '0001-Hardcode-linker-flags-for-platform-plugin.patch')
-sha256sums=('0ecf9c0cb123dd89c4360dc946957a7527a2fb1c334e1bcf124cc740ca2f9bba'
-            'cfe1e4216ca28218d1b72adae8f4ed3c0210a88c2d729c2f6e427c91f0c1358a')
+sha256sums=('23da63013101e97c4e663bb4f6dbb1c7b4386679c634680d3b8d79bcc59d26b3'
+            '72d908a2c89a5577fe6723bf76af1799d28e2377bc6bfa7ff8969193ee79f89d')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-websockets/mingw-w64/PKGBUILD b/qt5-websockets/mingw-w64/PKGBUILD
index e3f18296..40080ddc 100644
--- a/qt5-websockets/mingw-w64/PKGBUILD
+++ b/qt5-websockets/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qtwebsockets
 pkgname="mingw-w64-qt5-websockets"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Provides WebSocket communication compliant with RFC 6455 (mingw-w64)"
@@ -21,7 +21,7 @@ license=('GPL3' 'LGPL' '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=('ab9ce815b1466abe52910c9b50c0f61df8af74f9521574bb534f7f562d0e8c04')
+sha256sums=('258883225c5e089015c4036f31019aa8f5bb013ecd8eecd193342e606319a577')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-winextras/mingw-w64/0001-Revert-Directly-link-to-functions-available-from-Win.patch b/qt5-winextras/mingw-w64/0001-Revert-Directly-link-to-functions-available-from-Win.patch
index 74a9687e..5b0a505e 100644
--- a/qt5-winextras/mingw-w64/0001-Revert-Directly-link-to-functions-available-from-Win.patch
+++ b/qt5-winextras/mingw-w64/0001-Revert-Directly-link-to-functions-available-from-Win.patch
@@ -1,4 +1,4 @@
-From 4dfb6bb558968399aeef98dd95407bd805a2375c Mon Sep 17 00:00:00 2001
+From 4d26ac133607b152cbabd30c499281889fa2f930 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 27 May 2018 14:23:11 +0200
 Subject: [PATCH] Revert "Directly link to functions available from Windows 7
diff --git a/qt5-winextras/mingw-w64/PKGBUILD b/qt5-winextras/mingw-w64/PKGBUILD
index caefc2ad..01536e5b 100644
--- a/qt5-winextras/mingw-w64/PKGBUILD
+++ b/qt5-winextras/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qtwinextras
 pkgname="mingw-w64-qt5-winextras"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Classes and functions that enable you to use Windows-specific functions (mingw-w64)"
@@ -22,8 +22,8 @@ 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"
         '0001-Revert-Directly-link-to-functions-available-from-Win.patch')
-sha256sums=('3141027c4f7dbb2bcef8a35fd60d673adfff0e4fb20c36f73930570252136787'
-            '03ad2a77845d5aac183f99dc9e3af7d3a7dec3549d0dfb8b9817bce99ed9110b')
+sha256sums=('2b6319f7dd19fc19b028685c163a69f0a10e610d7554411d4660c1b5e42ada3b'
+            '9ea3e7f25059a7a896cd7a73a0d94f817dcedf4787e1ecbf037f67f49996d3d5')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5-xmlpatterns/mingw-w64/PKGBUILD b/qt5-xmlpatterns/mingw-w64/PKGBUILD
index a2938489..020cb9a4 100644
--- a/qt5-xmlpatterns/mingw-w64/PKGBUILD
+++ b/qt5-xmlpatterns/mingw-w64/PKGBUILD
@@ -9,7 +9,7 @@
 
 _qt_module=qtxmlpatterns
 pkgname="mingw-w64-qt5-xmlpatterns"
-pkgver=5.12.2
+pkgver=5.12.3
 pkgrel=1
 arch=('any')
 pkgdesc="Support for XPath, XQuery, XSLT and XML schema validation (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=('2e535ec17b542f2a0b87a9db93284666015cc07b6188894ace7e75104c6d860d')
+sha256sums=('e0b98e7c92cd791a9b354d090788347db78f14c47579384fe22d0b650c1d8a61')
 
 _architectures='i686-w64-mingw32 x86_64-w64-mingw32'
 [[ $NO_STATIC_LIBS ]] || \
diff --git a/qt5/android-aarch64/0001-Disable-mapboxgl.patch b/qt5/android-aarch64/0001-Disable-mapboxgl.patch
index 4d1e3e31..a4f4a64e 100644
--- a/qt5/android-aarch64/0001-Disable-mapboxgl.patch
+++ b/qt5/android-aarch64/0001-Disable-mapboxgl.patch
@@ -1,4 +1,4 @@
-From aceefe5f7ae5fc126621c0771a16faff52c32e08 Mon Sep 17 00:00:00 2001
+From 18c7eaf37f456f840c25b3c99f2cf5c449ce9867 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 9 Dec 2018 14:29:59 +0100
 Subject: [PATCH] Disable mapboxgl
diff --git a/qt5/android-aarch64/0001-Fix-clang-libc-build-under-Android.patch b/qt5/android-aarch64/0001-Fix-clang-libc-build-under-Android.patch
index c4a8df6c..21ec0e2b 100644
--- a/qt5/android-aarch64/0001-Fix-clang-libc-build-under-Android.patch
+++ b/qt5/android-aarch64/0001-Fix-clang-libc-build-under-Android.patch
@@ -1,4 +1,4 @@
-From a2e98de3e73003272729e4393e32ac49fa991f5a Mon Sep 17 00:00:00 2001
+From dbf4c67996681535e7cdd50e223a2d1998a1370d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 9 Dec 2018 14:28:07 +0100
 Subject: [PATCH 1/3] Fix clang/libc++ build under Android
diff --git a/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch b/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch
index 3a83b3ed..b7e1cd77 100644
--- a/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch
+++ b/qt5/android-aarch64/0002-Fix-androiddeployqt-search-paths.patch
@@ -1,4 +1,4 @@
-From e209f40d45c9ca8dfc8f7704904c49dd9998de28 Mon Sep 17 00:00:00 2001
+From 2652e041beda3ded84f9c13424718587828389d7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 9 Dec 2018 14:31:30 +0100
 Subject: [PATCH 2/3] Fix androiddeployqt search paths
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] Fix androiddeployqt search paths
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
-index cf85c244cd..af1079cae0 100644
+index 20b1befc38..71ff5515bb 100644
 --- a/src/tools/androiddeployqt/main.cpp
 +++ b/src/tools/androiddeployqt/main.cpp
 @@ -1721,7 +1721,7 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
@@ -17,7 +17,7 @@ index cf85c244cd..af1079cae0 100644
      QStringList importPaths;
 -    importPaths += shellQuote(options->qtInstallDirectory + QLatin1String("/qml"));
 +    importPaths += shellQuote(options->qtInstallDirectory + QLatin1String("/lib/qt/qml"));
-     importPaths += rootPath;
+     importPaths += shellQuote(rootPath);
      for (const QString &qmlImportPath : qAsConst(options->qmlImportPaths))
          importPaths += shellQuote(qmlImportPath);
 @@ -1852,7 +1852,7 @@ bool readDependencies(Options *options)
diff --git a/qt5/android-aarch64/0003-Support-pkg-config-under-Android.patch b/qt5/android-aarch64/0003-Support-pkg-config-under-Android.patch
index ff186e53..77153d23 100644
--- a/qt5/android-aarch64/0003-Support-pkg-config-under-Android.patch
+++ b/qt5/android-aarch64/0003-Support-pkg-config-under-Android.patch
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 From fc643d716b33387759d9be0eeff250deb624d5e9 Mon Sep 17 00:00:00 2001
+=======
+From f6f962530496138ad1f21e5d851603882de7ad1d Mon Sep 17 00:00:00 2001
+>>>>>>> 21a7125... WIP: Android
 From: Martchus <martchus@gmx.net>
 Date: Sun, 7 Apr 2019 09:54:49 +0200
 Subject: [PATCH 3/3] Support pkg-config under Android
diff --git a/qt5/android-aarch64/PKGBUILD b/qt5/android-aarch64/PKGBUILD
index 28f2b2c9..132f2476 100644
--- a/qt5/android-aarch64/PKGBUILD
+++ b/qt5/android-aarch64/PKGBUILD
@@ -10,8 +10,8 @@ _android_arch=arm64-v8a
 _android_platform=22
 
 pkgname=android-$_pkg_arch-qt5
-pkgver=5.12.2
-pkgrel=2
+pkgver=5.12.3
+pkgrel=1
 pkgdesc="Qt 5 for Android"
 arch=('x86_64')
 url='https://www.qt.io'
@@ -69,19 +69,19 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkg
         '0003-Support-pkg-config-under-Android.patch'
         '0001-Disable-mapboxgl.patch'
         'android-env.sh')
-sha256sums=('59b8cb4e728450b21224dcaaa40eb25bafc5196b6988f2225c394c6b7f881ff5'
-            'fixme'
-            'fixme'
-            'fixme'
-            'fixme'
-            'fixme')
+sha256sums=('6462ac74c00ff466487d8ef8d0922971aa5b1d5b33c0753308ec9d57711f5a42'
+            '028f7cac1ff187353f17c3686edd6c3af2f4c20a19db4cca61982482e63cb8bb'
+            '7d4620df70a1c843f547c7af1044f68a182bfcb08130eec8129dc1c71a0cd500'
+            '2e47a471c6fb5c3d43817435eba87d1cbf8643dfb7d34ed7dc0a9f2042d9d91b'
+            '155427860cf724ed4da72d7c3b9b8e32459b89aefc68cb9e68a9a25d7d02cc93'
+            'c4bffe85aa675c1c1a76dda36c154154eccfcee353db6cafe2318c3848e23fb1')
 
 prepare() {
-    cd ${_pkgfqn}
-
     export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh ${_android_arch}
+    source android-env.sh ${_pkg_arch} ${_android_arch}
 
+    cd ${_pkgfqn}
+    	
     pushd qtbase
     patch -Np1 -i "../../0001-Fix-clang-libc-build-under-Android.patch"
     patch -Np1 -i "../../0002-Fix-androiddeployqt-search-paths.patch"
@@ -102,15 +102,15 @@ prepare() {
 }
 
 build() {
-    cd ${_pkgfqn}
+    export ANDROID_MINIMUM_PLATFORM=${_android_platform}
+    source android-env.sh  ${_pkg_arch} ${_android_arch}
 
     unset CC CXX CFLAGS CXXFLAGS LDFLAGS CHOST QMAKESPEC QTDIR CARCH
 
     export PKG_CONFIG=$ANDROID_PKGCONFIG
     export PYTHON=/usr/bin/python2
 
-    export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh ${_android_arch}
+    cd ${_pkgfqn}
 
     configue_opts="
         -confirm-license
@@ -122,8 +122,8 @@ build() {
         -xplatform android-clang
         -nomake tests
         -nomake examples
-        -android-ndk ${ANDROID_NDK_ROOT}
-        -android-sdk ${ANDROID_SDK_ROOT}
+        -android-ndk ${ANDROID_NDK_HOME}
+        -android-sdk ${ANDROID_HOME}
         -android-ndk-host linux-x86_64
         -android-toolchain-version 4.9
         -skip qtserialport
@@ -134,7 +134,7 @@ build() {
         -openssl-runtime
         -android-arch ${_android_arch}
         -android-ndk-platform ${ANDROID_NDK_PLATFORM}
-        -I${ANDROID_LIBS}/$_pkg_arch/include"
+        -I${ANDROID_LIBS}/include"
 
     [[ $ANDROID_DEBUG_BUILD ]] \
         && configue_opts+=' -debug-and-release' \
@@ -157,34 +157,13 @@ build() {
 }
 
 package() {
+    export ANDROID_MINIMUM_PLATFORM=${_android_platform}
+    source android-env.sh  ${_pkg_arch} ${_android_arch}
+
     cd ${_pkgfqn}
 
-    export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh ${_android_arch}
-
     make INSTALL_ROOT=${pkgdir} install
 
-    case "$_pkg_arch" in
-        aarch64)
-            toolchain=aarch64-linux-android-4.9
-            stripFolder=aarch64-linux-android
-            ;;
-        armv7a-eabi)
-            toolchain=arm-linux-androideabi-4.9
-            stripFolder=arm-linux-androideabi
-            ;;
-        x86)
-            toolchain=x86-4.9
-            stripFolder=i686-linux-android
-            ;;
-        x86-64)
-            toolchain=x86_64-4.9
-            stripFolder=x86_64-linux-android
-            ;;
-    esac
-
-    make INSTALL_ROOT=${pkgdir} install
-    STRIP=${ANDROID_NDK_ROOT}/toolchains/${toolchain}/prebuilt/linux-x86_64/${stripFolder}/bin/strip
     find ${pkgdir}/${ANDROID_LIBS}/bin -type f ! -name '*.pl' -exec strip {} \;
     find ${pkgdir}/${ANDROID_LIBS}/lib -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \;
     find ${pkgdir}/${ANDROID_LIBS}/lib -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} {} \;
@@ -192,7 +171,7 @@ package() {
     find ${pkgdir}/${ANDROID_LIBS}/qml -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \;
 
     # fix plugin path in Android-specific dependency file
-    sed -i 's/\"plugins\//\"lib\/qt\/plugins\//g' ${pkgdir}/${_pref}/lib/*-android-dependencies.xml
+    sed -i 's/\"plugins\//\"lib\/qt\/plugins\//g' ${pkgdir}/${ANDROID_LIBS}/lib/*-android-dependencies.xml
 
     # drop QMAKE_PRL_BUILD_DIR because reference the build dir
     find "${pkgdir}/" -type f -name '*.prl' \
diff --git a/qt5/android-aarch64/android-env.sh b/qt5/android-aarch64/android-env.sh
index d9f6b78e..c5c63175 100755
--- a/qt5/android-aarch64/android-env.sh
+++ b/qt5/android-aarch64/android-env.sh
@@ -4,7 +4,8 @@
 #
 # https://developer.android.com/ndk/downloads/revision_history
 
-_android_arch=$1
+_pkg_arch=$1
+_android_arch=$2
 
 # Minimum Android platform based on:
 #
@@ -13,12 +14,12 @@ if [ -z "${ANDROID_MINIMUM_PLATFORM}" ]; then
     export ANDROID_MINIMUM_PLATFORM=22
 fi
 
-if [ -z "${ANDROID_NDK_ROOT}" ]; then
-    export ANDROID_NDK_ROOT=/opt/android-ndk
+if [ -z "${ANDROID_NDK_HOME}" ]; then
+    export ANDROID_NDK_HOME=/opt/android-ndk
 fi
 
-if [ -z "${ANDROID_SDK_ROOT}" ]; then
-    export ANDROID_SDK_ROOT=/opt/android-sdk
+if [ -z "${ANDROID_HOME}" ]; then
+    export ANDROID_HOME=/opt/android-sdk
 fi
 
 get_last() {
@@ -26,7 +27,7 @@ get_last() {
 }
 
 if [ -z "${ANDROID_BUILD_TOOLS_REVISION}" ]; then
-    export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_SDK_ROOT}/build-tools)
+    export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_HOME}/build-tools)
 fi
 
 if [ -z "${ANDROID_API_VERSION}" ]; then
@@ -37,13 +38,13 @@ if [ -z "${ANDROID_NDK_PLATFORM}" ]; then
     export ANDROID_NDK_PLATFORM=android-$ANDROID_MINIMUM_PLATFORM
 fi
 
-export ANDROID_PLATFORM=${ANDROID_NDK_ROOT}/platforms/$ANDROID_NDK_PLATFORM
-export ANDROID_TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
+export ANDROID_PLATFORM=${ANDROID_NDK_HOME}/platforms/$ANDROID_NDK_PLATFORM
+export ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64
 export ANDROID_SYSROOT=${ANDROID_TOOLCHAIN}/sysroot
 export ANDROID_CROSS_PREFIX=$ANDROID_TOOLCHAIN/bin/
-export ANDROID_PKGCONFIG=android-${_android_arch}-pkg-config
+export ANDROID_PKGCONFIG=android-${_pkg_arch}-pkg-config
 
-case "$_android_arch" in
+case "$_pkg_arch" in
     aarch64)
         export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}aarch64-linux-android${ANDROID_MINIMUM_PLATFORM}-
         export ANDROID_TOOLS_PREFIX=${ANDROID_CROSS_PREFIX}aarch64-linux-android-
@@ -68,6 +69,29 @@ export ANDROID_AR=${ANDROID_TOOLS_PREFIX}ar
 export ANDROID_NM=${ANDROID_TOOLS_PREFIX}nm
 export ANDROID_RANLIB=${ANDROID_TOOLS_PREFIX}ranlib
 export ANDROID_STRIP=${ANDROID_TOOLS_PREFIX}strip
-export ANDROID_LIBS=/opt/android-libs/${_android_arch}
+export ANDROID_LIBS=/opt/android-libs/${_pkg_arch}
 export PKG_CONFIG_SYSROOT_DIR=${ANDROID_LIBS}
 export PKG_CONFIG_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}/lib/pkgconfig:${PKG_CONFIG_SYSROOT_DIR}/share/pkgconfig
+
+ndk_version() {
+    grep 'Pkg.Revision' ${ANDROID_NDK_HOME}/source.properties | awk '{print $3}'
+}
+
+check_ndk_version_ge_than() {
+    version=$1
+    ndk_ver=$(ndk_version)
+
+    if [ "${version}" = "${ndk_ver}" ]; then
+        return 0
+    fi
+
+    older_ver=$(printf "${version}\n${ndk_ver}" | sort -V | head -n 1)
+
+    if [ "${older_ver}" = "${ndk_ver}" ]; then
+        echo "ERROR: NDK version >= $version required."
+
+        return 1
+    fi
+
+    return 0
+}
diff --git a/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch b/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch
index 4d1e3e31..a4f4a64e 100644
--- a/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch
+++ b/qt5/android-armv7a-eabi/0001-Disable-mapboxgl.patch
@@ -1,4 +1,4 @@
-From aceefe5f7ae5fc126621c0771a16faff52c32e08 Mon Sep 17 00:00:00 2001
+From 18c7eaf37f456f840c25b3c99f2cf5c449ce9867 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 9 Dec 2018 14:29:59 +0100
 Subject: [PATCH] Disable mapboxgl
diff --git a/qt5/android-armv7a-eabi/0001-Fix-clang-libc-build-under-Android.patch b/qt5/android-armv7a-eabi/0001-Fix-clang-libc-build-under-Android.patch
index c4a8df6c..21ec0e2b 100644
--- a/qt5/android-armv7a-eabi/0001-Fix-clang-libc-build-under-Android.patch
+++ b/qt5/android-armv7a-eabi/0001-Fix-clang-libc-build-under-Android.patch
@@ -1,4 +1,4 @@
-From a2e98de3e73003272729e4393e32ac49fa991f5a Mon Sep 17 00:00:00 2001
+From dbf4c67996681535e7cdd50e223a2d1998a1370d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 9 Dec 2018 14:28:07 +0100
 Subject: [PATCH 1/3] Fix clang/libc++ build under Android
diff --git a/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch b/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch
index 3a83b3ed..b7e1cd77 100644
--- a/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch
+++ b/qt5/android-armv7a-eabi/0002-Fix-androiddeployqt-search-paths.patch
@@ -1,4 +1,4 @@
-From e209f40d45c9ca8dfc8f7704904c49dd9998de28 Mon Sep 17 00:00:00 2001
+From 2652e041beda3ded84f9c13424718587828389d7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 9 Dec 2018 14:31:30 +0100
 Subject: [PATCH 2/3] Fix androiddeployqt search paths
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] Fix androiddeployqt search paths
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
-index cf85c244cd..af1079cae0 100644
+index 20b1befc38..71ff5515bb 100644
 --- a/src/tools/androiddeployqt/main.cpp
 +++ b/src/tools/androiddeployqt/main.cpp
 @@ -1721,7 +1721,7 @@ bool scanImports(Options *options, QSet<QString> *usedDependencies)
@@ -17,7 +17,7 @@ index cf85c244cd..af1079cae0 100644
      QStringList importPaths;
 -    importPaths += shellQuote(options->qtInstallDirectory + QLatin1String("/qml"));
 +    importPaths += shellQuote(options->qtInstallDirectory + QLatin1String("/lib/qt/qml"));
-     importPaths += rootPath;
+     importPaths += shellQuote(rootPath);
      for (const QString &qmlImportPath : qAsConst(options->qmlImportPaths))
          importPaths += shellQuote(qmlImportPath);
 @@ -1852,7 +1852,7 @@ bool readDependencies(Options *options)
diff --git a/qt5/android-armv7a-eabi/0003-Support-pkg-config-under-Android.patch b/qt5/android-armv7a-eabi/0003-Support-pkg-config-under-Android.patch
index ff186e53..77153d23 100644
--- a/qt5/android-armv7a-eabi/0003-Support-pkg-config-under-Android.patch
+++ b/qt5/android-armv7a-eabi/0003-Support-pkg-config-under-Android.patch
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 From fc643d716b33387759d9be0eeff250deb624d5e9 Mon Sep 17 00:00:00 2001
+=======
+From f6f962530496138ad1f21e5d851603882de7ad1d Mon Sep 17 00:00:00 2001
+>>>>>>> 21a7125... WIP: Android
 From: Martchus <martchus@gmx.net>
 Date: Sun, 7 Apr 2019 09:54:49 +0200
 Subject: [PATCH 3/3] Support pkg-config under Android
diff --git a/qt5/android-armv7a-eabi/PKGBUILD b/qt5/android-armv7a-eabi/PKGBUILD
index f0212c61..1a925708 100644
--- a/qt5/android-armv7a-eabi/PKGBUILD
+++ b/qt5/android-armv7a-eabi/PKGBUILD
@@ -10,8 +10,8 @@ _android_arch=armeabi-v7a
 _android_platform=21
 
 pkgname=android-$_pkg_arch-qt5
-pkgver=5.12.2
-pkgrel=2
+pkgver=5.12.3
+pkgrel=1
 pkgdesc="Qt 5 for Android"
 arch=('x86_64')
 url='https://www.qt.io'
@@ -69,19 +69,19 @@ source=("http://download.qt-project.org/official_releases/qt/${pkgver:0:4}/${pkg
         '0003-Support-pkg-config-under-Android.patch'
         '0001-Disable-mapboxgl.patch'
         'android-env.sh')
-sha256sums=('59b8cb4e728450b21224dcaaa40eb25bafc5196b6988f2225c394c6b7f881ff5'
-            'fixme'
-            'fixme'
-            'fixme'
-            'fixme'
-            'fixme')
+sha256sums=('6462ac74c00ff466487d8ef8d0922971aa5b1d5b33c0753308ec9d57711f5a42'
+            '028f7cac1ff187353f17c3686edd6c3af2f4c20a19db4cca61982482e63cb8bb'
+            '7d4620df70a1c843f547c7af1044f68a182bfcb08130eec8129dc1c71a0cd500'
+            '2e47a471c6fb5c3d43817435eba87d1cbf8643dfb7d34ed7dc0a9f2042d9d91b'
+            '155427860cf724ed4da72d7c3b9b8e32459b89aefc68cb9e68a9a25d7d02cc93'
+            'c4bffe85aa675c1c1a76dda36c154154eccfcee353db6cafe2318c3848e23fb1')
 
 prepare() {
-    cd ${_pkgfqn}
-
     export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh ${_android_arch}
+    source android-env.sh ${_pkg_arch} ${_android_arch}
 
+    cd ${_pkgfqn}
+    	
     pushd qtbase
     patch -Np1 -i "../../0001-Fix-clang-libc-build-under-Android.patch"
     patch -Np1 -i "../../0002-Fix-androiddeployqt-search-paths.patch"
@@ -102,15 +102,15 @@ prepare() {
 }
 
 build() {
-    cd ${_pkgfqn}
+    export ANDROID_MINIMUM_PLATFORM=${_android_platform}
+    source android-env.sh  ${_pkg_arch} ${_android_arch}
 
     unset CC CXX CFLAGS CXXFLAGS LDFLAGS CHOST QMAKESPEC QTDIR CARCH
 
     export PKG_CONFIG=$ANDROID_PKGCONFIG
     export PYTHON=/usr/bin/python2
 
-    export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh ${_android_arch}
+    cd ${_pkgfqn}
 
     configue_opts="
         -confirm-license
@@ -122,8 +122,8 @@ build() {
         -xplatform android-clang
         -nomake tests
         -nomake examples
-        -android-ndk ${ANDROID_NDK_ROOT}
-        -android-sdk ${ANDROID_SDK_ROOT}
+        -android-ndk ${ANDROID_NDK_HOME}
+        -android-sdk ${ANDROID_HOME}
         -android-ndk-host linux-x86_64
         -android-toolchain-version 4.9
         -skip qtserialport
@@ -134,7 +134,7 @@ build() {
         -openssl-runtime
         -android-arch ${_android_arch}
         -android-ndk-platform ${ANDROID_NDK_PLATFORM}
-        -I${ANDROID_LIBS}/$_pkg_arch/include"
+        -I${ANDROID_LIBS}/include"
 
     [[ $ANDROID_DEBUG_BUILD ]] \
         && configue_opts+=' -debug-and-release' \
@@ -157,34 +157,13 @@ build() {
 }
 
 package() {
+    export ANDROID_MINIMUM_PLATFORM=${_android_platform}
+    source android-env.sh  ${_pkg_arch} ${_android_arch}
+
     cd ${_pkgfqn}
 
-    export ANDROID_MINIMUM_PLATFORM=${_android_platform}
-    source android-env.sh ${_android_arch}
-
     make INSTALL_ROOT=${pkgdir} install
 
-    case "$_pkg_arch" in
-        aarch64)
-            toolchain=aarch64-linux-android-4.9
-            stripFolder=aarch64-linux-android
-            ;;
-        armv7a-eabi)
-            toolchain=arm-linux-androideabi-4.9
-            stripFolder=arm-linux-androideabi
-            ;;
-        x86)
-            toolchain=x86-4.9
-            stripFolder=i686-linux-android
-            ;;
-        x86-64)
-            toolchain=x86_64-4.9
-            stripFolder=x86_64-linux-android
-            ;;
-    esac
-
-    make INSTALL_ROOT=${pkgdir} install
-    STRIP=${ANDROID_NDK_ROOT}/toolchains/${toolchain}/prebuilt/linux-x86_64/${stripFolder}/bin/strip
     find ${pkgdir}/${ANDROID_LIBS}/bin -type f ! -name '*.pl' -exec strip {} \;
     find ${pkgdir}/${ANDROID_LIBS}/lib -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \;
     find ${pkgdir}/${ANDROID_LIBS}/lib -type f \( -name 'lib*.a' ! -name 'libQt5Bootstrap.a' ! -name 'libQt5QmlDevTools.a' \) -exec ${ANDROID_STRIP} {} \;
@@ -192,7 +171,7 @@ package() {
     find ${pkgdir}/${ANDROID_LIBS}/qml -type f -name 'lib*.so' -exec ${ANDROID_STRIP} {} \;
 
     # fix plugin path in Android-specific dependency file
-    sed -i 's/\"plugins\//\"lib\/qt\/plugins\//g' ${pkgdir}/${_pref}/lib/*-android-dependencies.xml
+    sed -i 's/\"plugins\//\"lib\/qt\/plugins\//g' ${pkgdir}/${ANDROID_LIBS}/lib/*-android-dependencies.xml
 
     # drop QMAKE_PRL_BUILD_DIR because reference the build dir
     find "${pkgdir}/" -type f -name '*.prl' \
diff --git a/qt5/android-armv7a-eabi/android-env.sh b/qt5/android-armv7a-eabi/android-env.sh
index d9f6b78e..c5c63175 100755
--- a/qt5/android-armv7a-eabi/android-env.sh
+++ b/qt5/android-armv7a-eabi/android-env.sh
@@ -4,7 +4,8 @@
 #
 # https://developer.android.com/ndk/downloads/revision_history
 
-_android_arch=$1
+_pkg_arch=$1
+_android_arch=$2
 
 # Minimum Android platform based on:
 #
@@ -13,12 +14,12 @@ if [ -z "${ANDROID_MINIMUM_PLATFORM}" ]; then
     export ANDROID_MINIMUM_PLATFORM=22
 fi
 
-if [ -z "${ANDROID_NDK_ROOT}" ]; then
-    export ANDROID_NDK_ROOT=/opt/android-ndk
+if [ -z "${ANDROID_NDK_HOME}" ]; then
+    export ANDROID_NDK_HOME=/opt/android-ndk
 fi
 
-if [ -z "${ANDROID_SDK_ROOT}" ]; then
-    export ANDROID_SDK_ROOT=/opt/android-sdk
+if [ -z "${ANDROID_HOME}" ]; then
+    export ANDROID_HOME=/opt/android-sdk
 fi
 
 get_last() {
@@ -26,7 +27,7 @@ get_last() {
 }
 
 if [ -z "${ANDROID_BUILD_TOOLS_REVISION}" ]; then
-    export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_SDK_ROOT}/build-tools)
+    export ANDROID_BUILD_TOOLS_REVISION=$(get_last ${ANDROID_HOME}/build-tools)
 fi
 
 if [ -z "${ANDROID_API_VERSION}" ]; then
@@ -37,13 +38,13 @@ if [ -z "${ANDROID_NDK_PLATFORM}" ]; then
     export ANDROID_NDK_PLATFORM=android-$ANDROID_MINIMUM_PLATFORM
 fi
 
-export ANDROID_PLATFORM=${ANDROID_NDK_ROOT}/platforms/$ANDROID_NDK_PLATFORM
-export ANDROID_TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64
+export ANDROID_PLATFORM=${ANDROID_NDK_HOME}/platforms/$ANDROID_NDK_PLATFORM
+export ANDROID_TOOLCHAIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64
 export ANDROID_SYSROOT=${ANDROID_TOOLCHAIN}/sysroot
 export ANDROID_CROSS_PREFIX=$ANDROID_TOOLCHAIN/bin/
-export ANDROID_PKGCONFIG=android-${_android_arch}-pkg-config
+export ANDROID_PKGCONFIG=android-${_pkg_arch}-pkg-config
 
-case "$_android_arch" in
+case "$_pkg_arch" in
     aarch64)
         export ANDROID_TOOLS_COMPILER_PREFIX=${ANDROID_CROSS_PREFIX}aarch64-linux-android${ANDROID_MINIMUM_PLATFORM}-
         export ANDROID_TOOLS_PREFIX=${ANDROID_CROSS_PREFIX}aarch64-linux-android-
@@ -68,6 +69,29 @@ export ANDROID_AR=${ANDROID_TOOLS_PREFIX}ar
 export ANDROID_NM=${ANDROID_TOOLS_PREFIX}nm
 export ANDROID_RANLIB=${ANDROID_TOOLS_PREFIX}ranlib
 export ANDROID_STRIP=${ANDROID_TOOLS_PREFIX}strip
-export ANDROID_LIBS=/opt/android-libs/${_android_arch}
+export ANDROID_LIBS=/opt/android-libs/${_pkg_arch}
 export PKG_CONFIG_SYSROOT_DIR=${ANDROID_LIBS}
 export PKG_CONFIG_LIBDIR=${PKG_CONFIG_SYSROOT_DIR}/lib/pkgconfig:${PKG_CONFIG_SYSROOT_DIR}/share/pkgconfig
+
+ndk_version() {
+    grep 'Pkg.Revision' ${ANDROID_NDK_HOME}/source.properties | awk '{print $3}'
+}
+
+check_ndk_version_ge_than() {
+    version=$1
+    ndk_ver=$(ndk_version)
+
+    if [ "${version}" = "${ndk_ver}" ]; then
+        return 0
+    fi
+
+    older_ver=$(printf "${version}\n${ndk_ver}" | sort -V | head -n 1)
+
+    if [ "${older_ver}" = "${ndk_ver}" ]; then
+        echo "ERROR: NDK version >= $version required."
+
+        return 1
+    fi
+
+    return 0
+}