Update Qt packages to 5.12.0

2018-12-08 22:06:32 +01:00 · 2018-12-08 22:06:32 +01:00 · 768c12cd05
parent 00ac9d9943
commit 768c12cd05
195 changed files with 1096 additions and 1059 deletions
--- a/devel/qt5/continue-rebase-patches.sh
+++ b/devel/qt5/continue-rebase-patches.sh
@ -4,10 +4,11 @@ shopt -s nullglob

 if ! [[ $1 ]]; then
    echo 'No version specified, must specify the new version, eg. 5.9.2'
-    echo "Usage: $0 newversion"
+    echo "Usage: $0 newversion [new-branch-suffix=mingw-w64]"
    exit -1
 fi
 newversion="$1"
+newbranchsuffix="${2:-mingw-w64}"

 # determine remote to push
 remote=
@ -25,4 +26,4 @@ fi
 if ! git cherry-pick --continue; then
    echo "Seems like the cherry-pick has been concluded manually."
 fi
-git push -u $maybe_remote "$newversion-mingw-w64"
+git push -u $maybe_remote "$newversion-$newbranchsuffix"
--- a/devel/qt5/rebase-patches.sh
+++ b/devel/qt5/rebase-patches.sh
@ -6,23 +6,17 @@ colorize

 if ! [[ $1 ]] || ! [[ $2 ]]; then
    echo 'No version specified, must specify the new and old version, eg. 5.9.2 5.9.1'
-    echo "Usage: $0 newversion oldversion [old-branch-suffix]"
+    echo "Usage: $0 newversion oldversion [old-branch-suffix=mingw-w64] [new-branch-suffix=mingw-w64]"
    echo "Note: supposed to be run within the Qt Git checkout"
    exit -1
 fi
 newversion="$1"
 oldversion="$2"
 oldbranchsuffix="$3"
+newbranchsuffix="${4:-mingw-w64}"

 # determine branch from old version
-oldversionbranch="$oldversion-mingw-w64"
-[[ $oldbranchsuffix ]] && oldversionbranch_with_suffix="$oldversionbranch-$oldbranchsuffix"
-branch_count=$(git branch | grep -- "$oldversionbranch_with_suffix" | wc -l)
-if [[ $branch_count -lt 1 ]]; then
-    msg2 "Trying without suffix because $oldversionbranch doesn't exist"
-else
-    oldversionbranch=$oldversionbranch_with_suffix
-fi
+oldversionbranch="$oldversion-${oldbranchsuffix:-mingw-w64}"
 branch_count=$(git branch | grep -- "$oldversionbranch" | wc -l)
 if [[ $branch_count -lt 1 ]]; then
    msg2 "Branch for old version $oldversionbranch doesn't exist. Likely we just don't need any patches for this repo :-)"
@ -50,6 +44,6 @@ fi

 # update Git checkout, create new branch with rebased commits, push to remote
 git remote update
-git checkout -b "$newversion-mingw-w64" "origin/$newversion"
+git checkout -b "$newversion-$newbranchsuffix" "origin/$newversion"
 git cherry-pick "v$oldversion..$oldversionbranch"
-git push -u $maybe_remote "$newversion-mingw-w64"
+git push -u $maybe_remote "$newversion-$newbranchsuffix"
--- a/devel/qt5/update-patches.sh
+++ b/devel/qt5/update-patches.sh
@ -35,12 +35,16 @@ branch="${2}"
 variant="${3:-mingw-w64}"

 # find dest dir
+pkgdir=
 for dir in "${pkgbuildsdirs[@]}"; do
-    dest="${dir}/${pkg}/${variant}"
-    [[ -d $dest ]] && break || dest=
+    for _pkgdir in "$pkg" "qt5"; do
+        dest="${dir}/${_pkgdir}/${variant}"
+        pkgdir=$_pkgdir
+        [[ -d $dest ]] && break 2 || dest=
+    done
 done
 if ! [[ $dest ]]; then
-    warning "\$DEFAULT_PKGBUILDS_DIR/$pkg/${variant} is no directory - skipping repository $repo."
+    warning "\$DEFAULT_PKGBUILDS_DIR/$pkg/${variant} or \$DEFAULT_PKGBUILDS_DIR/qt5/${variant} is no directory - skipping repository $repo."
    exit 0
 fi

@ -63,11 +67,12 @@ for source in "${source[@]}"; do
    file_index=$((file_index + 1))
 done

-patches=("$dest"/*.patch)
-
-for patch in "${patches[@]}"; do
-    [[ -f $patch ]] && rm "$patch"
-done
+if [[ $pkgdir != qt5 ]]; then
+    patches=("$dest"/*.patch)
+    for patch in "${patches[@]}"; do
+        [[ -f $patch ]] && rm "$patch"
+    done
+fi

 pushd "$wd" > /dev/null
 git status # do some Git stuff just to check whether it is a Git repo
@ -81,6 +86,8 @@ fi
 git format-patch "origin/${pkgver}" --output-directory "$dest"
 popd > /dev/null

+[[ $pkgdir == qt5 ]] && exit 0
+
 new_patches=("$dest"/*.patch)
 for patch in "${new_patches[@]}"; do
    new_sources+=("$patch")
--- 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.11.2
+pkgver=5.12.0
 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=('7f72c823ec10a2effba95d08d9439215472d2cb1e3229de50a6b3d2523c8f962')
+sha256sums=('a12adc9c14ffa18ff5c4951efb41914d4840a0c2a88486eb8d39a4833e4631da')

 _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 f383e94a641c227fdafbc95f5b20fc85784f7d5e Mon Sep 17 00:00:00 2001
+From 0cff734180ff88a27b16aee3f5974577a39d0cb7 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 17:17:46 +0200
 Subject: [PATCH 1/2] Don't require windows.h when using native Linux gcc
@ -17,5 +17,5 @@ index 7f9a8d4..6f3548a 100644
 SOURCES = main.cpp
 
 -- 
-2.19.0
+2.19.2

--- 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 4a0b20d46895bbcc4bc85a11640c9c54364c508a Mon Sep 17 00:00:00 2001
+From 92e5888ab26ec60efeb1fe28ce3edbba35fec960 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
@ -11,10 +11,10 @@ See https://bugreports.qt.io/browse/QTBUG-46827
 2 files changed, 12 insertions(+)

 diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
-index 883f1e9..2680baf 100644
+index 722a389..66499cb 100644
 --- a/src/activeqt/container/qaxbase.cpp
 +++ b/src/activeqt/container/qaxbase.cpp
-@@ -2180,6 +2180,10 @@ void MetaObjectGenerator::readClassInfo()
+@@ -2176,6 +2176,10 @@ void MetaObjectGenerator::readClassInfo()
             const QStringList versions = controls.childGroups();
             for (const QString &version : versions) {
                 tlfile = controls.value(QLatin1Char('/') + version + QLatin1String("/0/win32/.")).toString();
@ -26,7 +26,7 @@ index 883f1e9..2680baf 100644
                     break;
             }
 diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
-index 2baad0e..e918e34 100644
+index 4601aef..65eee94 100644
 --- a/tools/dumpcpp/main.cpp
 +++ b/tools/dumpcpp/main.cpp
@@ -1539,6 +1539,10 @@ int main(int argc, char **argv)
@ -52,5 +52,5 @@ index 2baad0e..e918e34 100644
     }
 
 -- 
-2.19.0
+2.19.2

--- 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.11.2
+pkgver=5.12.0
 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=('b06c634059e2069584dccf331a45074e6a2c63ca6ea5576769c47a985173a041'
-            '608d6905d407c3c6939c00fc2962a906f76086272bbeca811b9f1529b30ed50a'
-            'a04aededab0eb220be9000dafc06ffb9f9541d158e639b58a54eeef922a3c60a')
+sha256sums=('a22876b4243cb433042e7f4812974eac05935872f39cc880a3587bc3eae86d3e'
+            '2c6278acc994f57afd4cd93bd183b73bf744e504d7ee007d73e8fe1568d760f5'
+            'a14b931d373cce075318702ec513d829750f3ab2db73d6ed5433db4bd1f577ae')

 _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.11.2
+pkgver=5.12.0
 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 2658fe5a2166aa8893701e65e71dd7bdb16d9180 Mon Sep 17 00:00:00 2001
+From 916b6a82bc084162432f9ed36934940892679ebd Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
@ -163,5 +163,5 @@ index ed131c6823..b77d86cd6b 100644
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.19.0
+2.19.2

--- 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 39c6529c65ebf9e9af4d54cec6ac45a61f4ba618 Mon Sep 17 00:00:00 2001
+From cf9119f68b3e575ef07853ab177259f4ef044e0b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
 Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
@ -9,7 +9,7 @@ FIXME: Not sure whether this is still required
 1 file changed, 2 deletions(-)

 diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
-index 1a43f13d9b..a4c954a453 100644
+index 00287b0665..35ad3007d1 100644
 --- a/src/gui/opengl/qopenglfunctions.h
 +++ b/src/gui/opengl/qopenglfunctions.h
@@ -56,9 +56,7 @@
@ -23,5 +23,5 @@ index 1a43f13d9b..a4c954a453 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.19.0
+2.19.2

--- 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 b0a8c226931a787ec4214686827bcb9b1d7f873f Mon Sep 17 00:00:00 2001
+From dcfdcfea110398d0ce98c184b975f59354d4528b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
 Subject: [PATCH 03/33] Use external ANGLE library
@ -28,7 +28,7 @@ index 07869efd7d..2e32911a64 100644
 
 _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
 diff --git a/src/gui/gui.pro b/src/gui/gui.pro
-index 759d6f3cbf..1ddcf1db78 100644
+index 06c9cd3939..cb1314c1ef 100644
 --- a/src/gui/gui.pro
 +++ b/src/gui/gui.pro
@@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
@ -66,7 +66,7 @@ index 8b2349ff2f..f5e43c6adc 100644
 HEADERS += qgl.h \
            qgl_p.h \
 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index f4c396f7c5..fc87e810aa 100644
+index db06a6a2a3..25c00ed17b 100644
 --- a/src/plugins/platforms/windows/windows.pri
 +++ b/src/plugins/platforms/windows/windows.pri
@@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
@ -93,5 +93,5 @@ index 1c76a2e46f..6a5f046b34 100644
         SUBDIRS += src_3rdparty_libpng
         src_3rdparty_freetype.depends += src_3rdparty_libpng
 -- 
-2.19.0
+2.19.2

--- 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 baee6baceceaa4abb8a9ea909771bcac6da04e05 Mon Sep 17 00:00:00 2001
+From 42ab8012488408bfb6ab77fb056b27f3400d40ce Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
 Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
@ -11,7 +11,7 @@ Hence the assembler option -mbig-obj is required.
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri
-index 4c778b184e..1dd1755d7f 100644
+index 24758afdeb..aa04b4a672 100644
 --- a/src/gui/opengl/opengl.pri
 +++ b/src/gui/opengl/opengl.pri
@@ -3,7 +3,8 @@
@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644
     HEADERS += opengl/qopengl.h \
                opengl/qopengl_p.h \
 -- 
-2.19.0
+2.19.2

--- 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 4b8467ce1b3c487b69e9f9016fa26044853fb6aa Mon Sep 17 00:00:00 2001
+From 07fa0fe80bd49e335ff8663ee8c67aa6b0f042c8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
 Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
@ -10,10 +10,10 @@ Subject: [PATCH 05/33] 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 73e09a1025..6c977b3e0b 100644
+index b7e591d2ab..5abf0624f4 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3183,7 +3183,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3189,7 +3189,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
 }
 
 QString
@ -22,7 +22,7 @@ index 73e09a1025..6c977b3e0b 100644
 {
     QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
     if (ret.isEmpty()) {
-@@ -3208,7 +3208,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3214,7 +3214,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
     if(fixify) {
         if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
             ret.prepend(project->first("DESTDIR").toQString());
@ -36,7 +36,7 @@ index 73e09a1025..6c977b3e0b 100644
     return ret;
 }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index f32bec650e..17fed7f8c8 100644
+index b5c150e1cb..afb0e91381 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
@@ -89,7 +89,7 @@ protected:
@ -49,10 +49,10 @@ index f32bec650e..17fed7f8c8 100644
     void writePkgConfigFile();   // for pkg-config
 
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index bca27b7044..dec0931bd4 100644
+index e0d03ccc1c..37eee7fca3 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -726,7 +726,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -747,7 +747,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
                 }
                 if(!ret.isEmpty())
                     ret += "\n\t";
@ -62,5 +62,5 @@ index bca27b7044..dec0931bd4 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.19.0
+2.19.2

--- 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 346528ea0e3b2966e798b9492b72b087561781af Mon Sep 17 00:00:00 2001
+From f02b2a6ef057ac969eb813735a88e3dfedf924a2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
 Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
@ -11,18 +11,18 @@ like .obj/debug/Qt5Cored_resource_res.o
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
-index 6fcfe96380..f482cae21a 100644
+index de7363e51b..b2b9d01799 100644
 --- a/qmake/generators/win32/mingw_make.cpp
 +++ b/qmake/generators/win32/mingw_make.cpp
-@@ -195,7 +195,7 @@ void MingwMakefileGenerator::init()
+@@ -209,7 +209,7 @@ void MingwMakefileGenerator::init()
 
     processVars();
 
-    project->values("QMAKE_LIBS") += project->values("RES_FILE");
+-    project->values("LIBS") += project->values("RES_FILE");
 +    project->values("OBJECTS") += project->values("RES_FILE");
 
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.19.0
+2.19.2

--- 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 541e805e6c9180089625700f498165d9e3a371d1 Mon Sep 17 00:00:00 2001
+From 941886c8d4ca7655cdd165eeb439d93abcf9eab2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
 Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
@ -15,10 +15,10 @@ files for the debug build an unique file name.
 1 file changed, 3 insertions(+)

 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 6c977b3e0b..412278c8c6 100644
+index 5abf0624f4..a7f1285c26 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3197,6 +3197,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3203,6 +3203,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
         if (dot != -1)
             ret = ret.left(dot);
     }
@ -29,5 +29,5 @@ index 6c977b3e0b..412278c8c6 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.19.0
+2.19.2

--- 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,27 +1,30 @@
-From dc1443e4b4cbc38d31934674b006f0458fe86298 Mon Sep 17 00:00:00 2001
+From 00538d150502debca140f94c2057c1a541b8333f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
 Subject: [PATCH 08/33] Fix linking against shared/static libpng

 Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
- src/gui/configure.json | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ src/gui/configure.json | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 219385a108..d629a45b92 100644
+index 0332631ec8..dbb6f708b0 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -291,7 +291,8 @@
-             "sources": [
+@@ -308,8 +308,10 @@
                 { "type": "pkgConfig", "args": "libpng" },
+                 { "libs": "-llibpng16", "condition": "config.msvc" },
                 { "libs": "-llibpng", "condition": "config.msvc" },
-                { "libs": "-lpng", "condition": "!config.msvc" }
+-                { "libs": "-lpng16", "condition": "!config.msvc" },
+-                { "libs": "-lpng", "condition": "!config.msvc" },
+                { "libs": "-lpng16 -lz", "condition": "!config.msvc && !features.shared" },
 +                { "libs": "-lpng -lz", "condition": "!config.msvc && !features.shared" },
-+                { "libs": "-lpng", "condition": "!config.msvc && features.shared" }
+                { "libs": "-lpng16", "condition": "!config.msvc && features.shared" },
+                { "libs": "-lpng", "condition": "!config.msvc && features.shared" },
+                 { "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" }
             ],
             "use": [
-                 { "lib": "zlib", "condition": "features.system-zlib" }
 -- 
-2.19.0
+2.19.2

--- 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 ce8a5ec429efd173899f3a545ca527085c929daf Mon Sep 17 00:00:00 2001
+From 3acf388e10fd40909af87cfdba35768f2be26be6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
 Subject: [PATCH 09/33] Fix linking against static D-Bus
@ -9,17 +9,16 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus
 2 files changed, 11 insertions(+), 2 deletions(-)

 diff --git a/configure.json b/configure.json
-index 2dc79137e8..68fed05289 100644
+index 522bd34e9b..17446b6c21 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -172,18 +172,23 @@
-                     "CONFIG(debug, debug|release): \\",
-                     "    LIBS += $$LIBS_DEBUG",
-                     "else: \\",
-                    "    LIBS += $$LIBS_RELEASE"
-+                    "    LIBS += $$LIBS_RELEASE",
-+                    "static: DEFINES += DBUS_STATIC_BUILD"
-                 ]
+@@ -170,17 +170,22 @@
+             "label": "D-Bus >= 1.2",
+             "test": {
+                 "include": "dbus/dbus.h",
+-                "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);"
+                "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);",
+                "qmake": "static: DEFINES += DBUS_STATIC_BUILD"
             },
             "sources": [
                 { "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
@ -39,7 +38,7 @@ index 2dc79137e8..68fed05289 100644
                 { "libs": "-ldbus-1", "condition": "!config.win32" }
             ]
 diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
-index 9eaebe6d7e..ac1b1d977b 100644
+index 7cce0d71aa..4d3d774d45 100644
 --- a/src/dbus/qdbus_symbols_p.h
 +++ b/src/dbus/qdbus_symbols_p.h
@@ -57,6 +57,10 @@
@ -54,5 +53,5 @@ index 9eaebe6d7e..ac1b1d977b 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.19.0
+2.19.2

--- 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 6db371f6604d00b31d797447bfc6be93091637c9 Mon Sep 17 00:00:00 2001
+From 27a1638bad652da1e73bbe1533aca8b625eeda4d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
 Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
@ -12,10 +12,10 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/configure.json b/configure.json
-index 68fed05289..bcd226f852 100644
+index 17446b6c21..5b37371a7b 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -185,7 +185,7 @@
+@@ -182,7 +182,7 @@
                 {
                     "libs": "",
                     "builds": {
@ -25,5 +25,5 @@ index 68fed05289..bcd226f852 100644
                     },
                     "condition": "config.win32 && features.shared"
 -- 
-2.19.0
+2.19.2

--- 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,30 +1,32 @@
-From 0ca7e00a0ab483f3050349db030afab902d389c2 Mon Sep 17 00:00:00 2001
+From f4d9c0c1b22a122df1393b47d485a0f4416ad8bc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
 Subject: [PATCH 11/33] Fix linking against static freetype2

 ---
- src/gui/configure.json | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
+ src/gui/configure.json | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index d629a45b92..afa3d95f39 100644
+index dbb6f708b0..a7ffa0f113 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -158,8 +158,11 @@
+@@ -163,9 +163,12 @@
                 ]
             },
             "sources": [
 -                { "type": "pkgConfig", "args": "freetype2" },
-                { "type": "freetype", "libs": "-lfreetype" }
+-                { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
+-                { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
 +                { "type": "pkgConfig", "args": "--static --libs freetype2", "condition": "!features.shared" },
 +                { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" },
-+                { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared" },
-+                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared" },
-+                { "libs": "-lfreetype", "condition": "features.shared" }
+                { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
+                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
+                { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
+                { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "features.shared && config.wasm" }
             ]
         },
         "fontconfig": {
 -- 
-2.19.0
+2.19.2

--- 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 0118d791f8fba7fdadc92ed6884b2ff4de7abf22 Mon Sep 17 00:00:00 2001
+From dbb80749d9fa50db27c240769aa9f59b24067f3f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
 Subject: [PATCH 12/33] Fix linking against static harfbuzz
@ -8,10 +8,10 @@ Subject: [PATCH 12/33] 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 afa3d95f39..a2b0a00d09 100644
+index a7ffa0f113..796cd5aaa7 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -218,7 +218,11 @@
+@@ -227,7 +227,11 @@
                 ]
             },
             "sources": [
@ -25,5 +25,5 @@ index afa3d95f39..a2b0a00d09 100644
         },
         "imf": {
 -- 
-2.19.0
+2.19.2

--- 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 c9383537c6d1c47aa0d435be4c6db1ee88d26bff Mon Sep 17 00:00:00 2001
+From 4d4b4bede0fbdd326c41333e3605225cafd8861a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
 Subject: [PATCH 13/33] Fix linking against static pcre
@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 1 file changed, 4 insertions(+)

 diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
-index 13eff07c04..ea747244da 100644
+index 908e7ff0d6..e5786a10cf 100644
 --- a/src/corelib/tools/qregularexpression.cpp
 +++ b/src/corelib/tools/qregularexpression.cpp
@@ -53,6 +53,10 @@
@ -24,5 +24,5 @@ index 13eff07c04..ea747244da 100644
 #include <pcre2.h>
 
 -- 
-2.19.0
+2.19.2

--- 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 b701eb9c3dcb206435726d0405fa152655231dcb Mon Sep 17 00:00:00 2001
+From c0ac12f99fde7a3a4d6355e68c631fbac5356f82 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
@ -9,7 +9,7 @@ Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 1 file changed, 3 insertions(+)

 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index 234f880579..4619db4a54 100644
+index 4802d3b04d..fac6be7301 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
@@ -69,6 +69,9 @@
@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644
                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.19.0
+2.19.2

--- 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 ee6b2158ed83ed926ba3f17f7c520fb889ef74ac Mon Sep 17 00:00:00 2001
+From e9810c35b4a294691ffea20dd51ba8ef2faf41ed Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
@ -8,7 +8,7 @@ Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
 1 file changed, 3 insertions(+), 2 deletions(-)

 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index 4619db4a54..ef0d45f6cc 100644
+index fac6be7301..305aac405c 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
@@ -91,9 +91,10 @@
@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644
             ]
         },
 -- 
-2.19.0
+2.19.2

--- 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 1bb8814307183b3311c99e0e4987ea0d84d487f2 Mon Sep 17 00:00:00 2001
+From 23c9fc7eaa3164d47e0c6049e61bfeec0bd30a0f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
 Subject: [PATCH 16/33] Rename qtmain to qt5main
@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644
 
 CONFIG += static
 -- 
-2.19.0
+2.19.2

--- 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 337a71fdb496c2228ee5564d5c12498b6b7d498d Mon Sep 17 00:00:00 2001
+From 29f7e60d2712d9229d96d5aa1ec3fd0253075bca Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
 Subject: [PATCH 17/33] Build dynamic host libraries
@ -14,7 +14,7 @@ Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b
 2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 8c7adc45eb..8dd69efee6 100644
+index 51b5bde67a..70919e98e9 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
@@ -25,7 +25,7 @@ requires(!$$skip)
@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.19.0
+2.19.2

--- 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 664fce69abcad0d7c10013b51b42a1a34c27f279 Mon Sep 17 00:00:00 2001
+From 9baddb1d9432c91c6f4e7f8687d13fa7e38308d3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
 Subject: [PATCH 18/33] Enable rpath for build tools
@ -13,18 +13,18 @@ Change-Id: I9808062a66406cdec7446a75150b40b2f30038c7
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
-index 883f8ca215..786f2e660c 100644
+index 8354f30eea..30e8cf18c5 100644
 --- a/mkspecs/features/qt_app.prf
 +++ b/mkspecs/features/qt_app.prf
-@@ -24,6 +24,7 @@ isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
- QMAKE_LFLAGS += $$QMAKE_LFLAGS_GCSECTIONS
+@@ -21,6 +21,7 @@ isEmpty(QMAKE_TARGET_DESCRIPTION): \
+ isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
 
 host_build: QT -= gui   # no host tool will ever use gui
 +host_build: QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS/dev] # force rpath
 host_build:force_bootstrap {
     !build_pass:qtConfig(release_tools): CONFIG += release
     contains(QT, core(-private)?|xml) {
-@@ -34,7 +35,6 @@ host_build:force_bootstrap {
+@@ -31,7 +32,6 @@ host_build:force_bootstrap {
 } else {
     !build_pass:qtConfig(debug_and_release): CONFIG += release
     target.path = $$[QT_INSTALL_BINS]
@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644
 INSTALLS += target
 
 -- 
-2.19.0
+2.19.2

--- 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 ec1d27f7cb06c118e81335f4614559db92256fd5 Mon Sep 17 00:00:00 2001
+From f844ba34e2c4d29613345477dee10fa883275fd4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
 Subject: [PATCH 19/33] Use system zlib for build tools
@ -8,10 +8,10 @@ Subject: [PATCH 19/33] Use system zlib for build tools
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index a45382106a..17b9828581 100644
+index 83e44ff9a4..6b1db38486 100644
 --- a/src/tools/bootstrap/bootstrap.pro
 +++ b/src/tools/bootstrap/bootstrap.pro
-@@ -133,7 +133,7 @@ macx {
+@@ -135,7 +135,7 @@ macx {
         ../../corelib/io/qstandardpaths_win.cpp
 }
 
@ -21,5 +21,5 @@ index a45382106a..17b9828581 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.19.0
+2.19.2

--- 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 75c9cbfab1967e472ced8730e561b062a30c4d9d Mon Sep 17 00:00:00 2001
+From 47c3ea27e0aba1475c450dcc590f01846b054a07 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 20/33] Use *.dll.a as import lib extension
@ -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 dec0931bd4..cd64cb0c4f 100644
+index 37eee7fca3..59b394ca51 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
@@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
@ -46,10 +46,10 @@ index dec0931bd4..cd64cb0c4f 100644
 +    impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
 +  }
 +  QList<QMakeLocalFileName> dirs;
-   static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
+   static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
+                                          "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
   for (int i = 0; lflags[i]; i++) {
-     ProStringList &l = project->values(lflags[i]);
-@@ -234,9 +238,12 @@ void Win32MakefileGenerator::fixTargetExt()
+@@ -253,9 +257,12 @@ void Win32MakefileGenerator::fixTargetExt()
     if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
         project->values("TARGET_EXT").append(".exe");
     } else if (project->isActiveConfig("shared")) {
@ -64,5 +64,5 @@ index dec0931bd4..cd64cb0c4f 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.19.0
+2.19.2

--- 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 12168d6839249e51586f3e63e666bd68e1363905 Mon Sep 17 00:00:00 2001
+From c14a296d3385a7d2aafbe793c7c1e49aa48d1b66 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 21/33] 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 6e7f6b76a4..8d6af2fb81 100644
+index 64ed6b9ed8..2cc54d15a2 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -1259,3 +1259,12 @@ defineTest(createConfigStatus) {
+@@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) {
 
 QMAKE_POST_CONFIGURE += \
     "createConfigStatus()"
@ -30,7 +30,7 @@ index 6e7f6b76a4..8d6af2fb81 100644
 +    CONFIG += no_smart_library_merge
 +}
 diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
-index 9eba5bcf00..0f8d03eb2c 100644
+index fbf1f3b8df..c261c46e72 100644
 --- a/mkspecs/features/default_post.prf
 +++ b/mkspecs/features/default_post.prf
@@ -1,5 +1,16 @@
@ -51,10 +51,10 @@ index 9eba5bcf00..0f8d03eb2c 100644
 
 !have_target:!force_qt: CONFIG -= qt
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index b57afcf72d..6eebd068f1 100644
+index d16b3cf1be..2c4d6cd97e 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -259,6 +259,23 @@ for(ever) {
+@@ -268,6 +268,23 @@ for(ever) {
             !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
                 WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
         }
@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644
 QMAKE_EXT_YACC          = .y
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 412278c8c6..dd86df8b91 100644
+index a7f1285c26..879410afef 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3200,6 +3200,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3206,6 +3206,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
     if (project->isActiveConfig("debug")) {
         ret += "d";
     }
@ -114,7 +114,7 @@ index 412278c8c6..dd86df8b91 100644
     ret += Option::pkgcfg_ext;
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
-@@ -3373,9 +3376,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3380,9 +3383,9 @@ MakefileGenerator::writePkgConfigFile()
     t << endl;
 
     // requires
@ -128,5 +128,5 @@ index 412278c8c6..dd86df8b91 100644
 
     t << endl;
 -- 
-2.19.0
+2.19.2

--- 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 f02786f7eea8c88f7cd4761638ae53bcf13d94fe Mon Sep 17 00:00:00 2001
+From f3eab06f0fa50e140a96182b0b7a1555b5e4797c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules
@ -13,7 +13,7 @@ the final application.
 3 files changed, 133 insertions(+), 42 deletions(-)

 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 27f4c277d6..358945b758 100644
+index 3ed6dd5889..15d8b8372e 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -49,35 +49,52 @@ but not all the files it references.
@ -126,9 +126,9 @@ index 27f4c277d6..358945b758 100644
 !!IF !equals(TEMPLATE, aux)
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-@@ -235,6 +286,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
-       INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINES})
+@@ -238,6 +289,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, ";"))
 
 +    # Find plugin targets
 +    file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
@ -183,7 +183,7 @@ index 27f4c277d6..358945b758 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})
-@@ -325,9 +426,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -328,9 +429,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -197,7 +197,7 @@ index 27f4c277d6..358945b758 100644
 !!ENDIF // CMAKE_RELEASE_TYPE
 !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
 
-@@ -338,29 +441,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -341,29 +444,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     )
 !!ENDIF // TEMPLATE != aux
 
@ -251,13 +251,13 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index dd86df8b91..fc7a0927a9 100644
+index 879410afef..2ff4c4f714 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -994,10 +994,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
-             libs << "QMAKE_LIBS"; //obvious one
-         if(project->isActiveConfig("staticlib"))
-             libs << "QMAKE_LIBS_PRIVATE";
+@@ -1016,10 +1016,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
+             libs << "LIBS" << "QMAKE_LIBS";
+         else
+             libs << "LIBS" << "LIBS_PRIVATE" << "QMAKE_LIBS" << "QMAKE_LIBS_PRIVATE";
 -        t << "QMAKE_PRL_LIBS =";
 -        for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
 -            t << qv(project->values((*it).toKey()));
@ -278,5 +278,5 @@ index dd86df8b91..fc7a0927a9 100644
 }
 
 -- 
-2.19.0
+2.19.2

--- 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 191a510dd089ac2d870e989b44a15af535eacb8a Mon Sep 17 00:00:00 2001
+From 682d934b6365e11caca6a2ec45ce97f1888b2806 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 23/33] Allow usage of static version with CMake
@ -244,7 +244,7 @@ index 2a94964b49..839a51f377 100644
 # We are generating cmake files. Most developers of Qt are not aware of cmake,
 # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 358945b758..d123edf665 100644
+index 15d8b8372e..3492133d9b 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)
@ -643,9 +643,9 @@ index 358945b758..d123edf665 100644
 +        INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINES})
 +!!ENDIF
 
-     # Find plugin targets
-     file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
-@@ -298,7 +395,11 @@ 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, ";"))
+@@ -301,7 +398,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         endforeach()
     endif()
 
@ -657,7 +657,7 @@ index 358945b758..d123edf665 100644
         set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
 
 !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-@@ -306,7 +407,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -309,7 +410,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
 !!ENDIF
@ -669,7 +669,7 @@ index 358945b758..d123edf665 100644
         set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
             \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
         )
-@@ -337,16 +442,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -340,16 +445,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     endif()
 
     set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
@ -690,7 +690,7 @@ index 358945b758..d123edf665 100644
         )
         set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
         foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -354,66 +459,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -357,66 +462,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
                 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
             endif()
         endforeach()
@ -781,7 +781,7 @@ index 358945b758..d123edf665 100644
     if (EXISTS
 !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -426,7 +533,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -429,7 +536,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -790,7 +790,7 @@ index 358945b758..d123edf665 100644
     endif()
 !!ENDIF // CMAKE_STATIC_TYPE
 
-@@ -436,19 +543,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -439,19 +546,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 
 !!ENDIF // CMAKE_DEBUG_TYPE
 !!ELSE // TEMPLATE != aux
@ -992,5 +992,5 @@ index 2a575958ae..ca0e3be3b5 100644
     INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
 )
 -- 
-2.19.0
+2.19.2

--- 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 e0197a35c25984f50de023cec5d5dd28391c22b0 Mon Sep 17 00:00:00 2001
+From c6e9aef076e72a4c7dab417d5b15afd28431877a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 24/33] Adjust linker flags for static build with
@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644
 +unset(_isExe)
 +!!ENDIF
 -- 
-2.19.0
+2.19.2

--- 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 cd1074a5c6c3615b89b0abb6f2960d26332dc2a5 Mon Sep 17 00:00:00 2001
+From 8f284db16131394f4532d3d3e19d6a12762b51c4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 25/33] Use correct pkg-config --static flag
@ -8,10 +8,10 @@ Subject: [PATCH 25/33] Use correct pkg-config --static flag
 1 file changed, 3 insertions(+)

 diff --git a/configure.pri b/configure.pri
-index 8d6af2fb81..23b6050d35 100644
+index 2cc54d15a2..449fe4b9b8 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -315,6 +315,9 @@ defineTest(qtConfTest_detectPkgConfig) {
+@@ -329,6 +329,9 @@ defineTest(qtConfTest_detectPkgConfig) {
             qtLog("Found pkg-config from path: $$pkgConfig")
         }
     }
@ -22,5 +22,5 @@ index 8d6af2fb81..23b6050d35 100644
     $$qtConfEvaluate("features.cross_compile") {
         # cross compiling, check that pkg-config is set up sanely
 -- 
-2.19.0
+2.19.2

--- 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 b9ae2c29543c9d9ecc2e5933c2a849fb79f1190d Mon Sep 17 00:00:00 2001
+From 21151358f35b2e052baf54a46f88f44f5797c260 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
 Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c
 2 files changed, 8 insertions(+), 4 deletions(-)

 diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
-index 819b48f973..f11a61be6b 100644
+index 620795d2cf..1e80a47980 100644
 --- a/src/corelib/Qt5CoreMacros.cmake
 +++ b/src/corelib/Qt5CoreMacros.cmake
@@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
@ -53,7 +53,7 @@ index 819b48f973..f11a61be6b 100644
 +                           COMMAND ${MOC_LOC}
                            ARGS ${rcc_options} --name ${outfilename} --output ${outfile} ${infile}
                            MAIN_DEPENDENCY ${infile}
-                            DEPENDS ${_rc_depends} "${out_depends}" VERBATIM)
+                            DEPENDS ${_rc_depends} "${_out_depends}" VERBATIM)
 diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake
 index 737371a5ad..d103278cdf 100644
 --- a/src/widgets/Qt5WidgetsMacros.cmake
@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
           MAIN_DEPENDENCY ${infile} VERBATIM)
         set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
 -- 
-2.19.0
+2.19.2

--- 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 f9d1c593895a0698db00b96ed42c2ba6db464fcf Mon Sep 17 00:00:00 2001
+From c1e7b9eb36751d29aac541ac008f3a14e4d28931 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
 Subject: [PATCH 27/33] Ignore errors about missing feature static
@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best
 2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
-index 021036e4f9..16e8aa631d 100644
+index 0c6c10dded..54c4b568c1 100644
 --- a/mkspecs/features/qt_build_config.prf
 +++ b/mkspecs/features/qt_build_config.prf
-@@ -140,5 +140,5 @@ defineTest(qtConfig) {
+@@ -141,5 +141,5 @@ defineTest(qtConfig) {
         contains(QT.$${module}.disabled_features, $$1): \
             return(false)
     }
@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
 }
 -- 
-2.19.0
+2.19.2

--- 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 54ea8a6b4a956037ad4f03c60f9aee654317c1b4 Mon Sep 17 00:00:00 2001
+From 7a20d588ccc27c9189882c83591bf6a57979a3fb Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
 Subject: [PATCH 28/33] Enable and fix use of iconv
@ -63,10 +63,10 @@ index 330eb7c038..88a782b863 100644
 #else
     char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index dfb575da0d..a630d7abf3 100644
+index 183eb3a13e..a4560d5a60 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
-@@ -539,9 +539,9 @@
+@@ -532,9 +532,9 @@
         },
         "gnu-libiconv": {
             "label": "GNU iconv",
@ -79,5 +79,5 @@ index dfb575da0d..a630d7abf3 100644
         },
         "icu": {
 -- 
-2.19.0
+2.19.2

--- 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 4fba521536c369be187e9e618b3333cf0b2c724a Mon Sep 17 00:00:00 2001
+From 437f342743230d9645840b7e4089f81bdb2cee6e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
 Subject: [PATCH 29/33] Ignore failing pkg-config test
@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best
 1 file changed, 1 deletion(-)

 diff --git a/configure.json b/configure.json
-index bcd226f852..25512db145 100644
+index 5b37371a7b..ac98495157 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -604,7 +604,6 @@
+@@ -646,7 +646,6 @@
         "pkg-config": {
             "label": "Using pkg-config",
             "autoDetect": "!config.darwin && !config.win32",
@ -21,5 +21,5 @@ index bcd226f852..25512db145 100644
                 "publicFeature",
                 { "type": "publicQtConfig", "negative": true },
 -- 
-2.19.0
+2.19.2

--- 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 c4f29e97fd87f1f6790708d21247dd6c333167c9 Mon Sep 17 00:00:00 2001
+From f14f1928ace664034aeac5d348883a93f35b2ea5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
 Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
@ -11,10 +11,10 @@ static freetype2 and harfbuzz
 2 files changed, 6 insertions(+)

 diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index 894020d2bd..5f57d6f5cb 100644
+index 50ec8db79e..50789b3b9c 100644
 --- a/qmake/generators/unix/unixmake.cpp
 +++ b/qmake/generators/unix/unixmake.cpp
-@@ -414,6 +414,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
+@@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
 bool
 UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
 {
@ -25,7 +25,7 @@ index 894020d2bd..5f57d6f5cb 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 cd64cb0c4f..c63d8b5754 100644
+index 59b394ca51..7788862142 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 cd64cb0c4f..c63d8b5754 100644
 +    return false; // prevent qmake from messing static lib dependencies
 +  }
   QList<QMakeLocalFileName> dirs;
-   static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
-   for (int i = 0; lflags[i]; i++) {
+   static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
+                                          "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
 -- 
-2.19.0
+2.19.2

--- 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 dacff81f228db7dd158e4f2bdc2dae02175aea5f Mon Sep 17 00:00:00 2001
+From b8d30f6d8f98db183a28e60e684f33ed094b326c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
 Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
@ -149,5 +149,5 @@ index 174bc7b609..e66488e364 100644
 include(windows.pri)
 
 -- 
-2.19.0
+2.19.2

--- 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 58dedf7fb76457bba9a1fc0f2a9d4a28c9a3e356 Mon Sep 17 00:00:00 2001
+From e8da100dec44bc38ec5eb9675f231c5d14d2e62f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
 Subject: [PATCH 32/33] Fix linking against static plugins with qmake
@ -11,7 +11,7 @@ approach
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 6eebd068f1..310b8713f0 100644
+index 2c4d6cd97e..a15ab81899 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
@@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d
@ -33,5 +33,5 @@ index 6eebd068f1..310b8713f0 100644
         # Check if the plugin is known to Qt. We can use this to determine
         # the plugin path. Unknown plugins must rely on the default link path.
 -- 
-2.19.0
+2.19.2

--- 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 244213d3b887fcd16d345f0797fb1b8c8414cd46 Mon Sep 17 00:00:00 2001
+From c26a40fd24523774bba4f4edd58f68eede33c7b5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 May 2018 03:47:14 +0200
 Subject: [PATCH 33/33] 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 ebf9864b15..2fb04ab12a 100644
+index 23e5e499b2..12030eba08 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
@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644
 #else
     return false;
 -- 
-2.19.0
+2.19.2

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

 pkgname=mingw-w64-qt5-base-angle
-pkgver=5.11.2
-pkgrel=2
+pkgver=5.12.0
+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
 isStatic && arch=('any') || arch=('i686' 'x86_64')
@ -85,40 +85,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
        '0031-Hardcode-linker-flags-for-platform-plugins.patch'
        '0032-Fix-linking-against-static-plugins-with-qmake.patch'
        '0033-Disable-hardware-randomizer-for-32-bit.patch')
-sha256sums=('6381e7c3468d5a1dcfe3683b29eeced192faa0f8a32434fec071a59b8bcd0107'
-            '3036fb04baa54d010dce053059dd780322f1d2925d42bdb6d9762539b1581e62'
-            '0861dc21d857eeddbc992f63f66590baade93e049b1ea385a34b8896e231cbd0'
-            'cff8b6b146bc20faaa1f7dc25e88f6f3dd71657d2b80d5b3b15c0949026fc4aa'
-            '76ea9cd3ab0d9308fb57bff0bd82490ec3da95e3e5f96d452fe62206daff300d'
-            '626790dc110b0c70989e57dbdb42dd1cc5757c2360d6e7714624fbdee6e8dae1'
-            '96d94a7aae914f3706a820ad074bbd32e884154c1bebba3f3e631920fe0fbd59'
-            '6bbdf39b2682002d4f4972b395f49d17acee607f92df00734faf53c4930de2d9'
-            '3c1df53016e40b00dbe8ef132b50730fadf412534135a114628612f4c55fe6b7'
-            '02966be361050075382e3a3ad83e4eb13d7b135aadb95d43b2bde443c39506aa'
-            '230e4bf22051a79d36285178c8e294e479e81a5480d8791b53ab090a87b8d5e7'
-            '7f6a16f8d2108bc96b58a1fcb695da342f71bd47de24f5b20b9412319e4e35ad'
-            '49a6571dca2333c04658f47e7f0971ffaa45d8c8664cc7dded63d8f29b80bfb2'
-            '32333bd89e86efba6333897f77dbd61464ea8130013248b37c5927eb3c79efdc'
-            '4b7c018cc7335639df7b3819132d5d32906a5fa0796c2caf4428993f16697882'
-            'a6086ef73d1b2ac079b06f2ce1059458af1f033efa7a2e5e684c97d64d418296'
-            '82787b2bac35de3992bb36816ee0bd30117a3e8679d0cffc2aabe7c551c5f4cb'
-            'dcee7f38ce40aec00e8ecce72b9a3c07e6d0bf838049c4bbb80f33448e34038b'
-            '49b332039ef6ba074c58fd7149df70003a7e69c61ed1519df6a0f16635848843'
-            'c345fd741f71c9e728ea88e4c86640c522d7cc0c9f0e39cee5812a2ea41c51e5'
-            '55ffc1bc12d449cb80fa5be4891e4ebdba4a41c62a5953b13dfc8fb75c153de4'
-            'af990f18952df3372f42112f68f13ceab9a46feb50c115ea548b44822b841e29'
-            '843e78560e7d09b86979f928e16d1ed56595d6f660d4dc95d4888a56978b9d43'
-            'c8fc2495f4d99d460020c362dbf78e6faba2c60c65580f8d06f59fe6e85d7e19'
-            '0be553d337ecc23b1a1bc8df019beaa300b3e0d0bffa8d68e6401f5cbfa79b21'
-            '03ff8e2ca617a5852ce9b0c99eab6c5866e00c5099e62e4c583af6e68b03c076'
-            '3e6d0ed72cf9817dd7508b5403c1bbbdde91f6a59725c8e5250abe8fc66b5a03'
-            '16fd7e1dc7afb830d984b1d6c112c632e4190f610cdee48d36bd0313e1c19634'
-            'd28476f714a02671acaa02ce0c3a462efd2917aa02d9add004e1d5935f795e76'
-            '4cbaddd05144010a681d370573d98130af909adedbc761728d0842af3be84a1d'
-            '9bf58d9378fcdd5a1af5e272f2ef19c3b2ec6b020bcb2b78ec808e7adcc8f032'
-            'ca1b066b22af17192b59ce7f0ca3a83bda7c6a8c7f023537c37c1b5c4a388984'
-            'd33e97f491ec8773922ccdd9df25ef3f532c00edf48bab858cef99a60edcf8fe'
-            '550082fea34c12c9df92c73ac1c7ae23ee7ef454799403fda0d495f5d8d92be4')
+sha256sums=('5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb'
+            '98aeb35835e44f0311bf40969ead841163f8650c869cacf9c455ad87bf9e7d0a'
+            '0290db9520f2c9255a01d3ee313ff8d1925f89c50d8b5fd4283882b62b299541'
+            '02db1e6a3ac0ea7ad8aa15275920aeac50389dc0e7355a2280e36aa957234167'
+            'a45fd65bd2c9f57361e1e68cab60132abf192b0508cc1d1559ee2abab2a91a86'
+            'c2f21de21481189f610a95ad2efaf6d1845ef640ad8aa3ffb1c8a138a46ed50d'
+            'df6975315f2f7a4a38d75baa6e4cf12d6e2759c8e16e57be81016cfe8a94de96'
+            '01e478ff9fa20d38372bc6b4907264ad838b5de366737d907c5986459aff0209'
+            'a52f036860850960e4af3adcc1e38cb708c28358e7de01decb20cc76b9d62d5d'
+            '374e8e4f6afff9a0f49f02faadd361cf3df947452f9a0fa450c24baff920fc5d'
+            '91b899ef0b2e4b716324ea1942fbd0d6c18c55ba21f37d65c253f893ec312990'
+            '2bf1b91ebaca6647908a00f639477803f5c432b06a1e9550826ccad0f6d4deb9'
+            '2aea9f55f77d93b041d102b82060c3625e59e4e6324ea83ffe0821ca5e082a1a'
+            'db93259fe8fea464b22f5c8ca550edc0eebb6df0572574a1246cc4b9926251ee'
+            '4304fa46b78615b912d8727a40fc39b836b2a4762442b29b7c8b2a8547ed4ea0'
+            'b59bd5c1d0572466e76222cd5fda2a160dcde55a8bd65eacaecbe334ea567e16'
+            'b339686494a3417a9263e93eb7623a544669861b57e4312d82d468062a9d3e6c'
+            'c96c61d974e50b35cffe8391966c9641cca4f3ddef2bab4b016239169ab484c4'
+            '295a965cfea15454e4f207afad47f02dac771f96a17a00867d3a7f0f0ee1ba20'
+            'f165f53ffa069b677238c75a020466fa3e170edfbbb5ca3c312e2a014fec5607'
+            'd45fed111601f21b6866b607925ae59c9842850f8d9531fc13808fc0de7f1e3a'
+            '795700751790b164fb2062263e6681073acc3ef4d71ea50bb0a70510b9ff2018'
+            '4b50d30b3b18aa6f397c2a7651aa58bca3fdf2234bed3a44c507939bc2edb00a'
+            '3485baf0fd0a1402119ec6bd16ba23e53731ea75e6d881f88aa15933cedc19c3'
+            '54c310eae3e5ca6bfbb2cb6d058fac81c523a2cf0123797d7a4d70b8272ab35f'
+            '2f6175cacbf4982e624d8f0233803ae471b08e14d0fa971607517b4120e75493'
+            '10d1712857531d277d314c95c0026b88df28f9b956dc5491e532858070e7f6da'
+            'de214043a544b89d60101b67142d586cd4d2d61b9c84cf54d0652ce5b6d34f7e'
+            '9cb1e05a00c0cf4486cc7bcc92a960f216694387b5098dad51584e9cfe882897'
+            '9ff94ccfcf951c970e39ecde11b21c298ea839785ab27db9abd9379963b82c23'
+            '6b0e3ed44996bf72230875767b3dde9bcabb1c2496badd95dc5ce8ea796ab5ba'
+            '17fd194dfc5f630d4b98afcafb78d4c89d16d5cea40c3c4096e32956a1e87104'
+            'c808a350cae7a7cc899ec3d496f5e3522a4dbefcd6adf41abcf46621be9468b7'
+            '2aeefe22f926d37c467324bfa015cc33df9a05fa8aee318132fd566e9b66eb09')

 _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 2658fe5a2166aa8893701e65e71dd7bdb16d9180 Mon Sep 17 00:00:00 2001
+From 916b6a82bc084162432f9ed36934940892679ebd Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
@ -163,5 +163,5 @@ index ed131c6823..b77d86cd6b 100644
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.19.0
+2.19.2

--- 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 39c6529c65ebf9e9af4d54cec6ac45a61f4ba618 Mon Sep 17 00:00:00 2001
+From cf9119f68b3e575ef07853ab177259f4ef044e0b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
 Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
@ -9,7 +9,7 @@ FIXME: Not sure whether this is still required
 1 file changed, 2 deletions(-)

 diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
-index 1a43f13d9b..a4c954a453 100644
+index 00287b0665..35ad3007d1 100644
 --- a/src/gui/opengl/qopenglfunctions.h
 +++ b/src/gui/opengl/qopenglfunctions.h
@@ -56,9 +56,7 @@
@ -23,5 +23,5 @@ index 1a43f13d9b..a4c954a453 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.19.0
+2.19.2

--- 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 b0a8c226931a787ec4214686827bcb9b1d7f873f Mon Sep 17 00:00:00 2001
+From dcfdcfea110398d0ce98c184b975f59354d4528b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
 Subject: [PATCH 03/33] Use external ANGLE library
@ -28,7 +28,7 @@ index 07869efd7d..2e32911a64 100644
 
 _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
 diff --git a/src/gui/gui.pro b/src/gui/gui.pro
-index 759d6f3cbf..1ddcf1db78 100644
+index 06c9cd3939..cb1314c1ef 100644
 --- a/src/gui/gui.pro
 +++ b/src/gui/gui.pro
@@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
@ -66,7 +66,7 @@ index 8b2349ff2f..f5e43c6adc 100644
 HEADERS += qgl.h \
            qgl_p.h \
 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index f4c396f7c5..fc87e810aa 100644
+index db06a6a2a3..25c00ed17b 100644
 --- a/src/plugins/platforms/windows/windows.pri
 +++ b/src/plugins/platforms/windows/windows.pri
@@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
@ -93,5 +93,5 @@ index 1c76a2e46f..6a5f046b34 100644
         SUBDIRS += src_3rdparty_libpng
         src_3rdparty_freetype.depends += src_3rdparty_libpng
 -- 
-2.19.0
+2.19.2

--- 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 baee6baceceaa4abb8a9ea909771bcac6da04e05 Mon Sep 17 00:00:00 2001
+From 42ab8012488408bfb6ab77fb056b27f3400d40ce Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
 Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
@ -11,7 +11,7 @@ Hence the assembler option -mbig-obj is required.
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri
-index 4c778b184e..1dd1755d7f 100644
+index 24758afdeb..aa04b4a672 100644
 --- a/src/gui/opengl/opengl.pri
 +++ b/src/gui/opengl/opengl.pri
@@ -3,7 +3,8 @@
@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644
     HEADERS += opengl/qopengl.h \
                opengl/qopengl_p.h \
 -- 
-2.19.0
+2.19.2

--- 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 4b8467ce1b3c487b69e9f9016fa26044853fb6aa Mon Sep 17 00:00:00 2001
+From 07fa0fe80bd49e335ff8663ee8c67aa6b0f042c8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
 Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
@ -10,10 +10,10 @@ Subject: [PATCH 05/33] 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 73e09a1025..6c977b3e0b 100644
+index b7e591d2ab..5abf0624f4 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3183,7 +3183,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3189,7 +3189,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
 }
 
 QString
@ -22,7 +22,7 @@ index 73e09a1025..6c977b3e0b 100644
 {
     QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
     if (ret.isEmpty()) {
-@@ -3208,7 +3208,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3214,7 +3214,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
     if(fixify) {
         if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
             ret.prepend(project->first("DESTDIR").toQString());
@ -36,7 +36,7 @@ index 73e09a1025..6c977b3e0b 100644
     return ret;
 }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index f32bec650e..17fed7f8c8 100644
+index b5c150e1cb..afb0e91381 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
@@ -89,7 +89,7 @@ protected:
@ -49,10 +49,10 @@ index f32bec650e..17fed7f8c8 100644
     void writePkgConfigFile();   // for pkg-config
 
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index bca27b7044..dec0931bd4 100644
+index e0d03ccc1c..37eee7fca3 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -726,7 +726,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -747,7 +747,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
                 }
                 if(!ret.isEmpty())
                     ret += "\n\t";
@ -62,5 +62,5 @@ index bca27b7044..dec0931bd4 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.19.0
+2.19.2

--- 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 346528ea0e3b2966e798b9492b72b087561781af Mon Sep 17 00:00:00 2001
+From f02b2a6ef057ac969eb813735a88e3dfedf924a2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
 Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
@ -11,18 +11,18 @@ like .obj/debug/Qt5Cored_resource_res.o
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
-index 6fcfe96380..f482cae21a 100644
+index de7363e51b..b2b9d01799 100644
 --- a/qmake/generators/win32/mingw_make.cpp
 +++ b/qmake/generators/win32/mingw_make.cpp
-@@ -195,7 +195,7 @@ void MingwMakefileGenerator::init()
+@@ -209,7 +209,7 @@ void MingwMakefileGenerator::init()
 
     processVars();
 
-    project->values("QMAKE_LIBS") += project->values("RES_FILE");
+-    project->values("LIBS") += project->values("RES_FILE");
 +    project->values("OBJECTS") += project->values("RES_FILE");
 
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.19.0
+2.19.2

--- 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 541e805e6c9180089625700f498165d9e3a371d1 Mon Sep 17 00:00:00 2001
+From 941886c8d4ca7655cdd165eeb439d93abcf9eab2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
 Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
@ -15,10 +15,10 @@ files for the debug build an unique file name.
 1 file changed, 3 insertions(+)

 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 6c977b3e0b..412278c8c6 100644
+index 5abf0624f4..a7f1285c26 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3197,6 +3197,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3203,6 +3203,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
         if (dot != -1)
             ret = ret.left(dot);
     }
@ -29,5 +29,5 @@ index 6c977b3e0b..412278c8c6 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.19.0
+2.19.2

--- 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,27 +1,30 @@
-From dc1443e4b4cbc38d31934674b006f0458fe86298 Mon Sep 17 00:00:00 2001
+From 00538d150502debca140f94c2057c1a541b8333f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
 Subject: [PATCH 08/33] Fix linking against shared/static libpng

 Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
- src/gui/configure.json | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ src/gui/configure.json | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 219385a108..d629a45b92 100644
+index 0332631ec8..dbb6f708b0 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -291,7 +291,8 @@
-             "sources": [
+@@ -308,8 +308,10 @@
                 { "type": "pkgConfig", "args": "libpng" },
+                 { "libs": "-llibpng16", "condition": "config.msvc" },
                 { "libs": "-llibpng", "condition": "config.msvc" },
-                { "libs": "-lpng", "condition": "!config.msvc" }
+-                { "libs": "-lpng16", "condition": "!config.msvc" },
+-                { "libs": "-lpng", "condition": "!config.msvc" },
+                { "libs": "-lpng16 -lz", "condition": "!config.msvc && !features.shared" },
 +                { "libs": "-lpng -lz", "condition": "!config.msvc && !features.shared" },
-+                { "libs": "-lpng", "condition": "!config.msvc && features.shared" }
+                { "libs": "-lpng16", "condition": "!config.msvc && features.shared" },
+                { "libs": "-lpng", "condition": "!config.msvc && features.shared" },
+                 { "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" }
             ],
             "use": [
-                 { "lib": "zlib", "condition": "features.system-zlib" }
 -- 
-2.19.0
+2.19.2

--- 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 ce8a5ec429efd173899f3a545ca527085c929daf Mon Sep 17 00:00:00 2001
+From 3acf388e10fd40909af87cfdba35768f2be26be6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
 Subject: [PATCH 09/33] Fix linking against static D-Bus
@ -9,17 +9,16 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus
 2 files changed, 11 insertions(+), 2 deletions(-)

 diff --git a/configure.json b/configure.json
-index 2dc79137e8..68fed05289 100644
+index 522bd34e9b..17446b6c21 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -172,18 +172,23 @@
-                     "CONFIG(debug, debug|release): \\",
-                     "    LIBS += $$LIBS_DEBUG",
-                     "else: \\",
-                    "    LIBS += $$LIBS_RELEASE"
-+                    "    LIBS += $$LIBS_RELEASE",
-+                    "static: DEFINES += DBUS_STATIC_BUILD"
-                 ]
+@@ -170,17 +170,22 @@
+             "label": "D-Bus >= 1.2",
+             "test": {
+                 "include": "dbus/dbus.h",
+-                "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);"
+                "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);",
+                "qmake": "static: DEFINES += DBUS_STATIC_BUILD"
             },
             "sources": [
                 { "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
@ -39,7 +38,7 @@ index 2dc79137e8..68fed05289 100644
                 { "libs": "-ldbus-1", "condition": "!config.win32" }
             ]
 diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
-index 9eaebe6d7e..ac1b1d977b 100644
+index 7cce0d71aa..4d3d774d45 100644
 --- a/src/dbus/qdbus_symbols_p.h
 +++ b/src/dbus/qdbus_symbols_p.h
@@ -57,6 +57,10 @@
@ -54,5 +53,5 @@ index 9eaebe6d7e..ac1b1d977b 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.19.0
+2.19.2

--- 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 6db371f6604d00b31d797447bfc6be93091637c9 Mon Sep 17 00:00:00 2001
+From 27a1638bad652da1e73bbe1533aca8b625eeda4d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
 Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
@ -12,10 +12,10 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/configure.json b/configure.json
-index 68fed05289..bcd226f852 100644
+index 17446b6c21..5b37371a7b 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -185,7 +185,7 @@
+@@ -182,7 +182,7 @@
                 {
                     "libs": "",
                     "builds": {
@ -25,5 +25,5 @@ index 68fed05289..bcd226f852 100644
                     },
                     "condition": "config.win32 && features.shared"
 -- 
-2.19.0
+2.19.2

--- 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,30 +1,32 @@
-From 0ca7e00a0ab483f3050349db030afab902d389c2 Mon Sep 17 00:00:00 2001
+From f4d9c0c1b22a122df1393b47d485a0f4416ad8bc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
 Subject: [PATCH 11/33] Fix linking against static freetype2

 ---
- src/gui/configure.json | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
+ src/gui/configure.json | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index d629a45b92..afa3d95f39 100644
+index dbb6f708b0..a7ffa0f113 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -158,8 +158,11 @@
+@@ -163,9 +163,12 @@
                 ]
             },
             "sources": [
 -                { "type": "pkgConfig", "args": "freetype2" },
-                { "type": "freetype", "libs": "-lfreetype" }
+-                { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
+-                { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
 +                { "type": "pkgConfig", "args": "--static --libs freetype2", "condition": "!features.shared" },
 +                { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" },
-+                { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared" },
-+                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared" },
-+                { "libs": "-lfreetype", "condition": "features.shared" }
+                { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
+                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
+                { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
+                { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "features.shared && config.wasm" }
             ]
         },
         "fontconfig": {
 -- 
-2.19.0
+2.19.2

--- 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 0118d791f8fba7fdadc92ed6884b2ff4de7abf22 Mon Sep 17 00:00:00 2001
+From dbb80749d9fa50db27c240769aa9f59b24067f3f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
 Subject: [PATCH 12/33] Fix linking against static harfbuzz
@ -8,10 +8,10 @@ Subject: [PATCH 12/33] 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 afa3d95f39..a2b0a00d09 100644
+index a7ffa0f113..796cd5aaa7 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -218,7 +218,11 @@
+@@ -227,7 +227,11 @@
                 ]
             },
             "sources": [
@ -25,5 +25,5 @@ index afa3d95f39..a2b0a00d09 100644
         },
         "imf": {
 -- 
-2.19.0
+2.19.2

--- 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 c9383537c6d1c47aa0d435be4c6db1ee88d26bff Mon Sep 17 00:00:00 2001
+From 4d4b4bede0fbdd326c41333e3605225cafd8861a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
 Subject: [PATCH 13/33] Fix linking against static pcre
@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 1 file changed, 4 insertions(+)

 diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
-index 13eff07c04..ea747244da 100644
+index 908e7ff0d6..e5786a10cf 100644
 --- a/src/corelib/tools/qregularexpression.cpp
 +++ b/src/corelib/tools/qregularexpression.cpp
@@ -53,6 +53,10 @@
@ -24,5 +24,5 @@ index 13eff07c04..ea747244da 100644
 #include <pcre2.h>
 
 -- 
-2.19.0
+2.19.2

--- 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 b701eb9c3dcb206435726d0405fa152655231dcb Mon Sep 17 00:00:00 2001
+From c0ac12f99fde7a3a4d6355e68c631fbac5356f82 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
@ -9,7 +9,7 @@ Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 1 file changed, 3 insertions(+)

 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index 234f880579..4619db4a54 100644
+index 4802d3b04d..fac6be7301 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
@@ -69,6 +69,9 @@
@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644
                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.19.0
+2.19.2

--- 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 ee6b2158ed83ed926ba3f17f7c520fb889ef74ac Mon Sep 17 00:00:00 2001
+From e9810c35b4a294691ffea20dd51ba8ef2faf41ed Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
@ -8,7 +8,7 @@ Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
 1 file changed, 3 insertions(+), 2 deletions(-)

 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index 4619db4a54..ef0d45f6cc 100644
+index fac6be7301..305aac405c 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
@@ -91,9 +91,10 @@
@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644
             ]
         },
 -- 
-2.19.0
+2.19.2

--- 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 1bb8814307183b3311c99e0e4987ea0d84d487f2 Mon Sep 17 00:00:00 2001
+From 23c9fc7eaa3164d47e0c6049e61bfeec0bd30a0f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
 Subject: [PATCH 16/33] Rename qtmain to qt5main
@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644
 
 CONFIG += static
 -- 
-2.19.0
+2.19.2

--- 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 337a71fdb496c2228ee5564d5c12498b6b7d498d Mon Sep 17 00:00:00 2001
+From 29f7e60d2712d9229d96d5aa1ec3fd0253075bca Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
 Subject: [PATCH 17/33] Build dynamic host libraries
@ -14,7 +14,7 @@ Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b
 2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 8c7adc45eb..8dd69efee6 100644
+index 51b5bde67a..70919e98e9 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
@@ -25,7 +25,7 @@ requires(!$$skip)
@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.19.0
+2.19.2

--- 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 664fce69abcad0d7c10013b51b42a1a34c27f279 Mon Sep 17 00:00:00 2001
+From 9baddb1d9432c91c6f4e7f8687d13fa7e38308d3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
 Subject: [PATCH 18/33] Enable rpath for build tools
@ -13,18 +13,18 @@ Change-Id: I9808062a66406cdec7446a75150b40b2f30038c7
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
-index 883f8ca215..786f2e660c 100644
+index 8354f30eea..30e8cf18c5 100644
 --- a/mkspecs/features/qt_app.prf
 +++ b/mkspecs/features/qt_app.prf
-@@ -24,6 +24,7 @@ isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
- QMAKE_LFLAGS += $$QMAKE_LFLAGS_GCSECTIONS
+@@ -21,6 +21,7 @@ isEmpty(QMAKE_TARGET_DESCRIPTION): \
+ isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
 
 host_build: QT -= gui   # no host tool will ever use gui
 +host_build: QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS/dev] # force rpath
 host_build:force_bootstrap {
     !build_pass:qtConfig(release_tools): CONFIG += release
     contains(QT, core(-private)?|xml) {
-@@ -34,7 +35,6 @@ host_build:force_bootstrap {
+@@ -31,7 +32,6 @@ host_build:force_bootstrap {
 } else {
     !build_pass:qtConfig(debug_and_release): CONFIG += release
     target.path = $$[QT_INSTALL_BINS]
@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644
 INSTALLS += target
 
 -- 
-2.19.0
+2.19.2

--- 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 ec1d27f7cb06c118e81335f4614559db92256fd5 Mon Sep 17 00:00:00 2001
+From f844ba34e2c4d29613345477dee10fa883275fd4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
 Subject: [PATCH 19/33] Use system zlib for build tools
@ -8,10 +8,10 @@ Subject: [PATCH 19/33] Use system zlib for build tools
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index a45382106a..17b9828581 100644
+index 83e44ff9a4..6b1db38486 100644
 --- a/src/tools/bootstrap/bootstrap.pro
 +++ b/src/tools/bootstrap/bootstrap.pro
-@@ -133,7 +133,7 @@ macx {
+@@ -135,7 +135,7 @@ macx {
         ../../corelib/io/qstandardpaths_win.cpp
 }
 
@ -21,5 +21,5 @@ index a45382106a..17b9828581 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.19.0
+2.19.2

--- 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 75c9cbfab1967e472ced8730e561b062a30c4d9d Mon Sep 17 00:00:00 2001
+From 47c3ea27e0aba1475c450dcc590f01846b054a07 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 20/33] Use *.dll.a as import lib extension
@ -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 dec0931bd4..cd64cb0c4f 100644
+index 37eee7fca3..59b394ca51 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
@@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
@ -46,10 +46,10 @@ index dec0931bd4..cd64cb0c4f 100644
 +    impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
 +  }
 +  QList<QMakeLocalFileName> dirs;
-   static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
+   static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
+                                          "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
   for (int i = 0; lflags[i]; i++) {
-     ProStringList &l = project->values(lflags[i]);
-@@ -234,9 +238,12 @@ void Win32MakefileGenerator::fixTargetExt()
+@@ -253,9 +257,12 @@ void Win32MakefileGenerator::fixTargetExt()
     if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
         project->values("TARGET_EXT").append(".exe");
     } else if (project->isActiveConfig("shared")) {
@ -64,5 +64,5 @@ index dec0931bd4..cd64cb0c4f 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.19.0
+2.19.2

--- 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 12168d6839249e51586f3e63e666bd68e1363905 Mon Sep 17 00:00:00 2001
+From c14a296d3385a7d2aafbe793c7c1e49aa48d1b66 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 21/33] 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 6e7f6b76a4..8d6af2fb81 100644
+index 64ed6b9ed8..2cc54d15a2 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -1259,3 +1259,12 @@ defineTest(createConfigStatus) {
+@@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) {
 
 QMAKE_POST_CONFIGURE += \
     "createConfigStatus()"
@ -30,7 +30,7 @@ index 6e7f6b76a4..8d6af2fb81 100644
 +    CONFIG += no_smart_library_merge
 +}
 diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
-index 9eba5bcf00..0f8d03eb2c 100644
+index fbf1f3b8df..c261c46e72 100644
 --- a/mkspecs/features/default_post.prf
 +++ b/mkspecs/features/default_post.prf
@@ -1,5 +1,16 @@
@ -51,10 +51,10 @@ index 9eba5bcf00..0f8d03eb2c 100644
 
 !have_target:!force_qt: CONFIG -= qt
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index b57afcf72d..6eebd068f1 100644
+index d16b3cf1be..2c4d6cd97e 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -259,6 +259,23 @@ for(ever) {
+@@ -268,6 +268,23 @@ for(ever) {
             !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
                 WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
         }
@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644
 QMAKE_EXT_YACC          = .y
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 412278c8c6..dd86df8b91 100644
+index a7f1285c26..879410afef 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3200,6 +3200,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3206,6 +3206,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
     if (project->isActiveConfig("debug")) {
         ret += "d";
     }
@ -114,7 +114,7 @@ index 412278c8c6..dd86df8b91 100644
     ret += Option::pkgcfg_ext;
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
-@@ -3373,9 +3376,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3380,9 +3383,9 @@ MakefileGenerator::writePkgConfigFile()
     t << endl;
 
     // requires
@ -128,5 +128,5 @@ index 412278c8c6..dd86df8b91 100644
 
     t << endl;
 -- 
-2.19.0
+2.19.2

--- 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 f02786f7eea8c88f7cd4761638ae53bcf13d94fe Mon Sep 17 00:00:00 2001
+From f3eab06f0fa50e140a96182b0b7a1555b5e4797c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules
@ -13,7 +13,7 @@ the final application.
 3 files changed, 133 insertions(+), 42 deletions(-)

 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 27f4c277d6..358945b758 100644
+index 3ed6dd5889..15d8b8372e 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -49,35 +49,52 @@ but not all the files it references.
@ -126,9 +126,9 @@ index 27f4c277d6..358945b758 100644
 !!IF !equals(TEMPLATE, aux)
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-@@ -235,6 +286,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
-       INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINES})
+@@ -238,6 +289,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, ";"))
 
 +    # Find plugin targets
 +    file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
@ -183,7 +183,7 @@ index 27f4c277d6..358945b758 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})
-@@ -325,9 +426,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -328,9 +429,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -197,7 +197,7 @@ index 27f4c277d6..358945b758 100644
 !!ENDIF // CMAKE_RELEASE_TYPE
 !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
 
-@@ -338,29 +441,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -341,29 +444,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     )
 !!ENDIF // TEMPLATE != aux
 
@ -251,13 +251,13 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index dd86df8b91..fc7a0927a9 100644
+index 879410afef..2ff4c4f714 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -994,10 +994,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
-             libs << "QMAKE_LIBS"; //obvious one
-         if(project->isActiveConfig("staticlib"))
-             libs << "QMAKE_LIBS_PRIVATE";
+@@ -1016,10 +1016,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
+             libs << "LIBS" << "QMAKE_LIBS";
+         else
+             libs << "LIBS" << "LIBS_PRIVATE" << "QMAKE_LIBS" << "QMAKE_LIBS_PRIVATE";
 -        t << "QMAKE_PRL_LIBS =";
 -        for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
 -            t << qv(project->values((*it).toKey()));
@ -278,5 +278,5 @@ index dd86df8b91..fc7a0927a9 100644
 }
 
 -- 
-2.19.0
+2.19.2

--- 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 191a510dd089ac2d870e989b44a15af535eacb8a Mon Sep 17 00:00:00 2001
+From 682d934b6365e11caca6a2ec45ce97f1888b2806 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 23/33] Allow usage of static version with CMake
@ -244,7 +244,7 @@ index 2a94964b49..839a51f377 100644
 # We are generating cmake files. Most developers of Qt are not aware of cmake,
 # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 358945b758..d123edf665 100644
+index 15d8b8372e..3492133d9b 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)
@ -643,9 +643,9 @@ index 358945b758..d123edf665 100644
 +        INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINES})
 +!!ENDIF
 
-     # Find plugin targets
-     file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
-@@ -298,7 +395,11 @@ 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, ";"))
+@@ -301,7 +398,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         endforeach()
     endif()
 
@ -657,7 +657,7 @@ index 358945b758..d123edf665 100644
         set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
 
 !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-@@ -306,7 +407,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -309,7 +410,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
 !!ENDIF
@ -669,7 +669,7 @@ index 358945b758..d123edf665 100644
         set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
             \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
         )
-@@ -337,16 +442,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -340,16 +445,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     endif()
 
     set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
@ -690,7 +690,7 @@ index 358945b758..d123edf665 100644
         )
         set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
         foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -354,66 +459,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -357,66 +462,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
                 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
             endif()
         endforeach()
@ -781,7 +781,7 @@ index 358945b758..d123edf665 100644
     if (EXISTS
 !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -426,7 +533,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -429,7 +536,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -790,7 +790,7 @@ index 358945b758..d123edf665 100644
     endif()
 !!ENDIF // CMAKE_STATIC_TYPE
 
-@@ -436,19 +543,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -439,19 +546,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 
 !!ENDIF // CMAKE_DEBUG_TYPE
 !!ELSE // TEMPLATE != aux
@ -992,5 +992,5 @@ index 2a575958ae..ca0e3be3b5 100644
     INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
 )
 -- 
-2.19.0
+2.19.2

--- 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 e0197a35c25984f50de023cec5d5dd28391c22b0 Mon Sep 17 00:00:00 2001
+From c6e9aef076e72a4c7dab417d5b15afd28431877a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 24/33] Adjust linker flags for static build with
@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644
 +unset(_isExe)
 +!!ENDIF
 -- 
-2.19.0
+2.19.2

--- 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 cd1074a5c6c3615b89b0abb6f2960d26332dc2a5 Mon Sep 17 00:00:00 2001
+From 8f284db16131394f4532d3d3e19d6a12762b51c4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:50:21 +0200
 Subject: [PATCH 25/33] Use correct pkg-config --static flag
@ -8,10 +8,10 @@ Subject: [PATCH 25/33] Use correct pkg-config --static flag
 1 file changed, 3 insertions(+)

 diff --git a/configure.pri b/configure.pri
-index 8d6af2fb81..23b6050d35 100644
+index 2cc54d15a2..449fe4b9b8 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -315,6 +315,9 @@ defineTest(qtConfTest_detectPkgConfig) {
+@@ -329,6 +329,9 @@ defineTest(qtConfTest_detectPkgConfig) {
             qtLog("Found pkg-config from path: $$pkgConfig")
         }
     }
@ -22,5 +22,5 @@ index 8d6af2fb81..23b6050d35 100644
     $$qtConfEvaluate("features.cross_compile") {
         # cross compiling, check that pkg-config is set up sanely
 -- 
-2.19.0
+2.19.2

--- 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 b9ae2c29543c9d9ecc2e5933c2a849fb79f1190d Mon Sep 17 00:00:00 2001
+From 21151358f35b2e052baf54a46f88f44f5797c260 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 4 Dec 2016 20:35:47 +0100
 Subject: [PATCH 26/33] Fix macro invoking moc, rcc and uic
@ -18,7 +18,7 @@ Change-Id: I6fde86d0a3ade37b4376604a1eb6d5723eda8b4c
 2 files changed, 8 insertions(+), 4 deletions(-)

 diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake
-index 819b48f973..f11a61be6b 100644
+index 620795d2cf..1e80a47980 100644
 --- a/src/corelib/Qt5CoreMacros.cmake
 +++ b/src/corelib/Qt5CoreMacros.cmake
@@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target
@ -53,7 +53,7 @@ index 819b48f973..f11a61be6b 100644
 +                           COMMAND ${MOC_LOC}
                            ARGS ${rcc_options} --name ${outfilename} --output ${outfile} ${infile}
                            MAIN_DEPENDENCY ${infile}
-                            DEPENDS ${_rc_depends} "${out_depends}" VERBATIM)
+                            DEPENDS ${_rc_depends} "${_out_depends}" VERBATIM)
 diff --git a/src/widgets/Qt5WidgetsMacros.cmake b/src/widgets/Qt5WidgetsMacros.cmake
 index 737371a5ad..d103278cdf 100644
 --- a/src/widgets/Qt5WidgetsMacros.cmake
@ -70,5 +70,5 @@ index 737371a5ad..d103278cdf 100644
           MAIN_DEPENDENCY ${infile} VERBATIM)
         set_source_files_properties(${infile} PROPERTIES SKIP_AUTOUIC ON)
 -- 
-2.19.0
+2.19.2

--- 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 f9d1c593895a0698db00b96ed42c2ba6db464fcf Mon Sep 17 00:00:00 2001
+From c1e7b9eb36751d29aac541ac008f3a14e4d28931 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 20:59:54 +0100
 Subject: [PATCH 27/33] Ignore errors about missing feature static
@ -10,10 +10,10 @@ Not sure why this error occurs, let's hope for the best
 2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
-index 021036e4f9..16e8aa631d 100644
+index 0c6c10dded..54c4b568c1 100644
 --- a/mkspecs/features/qt_build_config.prf
 +++ b/mkspecs/features/qt_build_config.prf
-@@ -140,5 +140,5 @@ defineTest(qtConfig) {
+@@ -141,5 +141,5 @@ defineTest(qtConfig) {
         contains(QT.$${module}.disabled_features, $$1): \
             return(false)
     }
@ -32,5 +32,5 @@ index 1903e509c8..1fcb597fa3 100644
 +    !equals($$1, "static"): error("Could not find feature $${1}.")
 }
 -- 
-2.19.0
+2.19.2

--- 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 54ea8a6b4a956037ad4f03c60f9aee654317c1b4 Mon Sep 17 00:00:00 2001
+From 7a20d588ccc27c9189882c83591bf6a57979a3fb Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:20 +0100
 Subject: [PATCH 28/33] Enable and fix use of iconv
@ -63,10 +63,10 @@ index 330eb7c038..88a782b863 100644
 #else
     char **inBytesPtr = &inBytes;
 diff --git a/src/corelib/configure.json b/src/corelib/configure.json
-index dfb575da0d..a630d7abf3 100644
+index 183eb3a13e..a4560d5a60 100644
 --- a/src/corelib/configure.json
 +++ b/src/corelib/configure.json
-@@ -539,9 +539,9 @@
+@@ -532,9 +532,9 @@
         },
         "gnu-libiconv": {
             "label": "GNU iconv",
@ -79,5 +79,5 @@ index dfb575da0d..a630d7abf3 100644
         },
         "icu": {
 -- 
-2.19.0
+2.19.2

--- 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 4fba521536c369be187e9e618b3333cf0b2c724a Mon Sep 17 00:00:00 2001
+From 437f342743230d9645840b7e4089f81bdb2cee6e Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 21:08:48 +0100
 Subject: [PATCH 29/33] Ignore failing pkg-config test
@ -9,10 +9,10 @@ Didn't investigate why it fails, let's hope for the best
 1 file changed, 1 deletion(-)

 diff --git a/configure.json b/configure.json
-index bcd226f852..25512db145 100644
+index 5b37371a7b..ac98495157 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -604,7 +604,6 @@
+@@ -646,7 +646,6 @@
         "pkg-config": {
             "label": "Using pkg-config",
             "autoDetect": "!config.darwin && !config.win32",
@ -21,5 +21,5 @@ index bcd226f852..25512db145 100644
                 "publicFeature",
                 { "type": "publicQtConfig", "negative": true },
 -- 
-2.19.0
+2.19.2

--- 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 c4f29e97fd87f1f6790708d21247dd6c333167c9 Mon Sep 17 00:00:00 2001
+From f14f1928ace664034aeac5d348883a93f35b2ea5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Tue, 7 Feb 2017 18:25:28 +0100
 Subject: [PATCH 30/33] Prevent qmake from messing static lib dependencies
@ -11,10 +11,10 @@ static freetype2 and harfbuzz
 2 files changed, 6 insertions(+)

 diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
-index 894020d2bd..5f57d6f5cb 100644
+index 50ec8db79e..50789b3b9c 100644
 --- a/qmake/generators/unix/unixmake.cpp
 +++ b/qmake/generators/unix/unixmake.cpp
-@@ -414,6 +414,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
+@@ -393,6 +393,9 @@ UnixMakefileGenerator::fixLibFlag(const ProString &lib)
 bool
 UnixMakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
 {
@ -25,7 +25,7 @@ index 894020d2bd..5f57d6f5cb 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 cd64cb0c4f..c63d8b5754 100644
+index 59b394ca51..7788862142 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 cd64cb0c4f..c63d8b5754 100644
 +    return false; // prevent qmake from messing static lib dependencies
 +  }
   QList<QMakeLocalFileName> dirs;
-   static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
-   for (int i = 0; lflags[i]; i++) {
+   static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
+                                          "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
 -- 
-2.19.0
+2.19.2

--- 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 dacff81f228db7dd158e4f2bdc2dae02175aea5f Mon Sep 17 00:00:00 2001
+From b8d30f6d8f98db183a28e60e684f33ed094b326c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Wed, 25 Jan 2017 23:42:30 +0100
 Subject: [PATCH 31/33] Hardcode linker flags for platform plugins
@ -149,5 +149,5 @@ index 174bc7b609..e66488e364 100644
 include(windows.pri)
 
 -- 
-2.19.0
+2.19.2

--- 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 58dedf7fb76457bba9a1fc0f2a9d4a28c9a3e356 Mon Sep 17 00:00:00 2001
+From e8da100dec44bc38ec5eb9675f231c5d14d2e62f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 25 Aug 2017 17:07:17 +0200
 Subject: [PATCH 32/33] Fix linking against static plugins with qmake
@ -11,7 +11,7 @@ approach
 1 file changed, 2 insertions(+), 2 deletions(-)

 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index 6eebd068f1..310b8713f0 100644
+index 2c4d6cd97e..a15ab81899 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
@@ -69,7 +69,7 @@ all_qt_module_deps = $$resolve_depends(qt_module_deps, "QT.", ".depends" ".run_d
@ -33,5 +33,5 @@ index 6eebd068f1..310b8713f0 100644
         # Check if the plugin is known to Qt. We can use this to determine
         # the plugin path. Unknown plugins must rely on the default link path.
 -- 
-2.19.0
+2.19.2

--- 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 244213d3b887fcd16d345f0797fb1b8c8414cd46 Mon Sep 17 00:00:00 2001
+From c26a40fd24523774bba4f4edd58f68eede33c7b5 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 26 May 2018 03:47:14 +0200
 Subject: [PATCH 33/33] 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 ebf9864b15..2fb04ab12a 100644
+index 23e5e499b2..12030eba08 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
@ -45,5 +45,5 @@ index 917a91098e..c770a3e19b 100644
 #else
     return false;
 -- 
-2.19.0
+2.19.2

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

 pkgname=mingw-w64-qt5-base-dynamic
-pkgver=5.11.2
-pkgrel=2
+pkgver=5.12.0
+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
 isStatic && arch=('any') || arch=('i686' 'x86_64')
@ -85,40 +85,40 @@ source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${pkgver}/subm
        '0031-Hardcode-linker-flags-for-platform-plugins.patch'
        '0032-Fix-linking-against-static-plugins-with-qmake.patch'
        '0033-Disable-hardware-randomizer-for-32-bit.patch')
-sha256sums=('6381e7c3468d5a1dcfe3683b29eeced192faa0f8a32434fec071a59b8bcd0107'
-            '3036fb04baa54d010dce053059dd780322f1d2925d42bdb6d9762539b1581e62'
-            '0861dc21d857eeddbc992f63f66590baade93e049b1ea385a34b8896e231cbd0'
-            'cff8b6b146bc20faaa1f7dc25e88f6f3dd71657d2b80d5b3b15c0949026fc4aa'
-            '76ea9cd3ab0d9308fb57bff0bd82490ec3da95e3e5f96d452fe62206daff300d'
-            '626790dc110b0c70989e57dbdb42dd1cc5757c2360d6e7714624fbdee6e8dae1'
-            '96d94a7aae914f3706a820ad074bbd32e884154c1bebba3f3e631920fe0fbd59'
-            '6bbdf39b2682002d4f4972b395f49d17acee607f92df00734faf53c4930de2d9'
-            '3c1df53016e40b00dbe8ef132b50730fadf412534135a114628612f4c55fe6b7'
-            '02966be361050075382e3a3ad83e4eb13d7b135aadb95d43b2bde443c39506aa'
-            '230e4bf22051a79d36285178c8e294e479e81a5480d8791b53ab090a87b8d5e7'
-            '7f6a16f8d2108bc96b58a1fcb695da342f71bd47de24f5b20b9412319e4e35ad'
-            '49a6571dca2333c04658f47e7f0971ffaa45d8c8664cc7dded63d8f29b80bfb2'
-            '32333bd89e86efba6333897f77dbd61464ea8130013248b37c5927eb3c79efdc'
-            '4b7c018cc7335639df7b3819132d5d32906a5fa0796c2caf4428993f16697882'
-            'a6086ef73d1b2ac079b06f2ce1059458af1f033efa7a2e5e684c97d64d418296'
-            '82787b2bac35de3992bb36816ee0bd30117a3e8679d0cffc2aabe7c551c5f4cb'
-            'dcee7f38ce40aec00e8ecce72b9a3c07e6d0bf838049c4bbb80f33448e34038b'
-            '49b332039ef6ba074c58fd7149df70003a7e69c61ed1519df6a0f16635848843'
-            'c345fd741f71c9e728ea88e4c86640c522d7cc0c9f0e39cee5812a2ea41c51e5'
-            '55ffc1bc12d449cb80fa5be4891e4ebdba4a41c62a5953b13dfc8fb75c153de4'
-            'af990f18952df3372f42112f68f13ceab9a46feb50c115ea548b44822b841e29'
-            '843e78560e7d09b86979f928e16d1ed56595d6f660d4dc95d4888a56978b9d43'
-            'c8fc2495f4d99d460020c362dbf78e6faba2c60c65580f8d06f59fe6e85d7e19'
-            '0be553d337ecc23b1a1bc8df019beaa300b3e0d0bffa8d68e6401f5cbfa79b21'
-            '03ff8e2ca617a5852ce9b0c99eab6c5866e00c5099e62e4c583af6e68b03c076'
-            '3e6d0ed72cf9817dd7508b5403c1bbbdde91f6a59725c8e5250abe8fc66b5a03'
-            '16fd7e1dc7afb830d984b1d6c112c632e4190f610cdee48d36bd0313e1c19634'
-            'd28476f714a02671acaa02ce0c3a462efd2917aa02d9add004e1d5935f795e76'
-            '4cbaddd05144010a681d370573d98130af909adedbc761728d0842af3be84a1d'
-            '9bf58d9378fcdd5a1af5e272f2ef19c3b2ec6b020bcb2b78ec808e7adcc8f032'
-            'ca1b066b22af17192b59ce7f0ca3a83bda7c6a8c7f023537c37c1b5c4a388984'
-            'd33e97f491ec8773922ccdd9df25ef3f532c00edf48bab858cef99a60edcf8fe'
-            '550082fea34c12c9df92c73ac1c7ae23ee7ef454799403fda0d495f5d8d92be4')
+sha256sums=('5e03221d780e121aabd734896aab8f331e5d8c9d9b54f1eb04907d0818eaeecb'
+            '98aeb35835e44f0311bf40969ead841163f8650c869cacf9c455ad87bf9e7d0a'
+            '0290db9520f2c9255a01d3ee313ff8d1925f89c50d8b5fd4283882b62b299541'
+            '02db1e6a3ac0ea7ad8aa15275920aeac50389dc0e7355a2280e36aa957234167'
+            'a45fd65bd2c9f57361e1e68cab60132abf192b0508cc1d1559ee2abab2a91a86'
+            'c2f21de21481189f610a95ad2efaf6d1845ef640ad8aa3ffb1c8a138a46ed50d'
+            'df6975315f2f7a4a38d75baa6e4cf12d6e2759c8e16e57be81016cfe8a94de96'
+            '01e478ff9fa20d38372bc6b4907264ad838b5de366737d907c5986459aff0209'
+            'a52f036860850960e4af3adcc1e38cb708c28358e7de01decb20cc76b9d62d5d'
+            '374e8e4f6afff9a0f49f02faadd361cf3df947452f9a0fa450c24baff920fc5d'
+            '91b899ef0b2e4b716324ea1942fbd0d6c18c55ba21f37d65c253f893ec312990'
+            '2bf1b91ebaca6647908a00f639477803f5c432b06a1e9550826ccad0f6d4deb9'
+            '2aea9f55f77d93b041d102b82060c3625e59e4e6324ea83ffe0821ca5e082a1a'
+            'db93259fe8fea464b22f5c8ca550edc0eebb6df0572574a1246cc4b9926251ee'
+            '4304fa46b78615b912d8727a40fc39b836b2a4762442b29b7c8b2a8547ed4ea0'
+            'b59bd5c1d0572466e76222cd5fda2a160dcde55a8bd65eacaecbe334ea567e16'
+            'b339686494a3417a9263e93eb7623a544669861b57e4312d82d468062a9d3e6c'
+            'c96c61d974e50b35cffe8391966c9641cca4f3ddef2bab4b016239169ab484c4'
+            '295a965cfea15454e4f207afad47f02dac771f96a17a00867d3a7f0f0ee1ba20'
+            'f165f53ffa069b677238c75a020466fa3e170edfbbb5ca3c312e2a014fec5607'
+            'd45fed111601f21b6866b607925ae59c9842850f8d9531fc13808fc0de7f1e3a'
+            '795700751790b164fb2062263e6681073acc3ef4d71ea50bb0a70510b9ff2018'
+            '4b50d30b3b18aa6f397c2a7651aa58bca3fdf2234bed3a44c507939bc2edb00a'
+            '3485baf0fd0a1402119ec6bd16ba23e53731ea75e6d881f88aa15933cedc19c3'
+            '54c310eae3e5ca6bfbb2cb6d058fac81c523a2cf0123797d7a4d70b8272ab35f'
+            '2f6175cacbf4982e624d8f0233803ae471b08e14d0fa971607517b4120e75493'
+            '10d1712857531d277d314c95c0026b88df28f9b956dc5491e532858070e7f6da'
+            'de214043a544b89d60101b67142d586cd4d2d61b9c84cf54d0652ce5b6d34f7e'
+            '9cb1e05a00c0cf4486cc7bcc92a960f216694387b5098dad51584e9cfe882897'
+            '9ff94ccfcf951c970e39ecde11b21c298ea839785ab27db9abd9379963b82c23'
+            '6b0e3ed44996bf72230875767b3dde9bcabb1c2496badd95dc5ce8ea796ab5ba'
+            '17fd194dfc5f630d4b98afcafb78d4c89d16d5cea40c3c4096e32956a1e87104'
+            'c808a350cae7a7cc899ec3d496f5e3522a4dbefcd6adf41abcf46621be9468b7'
+            '2aeefe22f926d37c467324bfa015cc33df9a05fa8aee318132fd566e9b66eb09')

 _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 2658fe5a2166aa8893701e65e71dd7bdb16d9180 Mon Sep 17 00:00:00 2001
+From 916b6a82bc084162432f9ed36934940892679ebd Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 18:30:51 +0100
 Subject: [PATCH 01/33] Adjust win32-g++ profile for cross compilation with
@ -163,5 +163,5 @@ index ed131c6823..b77d86cd6b 100644
 
 QMAKE_LINK              = $${CROSS_COMPILE}g++
 -- 
-2.19.0
+2.19.2

--- 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 39c6529c65ebf9e9af4d54cec6ac45a61f4ba618 Mon Sep 17 00:00:00 2001
+From cf9119f68b3e575ef07853ab177259f4ef044e0b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:36:53 +0200
 Subject: [PATCH 02/33] Ensure GLdouble is defined when using dynamic OpenGL
@ -9,7 +9,7 @@ FIXME: Not sure whether this is still required
 1 file changed, 2 deletions(-)

 diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h
-index 1a43f13d9b..a4c954a453 100644
+index 00287b0665..35ad3007d1 100644
 --- a/src/gui/opengl/qopenglfunctions.h
 +++ b/src/gui/opengl/qopenglfunctions.h
@@ -56,9 +56,7 @@
@ -23,5 +23,5 @@ index 1a43f13d9b..a4c954a453 100644
 #ifdef Q_ENABLE_OPENGL_FUNCTIONS_DEBUG
 #include <stdio.h>
 -- 
-2.19.0
+2.19.2

--- 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 b0a8c226931a787ec4214686827bcb9b1d7f873f Mon Sep 17 00:00:00 2001
+From dcfdcfea110398d0ce98c184b975f59354d4528b Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:41:38 +0200
 Subject: [PATCH 03/33] Use external ANGLE library
@ -28,7 +28,7 @@ index 07869efd7d..2e32911a64 100644
 
 _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
 diff --git a/src/gui/gui.pro b/src/gui/gui.pro
-index 759d6f3cbf..1ddcf1db78 100644
+index 06c9cd3939..cb1314c1ef 100644
 --- a/src/gui/gui.pro
 +++ b/src/gui/gui.pro
@@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \
@ -66,7 +66,7 @@ index 8b2349ff2f..f5e43c6adc 100644
 HEADERS += qgl.h \
            qgl_p.h \
 diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
-index f4c396f7c5..fc87e810aa 100644
+index db06a6a2a3..25c00ed17b 100644
 --- a/src/plugins/platforms/windows/windows.pri
 +++ b/src/plugins/platforms/windows/windows.pri
@@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32
@ -93,5 +93,5 @@ index 1c76a2e46f..6a5f046b34 100644
         SUBDIRS += src_3rdparty_libpng
         src_3rdparty_freetype.depends += src_3rdparty_libpng
 -- 
-2.19.0
+2.19.2

--- 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 baee6baceceaa4abb8a9ea909771bcac6da04e05 Mon Sep 17 00:00:00 2001
+From 42ab8012488408bfb6ab77fb056b27f3400d40ce Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:48:51 +0200
 Subject: [PATCH 04/33] Fix too many sections assemler error in OpenGL factory
@ -11,7 +11,7 @@ Hence the assembler option -mbig-obj is required.
 1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri
-index 4c778b184e..1dd1755d7f 100644
+index 24758afdeb..aa04b4a672 100644
 --- a/src/gui/opengl/opengl.pri
 +++ b/src/gui/opengl/opengl.pri
@@ -3,7 +3,8 @@
@ -25,5 +25,5 @@ index 4c778b184e..1dd1755d7f 100644
     HEADERS += opengl/qopengl.h \
                opengl/qopengl_p.h \
 -- 
-2.19.0
+2.19.2

--- 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 4b8467ce1b3c487b69e9f9016fa26044853fb6aa Mon Sep 17 00:00:00 2001
+From 07fa0fe80bd49e335ff8663ee8c67aa6b0f042c8 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:54:12 +0200
 Subject: [PATCH 05/33] Make sure *.pc files are installed correctly
@ -10,10 +10,10 @@ Subject: [PATCH 05/33] 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 73e09a1025..6c977b3e0b 100644
+index b7e591d2ab..5abf0624f4 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3183,7 +3183,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
+@@ -3189,7 +3189,7 @@ MakefileGenerator::openOutput(QFile &file, const QString &build) const
 }
 
 QString
@ -22,7 +22,7 @@ index 73e09a1025..6c977b3e0b 100644
 {
     QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString();
     if (ret.isEmpty()) {
-@@ -3208,7 +3208,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
+@@ -3214,7 +3214,11 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
     if(fixify) {
         if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR"))
             ret.prepend(project->first("DESTDIR").toQString());
@ -36,7 +36,7 @@ index 73e09a1025..6c977b3e0b 100644
     return ret;
 }
 diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
-index f32bec650e..17fed7f8c8 100644
+index b5c150e1cb..afb0e91381 100644
 --- a/qmake/generators/makefile.h
 +++ b/qmake/generators/makefile.h
@@ -89,7 +89,7 @@ protected:
@ -49,10 +49,10 @@ index f32bec650e..17fed7f8c8 100644
     void writePkgConfigFile();   // for pkg-config
 
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index bca27b7044..dec0931bd4 100644
+index e0d03ccc1c..37eee7fca3 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
-@@ -726,7 +726,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
+@@ -747,7 +747,7 @@ QString Win32MakefileGenerator::defaultInstall(const QString &t)
                 }
                 if(!ret.isEmpty())
                     ret += "\n\t";
@ -62,5 +62,5 @@ index bca27b7044..dec0931bd4 100644
                     uninst.append("\n\t");
                 uninst.append("-$(DEL_FILE) " + escapeFilePath(dst_pc));
 -- 
-2.19.0
+2.19.2

--- 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 346528ea0e3b2966e798b9492b72b087561781af Mon Sep 17 00:00:00 2001
+From f02b2a6ef057ac969eb813735a88e3dfedf924a2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 13:58:28 +0200
 Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
@ -11,18 +11,18 @@ like .obj/debug/Qt5Cored_resource_res.o
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
-index 6fcfe96380..f482cae21a 100644
+index de7363e51b..b2b9d01799 100644
 --- a/qmake/generators/win32/mingw_make.cpp
 +++ b/qmake/generators/win32/mingw_make.cpp
-@@ -195,7 +195,7 @@ void MingwMakefileGenerator::init()
+@@ -209,7 +209,7 @@ void MingwMakefileGenerator::init()
 
     processVars();
 
-    project->values("QMAKE_LIBS") += project->values("RES_FILE");
+-    project->values("LIBS") += project->values("RES_FILE");
 +    project->values("OBJECTS") += project->values("RES_FILE");
 
     if (project->isActiveConfig("dll")) {
         QString destDir = "";
 -- 
-2.19.0
+2.19.2

--- 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 541e805e6c9180089625700f498165d9e3a371d1 Mon Sep 17 00:00:00 2001
+From 941886c8d4ca7655cdd165eeb439d93abcf9eab2 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:01:14 +0200
 Subject: [PATCH 07/33] Prevent debug library names in pkg-config files
@ -15,10 +15,10 @@ files for the debug build an unique file name.
 1 file changed, 3 insertions(+)

 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 6c977b3e0b..412278c8c6 100644
+index 5abf0624f4..a7f1285c26 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3197,6 +3197,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3203,6 +3203,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
         if (dot != -1)
             ret = ret.left(dot);
     }
@ -29,5 +29,5 @@ index 6c977b3e0b..412278c8c6 100644
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
 -- 
-2.19.0
+2.19.2

--- 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,27 +1,30 @@
-From dc1443e4b4cbc38d31934674b006f0458fe86298 Mon Sep 17 00:00:00 2001
+From 00538d150502debca140f94c2057c1a541b8333f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Thu, 26 Jan 2017 17:51:31 +0100
 Subject: [PATCH 08/33] Fix linking against shared/static libpng

 Change-Id: Ic7a0ec9544059b8e647a5d0186f1b88c00911dcf
 ---
- src/gui/configure.json | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ src/gui/configure.json | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index 219385a108..d629a45b92 100644
+index 0332631ec8..dbb6f708b0 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -291,7 +291,8 @@
-             "sources": [
+@@ -308,8 +308,10 @@
                 { "type": "pkgConfig", "args": "libpng" },
+                 { "libs": "-llibpng16", "condition": "config.msvc" },
                 { "libs": "-llibpng", "condition": "config.msvc" },
-                { "libs": "-lpng", "condition": "!config.msvc" }
+-                { "libs": "-lpng16", "condition": "!config.msvc" },
+-                { "libs": "-lpng", "condition": "!config.msvc" },
+                { "libs": "-lpng16 -lz", "condition": "!config.msvc && !features.shared" },
 +                { "libs": "-lpng -lz", "condition": "!config.msvc && !features.shared" },
-+                { "libs": "-lpng", "condition": "!config.msvc && features.shared" }
+                { "libs": "-lpng16", "condition": "!config.msvc && features.shared" },
+                { "libs": "-lpng", "condition": "!config.msvc && features.shared" },
+                 { "libs": "-s USE_LIBPNG=1", "condition": "config.wasm" }
             ],
             "use": [
-                 { "lib": "zlib", "condition": "features.system-zlib" }
 -- 
-2.19.0
+2.19.2

--- 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 ce8a5ec429efd173899f3a545ca527085c929daf Mon Sep 17 00:00:00 2001
+From 3acf388e10fd40909af87cfdba35768f2be26be6 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 19:36:25 +0100
 Subject: [PATCH 09/33] Fix linking against static D-Bus
@ -9,17 +9,16 @@ Subject: [PATCH 09/33] Fix linking against static D-Bus
 2 files changed, 11 insertions(+), 2 deletions(-)

 diff --git a/configure.json b/configure.json
-index 2dc79137e8..68fed05289 100644
+index 522bd34e9b..17446b6c21 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -172,18 +172,23 @@
-                     "CONFIG(debug, debug|release): \\",
-                     "    LIBS += $$LIBS_DEBUG",
-                     "else: \\",
-                    "    LIBS += $$LIBS_RELEASE"
-+                    "    LIBS += $$LIBS_RELEASE",
-+                    "static: DEFINES += DBUS_STATIC_BUILD"
-                 ]
+@@ -170,17 +170,22 @@
+             "label": "D-Bus >= 1.2",
+             "test": {
+                 "include": "dbus/dbus.h",
+-                "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);"
+                "main": "(void) dbus_bus_get_private(DBUS_BUS_SYSTEM, (DBusError *)NULL);",
+                "qmake": "static: DEFINES += DBUS_STATIC_BUILD"
             },
             "sources": [
                 { "type": "pkgConfig", "args": "dbus-1 >= 1.2" },
@ -39,7 +38,7 @@ index 2dc79137e8..68fed05289 100644
                 { "libs": "-ldbus-1", "condition": "!config.win32" }
             ]
 diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
-index 9eaebe6d7e..ac1b1d977b 100644
+index 7cce0d71aa..4d3d774d45 100644
 --- a/src/dbus/qdbus_symbols_p.h
 +++ b/src/dbus/qdbus_symbols_p.h
@@ -57,6 +57,10 @@
@ -54,5 +53,5 @@ index 9eaebe6d7e..ac1b1d977b 100644
 #  include <dbus/dbus.h>
 #else
 -- 
-2.19.0
+2.19.2

--- 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 6db371f6604d00b31d797447bfc6be93091637c9 Mon Sep 17 00:00:00 2001
+From 27a1638bad652da1e73bbe1533aca8b625eeda4d Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 18:28:10 +0200
 Subject: [PATCH 10/33] Don't try to use debug version of D-Bus library
@ -12,10 +12,10 @@ Change-Id: Ic34e1025fda55f9659e065f5bbe9d51f55420adb
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/configure.json b/configure.json
-index 68fed05289..bcd226f852 100644
+index 17446b6c21..5b37371a7b 100644
 --- a/configure.json
 +++ b/configure.json
-@@ -185,7 +185,7 @@
+@@ -182,7 +182,7 @@
                 {
                     "libs": "",
                     "builds": {
@ -25,5 +25,5 @@ index 68fed05289..bcd226f852 100644
                     },
                     "condition": "config.win32 && features.shared"
 -- 
-2.19.0
+2.19.2

--- 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,30 +1,32 @@
-From 0ca7e00a0ab483f3050349db030afab902d389c2 Mon Sep 17 00:00:00 2001
+From f4d9c0c1b22a122df1393b47d485a0f4416ad8bc Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 3 Feb 2017 20:51:19 +0100
 Subject: [PATCH 11/33] Fix linking against static freetype2

 ---
- src/gui/configure.json | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
+ src/gui/configure.json | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)

 diff --git a/src/gui/configure.json b/src/gui/configure.json
-index d629a45b92..afa3d95f39 100644
+index dbb6f708b0..a7ffa0f113 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -158,8 +158,11 @@
+@@ -163,9 +163,12 @@
                 ]
             },
             "sources": [
 -                { "type": "pkgConfig", "args": "freetype2" },
-                { "type": "freetype", "libs": "-lfreetype" }
+-                { "type": "freetype", "libs": "-lfreetype", "condition": "!config.wasm" },
+-                { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "config.wasm" }
 +                { "type": "pkgConfig", "args": "--static --libs freetype2", "condition": "!features.shared" },
 +                { "type": "pkgConfig", "args": "--libs freetype2", "condition": "features.shared" },
-+                { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared" },
-+                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared" },
-+                { "libs": "-lfreetype", "condition": "features.shared" }
+                { "libs": "-lfreetype -lharfbuzz -lfreetype -lglib-2.0 -lintl -lws2_32 -lole32 -lwinmm -lshlwapi -lpcre -lintl -lpcre -lintl -liconv -lgraphite2 -lbz2", "condition": "!features.shared && !config.wasm" },
+                { "libs": "-Wl,-Bdynamic -lfreetype -Wl,-Bstatic", "condition": "!features.shared && !config.wasm" },
+                { "libs": "-lfreetype", "condition": "features.shared && !config.wasm" },
+                { "type": "freetype", "libs": "-s USE_FREETYPE=1", "condition": "features.shared && config.wasm" }
             ]
         },
         "fontconfig": {
 -- 
-2.19.0
+2.19.2

--- 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 0118d791f8fba7fdadc92ed6884b2ff4de7abf22 Mon Sep 17 00:00:00 2001
+From dbb80749d9fa50db27c240769aa9f59b24067f3f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:22:56 +0200
 Subject: [PATCH 12/33] Fix linking against static harfbuzz
@ -8,10 +8,10 @@ Subject: [PATCH 12/33] 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 afa3d95f39..a2b0a00d09 100644
+index a7ffa0f113..796cd5aaa7 100644
 --- a/src/gui/configure.json
 +++ b/src/gui/configure.json
-@@ -218,7 +218,11 @@
+@@ -227,7 +227,11 @@
                 ]
             },
             "sources": [
@ -25,5 +25,5 @@ index afa3d95f39..a2b0a00d09 100644
         },
         "imf": {
 -- 
-2.19.0
+2.19.2

--- 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 c9383537c6d1c47aa0d435be4c6db1ee88d26bff Mon Sep 17 00:00:00 2001
+From 4d4b4bede0fbdd326c41333e3605225cafd8861a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:24:01 +0200
 Subject: [PATCH 13/33] Fix linking against static pcre
@ -9,7 +9,7 @@ Change-Id: I3225c6e82dc4d17aef37d4289c16eb7a5ea3c5a1
 1 file changed, 4 insertions(+)

 diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp
-index 13eff07c04..ea747244da 100644
+index 908e7ff0d6..e5786a10cf 100644
 --- a/src/corelib/tools/qregularexpression.cpp
 +++ b/src/corelib/tools/qregularexpression.cpp
@@ -53,6 +53,10 @@
@ -24,5 +24,5 @@ index 13eff07c04..ea747244da 100644
 #include <pcre2.h>
 
 -- 
-2.19.0
+2.19.2

--- 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 b701eb9c3dcb206435726d0405fa152655231dcb Mon Sep 17 00:00:00 2001
+From c0ac12f99fde7a3a4d6355e68c631fbac5356f82 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:56:55 +0200
 Subject: [PATCH 14/33] Fix linking against shared/static MariaDB
@ -9,7 +9,7 @@ Change-Id: I9722c154d845f288a2d4d1ab14a014066b28819b
 1 file changed, 3 insertions(+)

 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index 234f880579..4619db4a54 100644
+index 4802d3b04d..fac6be7301 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
@@ -69,6 +69,9 @@
@ -23,5 +23,5 @@ index 234f880579..4619db4a54 100644
                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
 -- 
-2.19.0
+2.19.2

--- 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 ee6b2158ed83ed926ba3f17f7c520fb889ef74ac Mon Sep 17 00:00:00 2001
+From e9810c35b4a294691ffea20dd51ba8ef2faf41ed Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:58:25 +0200
 Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
@ -8,7 +8,7 @@ Subject: [PATCH 15/33] Fix linking against shared/static PostgreSQL
 1 file changed, 3 insertions(+), 2 deletions(-)

 diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index 4619db4a54..ef0d45f6cc 100644
+index fac6be7301..305aac405c 100644
 --- a/src/plugins/sqldrivers/configure.json
 +++ b/src/plugins/sqldrivers/configure.json
@@ -91,9 +91,10 @@
@ -25,5 +25,5 @@ index 4619db4a54..ef0d45f6cc 100644
             ]
         },
 -- 
-2.19.0
+2.19.2

--- 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 1bb8814307183b3311c99e0e4987ea0d84d487f2 Mon Sep 17 00:00:00 2001
+From 23c9fc7eaa3164d47e0c6049e61bfeec0bd30a0f Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:25:40 +0200
 Subject: [PATCH 16/33] Rename qtmain to qt5main
@ -66,5 +66,5 @@ index 4140ae48de..9ae73db74b 100644
 
 CONFIG += static
 -- 
-2.19.0
+2.19.2

--- 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 337a71fdb496c2228ee5564d5c12498b6b7d498d Mon Sep 17 00:00:00 2001
+From 29f7e60d2712d9229d96d5aa1ec3fd0253075bca Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 14:27:28 +0200
 Subject: [PATCH 17/33] Build dynamic host libraries
@ -14,7 +14,7 @@ Change-Id: I91a3613955c656fb0d262ccb9b2529350bab032b
 2 files changed, 2 insertions(+), 2 deletions(-)

 diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 8c7adc45eb..8dd69efee6 100644
+index 51b5bde67a..70919e98e9 100644
 --- a/mkspecs/features/qt_module.prf
 +++ b/mkspecs/features/qt_module.prf
@@ -25,7 +25,7 @@ requires(!$$skip)
@ -37,5 +37,5 @@ index c3ed27d979..30d2114aa1 100644
 -INSTALLS = lib
 +INSTALLS += lib
 -- 
-2.19.0
+2.19.2

--- 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 664fce69abcad0d7c10013b51b42a1a34c27f279 Mon Sep 17 00:00:00 2001
+From 9baddb1d9432c91c6f4e7f8687d13fa7e38308d3 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 17:59:27 +0200
 Subject: [PATCH 18/33] Enable rpath for build tools
@ -13,18 +13,18 @@ Change-Id: I9808062a66406cdec7446a75150b40b2f30038c7
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
-index 883f8ca215..786f2e660c 100644
+index 8354f30eea..30e8cf18c5 100644
 --- a/mkspecs/features/qt_app.prf
 +++ b/mkspecs/features/qt_app.prf
-@@ -24,6 +24,7 @@ isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
- QMAKE_LFLAGS += $$QMAKE_LFLAGS_GCSECTIONS
+@@ -21,6 +21,7 @@ isEmpty(QMAKE_TARGET_DESCRIPTION): \
+ isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle
 
 host_build: QT -= gui   # no host tool will ever use gui
 +host_build: QMAKE_RPATHDIR += $$[QT_INSTALL_LIBS/dev] # force rpath
 host_build:force_bootstrap {
     !build_pass:qtConfig(release_tools): CONFIG += release
     contains(QT, core(-private)?|xml) {
-@@ -34,7 +35,6 @@ host_build:force_bootstrap {
+@@ -31,7 +32,6 @@ host_build:force_bootstrap {
 } else {
     !build_pass:qtConfig(debug_and_release): CONFIG += release
     target.path = $$[QT_INSTALL_BINS]
@ -33,5 +33,5 @@ index 883f8ca215..786f2e660c 100644
 INSTALLS += target
 
 -- 
-2.19.0
+2.19.2

--- 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 ec1d27f7cb06c118e81335f4614559db92256fd5 Mon Sep 17 00:00:00 2001
+From f844ba34e2c4d29613345477dee10fa883275fd4 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:04:42 +0200
 Subject: [PATCH 19/33] Use system zlib for build tools
@ -8,10 +8,10 @@ Subject: [PATCH 19/33] Use system zlib for build tools
 1 file changed, 1 insertion(+), 1 deletion(-)

 diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
-index a45382106a..17b9828581 100644
+index 83e44ff9a4..6b1db38486 100644
 --- a/src/tools/bootstrap/bootstrap.pro
 +++ b/src/tools/bootstrap/bootstrap.pro
-@@ -133,7 +133,7 @@ macx {
+@@ -135,7 +135,7 @@ macx {
         ../../corelib/io/qstandardpaths_win.cpp
 }
 
@ -21,5 +21,5 @@ index a45382106a..17b9828581 100644
 } else {
     CONFIG += no_core_dep
 -- 
-2.19.0
+2.19.2

--- 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 75c9cbfab1967e472ced8730e561b062a30c4d9d Mon Sep 17 00:00:00 2001
+From 47c3ea27e0aba1475c450dcc590f01846b054a07 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
 Subject: [PATCH 20/33] Use *.dll.a as import lib extension
@ -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 dec0931bd4..cd64cb0c4f 100644
+index 37eee7fca3..59b394ca51 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
@@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
@ -46,10 +46,10 @@ index dec0931bd4..cd64cb0c4f 100644
 +    impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
 +  }
 +  QList<QMakeLocalFileName> dirs;
-   static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
+   static const char * const lflags[] = { "LIBS", "LIBS_PRIVATE",
+                                          "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", nullptr };
   for (int i = 0; lflags[i]; i++) {
-     ProStringList &l = project->values(lflags[i]);
-@@ -234,9 +238,12 @@ void Win32MakefileGenerator::fixTargetExt()
+@@ -253,9 +257,12 @@ void Win32MakefileGenerator::fixTargetExt()
     if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
         project->values("TARGET_EXT").append(".exe");
     } else if (project->isActiveConfig("shared")) {
@ -64,5 +64,5 @@ index dec0931bd4..cd64cb0c4f 100644
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.19.0
+2.19.2

--- 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 12168d6839249e51586f3e63e666bd68e1363905 Mon Sep 17 00:00:00 2001
+From c14a296d3385a7d2aafbe793c7c1e49aa48d1b66 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:45:08 +0200
 Subject: [PATCH 21/33] 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 6e7f6b76a4..8d6af2fb81 100644
+index 64ed6b9ed8..2cc54d15a2 100644
 --- a/configure.pri
 +++ b/configure.pri
-@@ -1259,3 +1259,12 @@ defineTest(createConfigStatus) {
+@@ -1312,3 +1312,12 @@ defineTest(createConfigStatus) {
 
 QMAKE_POST_CONFIGURE += \
     "createConfigStatus()"
@ -30,7 +30,7 @@ index 6e7f6b76a4..8d6af2fb81 100644
 +    CONFIG += no_smart_library_merge
 +}
 diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
-index 9eba5bcf00..0f8d03eb2c 100644
+index fbf1f3b8df..c261c46e72 100644
 --- a/mkspecs/features/default_post.prf
 +++ b/mkspecs/features/default_post.prf
@@ -1,5 +1,16 @@
@ -51,10 +51,10 @@ index 9eba5bcf00..0f8d03eb2c 100644
 
 !have_target:!force_qt: CONFIG -= qt
 diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
-index b57afcf72d..6eebd068f1 100644
+index d16b3cf1be..2c4d6cd97e 100644
 --- a/mkspecs/features/qt.prf
 +++ b/mkspecs/features/qt.prf
-@@ -259,6 +259,23 @@ for(ever) {
+@@ -268,6 +268,23 @@ for(ever) {
             !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \
                 WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE
         }
@ -101,10 +101,10 @@ index 51ea3a8321..275e080ae4 100644
 QMAKE_EXT_YACC          = .y
 
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index 412278c8c6..dd86df8b91 100644
+index a7f1285c26..879410afef 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -3200,6 +3200,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
+@@ -3206,6 +3206,9 @@ MakefileGenerator::pkgConfigFileName(bool fixify, bool onlyPrependDestdir)
     if (project->isActiveConfig("debug")) {
         ret += "d";
     }
@ -114,7 +114,7 @@ index 412278c8c6..dd86df8b91 100644
     ret += Option::pkgcfg_ext;
     QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
     if(!subdir.isEmpty()) {
-@@ -3373,9 +3376,9 @@ MakefileGenerator::writePkgConfigFile()
+@@ -3380,9 +3383,9 @@ MakefileGenerator::writePkgConfigFile()
     t << endl;
 
     // requires
@ -128,5 +128,5 @@ index 412278c8c6..dd86df8b91 100644
 
     t << endl;
 -- 
-2.19.0
+2.19.2

--- 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 f02786f7eea8c88f7cd4761638ae53bcf13d94fe Mon Sep 17 00:00:00 2001
+From f3eab06f0fa50e140a96182b0b7a1555b5e4797c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:32:00 +0200
 Subject: [PATCH 22/33] Pull dependencies of static libraries in CMake modules
@ -13,7 +13,7 @@ the final application.
 3 files changed, 133 insertions(+), 42 deletions(-)

 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 27f4c277d6..358945b758 100644
+index 3ed6dd5889..15d8b8372e 100644
 --- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
 +++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -49,35 +49,52 @@ but not all the files it references.
@ -126,9 +126,9 @@ index 27f4c277d6..358945b758 100644
 !!IF !equals(TEMPLATE, aux)
 !!IF !isEmpty(CMAKE_BUILD_IS_FRAMEWORK)
     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY FRAMEWORK 1)
-@@ -235,6 +286,56 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
-     set_property(TARGET Qt5::$${CMAKE_MODULE_NAME} PROPERTY
-       INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINES})
+@@ -238,6 +289,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, ";"))
 
 +    # Find plugin targets
 +    file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
@ -183,7 +183,7 @@ index 27f4c277d6..358945b758 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})
-@@ -325,9 +426,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -328,9 +429,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -197,7 +197,7 @@ index 27f4c277d6..358945b758 100644
 !!ENDIF // CMAKE_RELEASE_TYPE
 !!ENDIF // CMAKE_FIND_OTHER_LIBRARY_BUILD
 
-@@ -338,29 +441,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -341,29 +444,6 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     )
 !!ENDIF // TEMPLATE != aux
 
@ -251,13 +251,13 @@ index 5baf0fdb10..ec5f3cc437 100644
 +
 +endif()
 diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index dd86df8b91..fc7a0927a9 100644
+index 879410afef..2ff4c4f714 100644
 --- a/qmake/generators/makefile.cpp
 +++ b/qmake/generators/makefile.cpp
-@@ -994,10 +994,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
-             libs << "QMAKE_LIBS"; //obvious one
-         if(project->isActiveConfig("staticlib"))
-             libs << "QMAKE_LIBS_PRIVATE";
+@@ -1016,10 +1016,18 @@ MakefileGenerator::writePrlFile(QTextStream &t)
+             libs << "LIBS" << "QMAKE_LIBS";
+         else
+             libs << "LIBS" << "LIBS_PRIVATE" << "QMAKE_LIBS" << "QMAKE_LIBS_PRIVATE";
 -        t << "QMAKE_PRL_LIBS =";
 -        for (ProStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
 -            t << qv(project->values((*it).toKey()));
@ -278,5 +278,5 @@ index dd86df8b91..fc7a0927a9 100644
 }
 
 -- 
-2.19.0
+2.19.2

--- 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 191a510dd089ac2d870e989b44a15af535eacb8a Mon Sep 17 00:00:00 2001
+From 682d934b6365e11caca6a2ec45ce97f1888b2806 Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sat, 5 Aug 2017 21:14:26 +0200
 Subject: [PATCH 23/33] Allow usage of static version with CMake
@ -244,7 +244,7 @@ index 2a94964b49..839a51f377 100644
 # We are generating cmake files. Most developers of Qt are not aware of cmake,
 # so we require automatic tests to be available. The only module which should
 diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
-index 358945b758..d123edf665 100644
+index 15d8b8372e..3492133d9b 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)
@ -643,9 +643,9 @@ index 358945b758..d123edf665 100644
 +        INTERFACE_COMPILE_DEFINITIONS $${MODULE_DEFINES})
 +!!ENDIF
 
-     # Find plugin targets
-     file(GLOB pluginTargetsMaybe \"${CMAKE_CURRENT_LIST_DIR}/*Qt5$${CMAKE_MODULE_NAME}_*.cmake\")
-@@ -298,7 +395,11 @@ 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, ";"))
+@@ -301,7 +398,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
         endforeach()
     endif()
 
@ -657,7 +657,7 @@ index 358945b758..d123edf665 100644
         set_property(TARGET ${PLUGIN_TARGET_NAME} APPEND PROPERTY IMPORTED_CONFIGURATIONS ${CONFIG})
 
 !!IF isEmpty(CMAKE_PLUGIN_DIR_IS_ABSOLUTE)
-@@ -306,7 +407,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -309,7 +410,11 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         set(imported_location \"$${CMAKE_PLUGIN_DIR}${PLUGIN_LOCATION}\")
 !!ENDIF
@ -669,7 +669,7 @@ index 358945b758..d123edf665 100644
         set_target_properties(${PLUGIN_TARGET_NAME} PROPERTIES
             \"IMPORTED_LOCATION_${CONFIG}\" ${imported_location}
         )
-@@ -337,16 +442,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -340,16 +445,16 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
     endif()
 
     set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATE_DIRS_EXIST TRUE)
@ -690,7 +690,7 @@ index 358945b758..d123edf665 100644
         )
         set(_Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS)
         foreach(dep ${_Qt5$${CMAKE_MODULE_NAME}_LIB_DEPENDENCIES})
-@@ -354,66 +459,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -357,66 +462,68 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
                 list(APPEND _Qt5$${CMAKE_MODULE_NAME}_PRIVATEDEPS ${dep}Private)
             endif()
         endforeach()
@ -781,7 +781,7 @@ index 358945b758..d123edf665 100644
     if (EXISTS
 !!IF isEmpty(CMAKE_DLL_DIR_IS_ABSOLUTE)
         \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_DLL_DIR}$${CMAKE_LIB_FILE_LOCATION_RELEASE}\"
-@@ -426,7 +533,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -429,7 +536,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 !!ELSE
         \"$${CMAKE_IMPLIB_FILE_LOCATION_RELEASE}\" )
 !!ENDIF
@ -790,7 +790,7 @@ index 358945b758..d123edf665 100644
     endif()
 !!ENDIF // CMAKE_STATIC_TYPE
 
-@@ -436,19 +543,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
+@@ -439,19 +546,22 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
 
 !!ENDIF // CMAKE_DEBUG_TYPE
 !!ELSE // TEMPLATE != aux
@ -992,5 +992,5 @@ index 2a575958ae..ca0e3be3b5 100644
     INTERFACE_COMPILE_DEFINITIONS QT_TESTCASE_BUILDDIR=\\\"\${CMAKE_BINARY_DIR}\\\"
 )
 -- 
-2.19.0
+2.19.2

--- 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 e0197a35c25984f50de023cec5d5dd28391c22b0 Mon Sep 17 00:00:00 2001
+From c6e9aef076e72a4c7dab417d5b15afd28431877a Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Fri, 2 Jun 2017 16:42:07 +0200
 Subject: [PATCH 24/33] Adjust linker flags for static build with
@ -25,5 +25,5 @@ index f0add757bb..5328da2e80 100644
 +unset(_isExe)
 +!!ENDIF
 -- 
-2.19.0
+2.19.2

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