Update Qt packages to 5.12.3

2019-04-21 22:37:50 +02:00 · 2019-04-21 22:37:50 +02:00 · c1d7052470
parent be11dd7ef5
commit c1d7052470
202 changed files with 780 additions and 754 deletions
--- 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
--- 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 ]] || \
--- 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
--- 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
--- 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 ]] || \
--- 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')
--- 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)
--- 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
--- 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 @@
--- 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
--- 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";
--- 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
--- 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)
--- 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 @@
--- 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
--- 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
--- 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 @@
--- 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 @@
--- 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
--- 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
--- 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
--- 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 {
--- 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
--- 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
--- 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
--- 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")) {
--- 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)
--- 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)
--- 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)
 
--- 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
--- 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) {
--- 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
--- 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
--- 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",
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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 {
--- 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'

--- 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)
--- 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
--- 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 @@
--- 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
--- 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";
--- 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
--- 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)
--- 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 @@
--- 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
--- 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
--- 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 @@
--- 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 @@
--- 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
--- 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
--- 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
--- 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 {
--- 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
--- 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
--- 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
--- 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")) {
--- 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)
--- 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)
--- 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)
 
--- 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
--- 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) {
--- 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
--- 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
--- 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",
--- 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
--- 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

--- 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
--- 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
--- 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
--- 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 {
--- 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'

--- 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)
--- 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
--- 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 @@
--- 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
--- 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";
--- 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
--- 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)
--- 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 @@
--- 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
--- 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
--- 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 @@
--- 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 @@
--- 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
--- 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
--- 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
--- 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 {
--- 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
--- 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
--- 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
--- 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")) {
--- 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)
--- 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)
--- 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)
 
--- 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
--- a/Show More
+++ b/Show More