Qt5 git staging (#2934)

* qt5-git: changed branch to "5.9".

Very major changes to prepare and pkgver fuctions.
Added prepare_build_folder and other helper functions.
Copied code from qt5 and qt5-static packages.
Renamed patch filenames to match qt5.8 or "-qt-5.6-" names.
And, many formatting changes.

* qt5-git: Added patch files.

Added new patch files:
  0001-qt-5.9.1-fix-sql-libraries-mingw.patch
  0002-qt-5.8.1-configure-gcc-before-clang.patch
  0007-qt-5.9.0-win32-g-Enable-static-builds.patch
  0024-qt-5.9.2-icu-add-U_LIB_SUFFIX_C_NAME.patch
  0051-qt-5.9.0-disable-qtlocation-mapboxgl-plugin.patch
  0051-qt-5.9.1-disable-qtlocation-mapboxgl-plugin.patch
And, from qt5 package added
  0001-qt-5.8.0-fix-sql-libraries-mingw.patch
  0002-qt-5.8.0-configure-gcc-before-clang.patch
  0003-qt-5.8.0-autodetect-fontconfig.patch
  0011-qt-5.8.0-mingw-dbus-and-pkg-config.patch
  0016-qt-5.8.0-win32-g++-use-qpa-genericunixfontdatabase.patch
  0020-qt-5.3.0-use-external-angle-library.patch
  0023-qt-5.3.0-env-set-external-angle.patch
  0025-qt-5.8.0-force-using-make-on-msys.patch
  0028-qt-5.8.0-Revert-untangle-use-of-system-vs.-shell-path-list-se.patch
  0029-qt-5.8.0-Revert-fix-quoting-and-path-separators-in-qtPrepareT.patch
  0046-qt-5.4.1-Revert-Revert-fix-NTFS-mount-points.patch
  0049-qt-5.8.0-win32-do-not-use-fontconfig.patch
  0049-qt-5.9.0-win32-do-not-use-fontconfig.patch
  0125-qt-5.8.0-windeployqt-fixes.patch
  0125-qt-5.9.0-windeployqt-fixes.patch
  0300-qt-5.8.0-cast-errors.patch

* qt5-git: Rename patch files files.

Renamed qt5-git 5.7 patch files to match the ones in the qt5 5.8 package;
Or, renamed patch files with "-qt-5.6-" after seq. number.

* qt5-git: Changed to pcre2 from pcre depends.

mingw-w64-qt5-git/0001-qt-5.8.0-fix-sql-libraries-mingw.patch

@@ -0,0 +1,37 @@
+--- qt-everywhere-opensource-src-5.8.0/qtbase/src/sql/configure.json.orig	2017-01-25 13:37:26.111247700 +0300
++++ qt-everywhere-opensource-src-5.8.0/qtbase/src/sql/configure.json	2017-01-25 13:40:54.161502400 +0300
+@@ -50,7 +50,7 @@
+             "label": "InterBase",
+             "test": "unix/ibase",
+             "sources": [
+-                { "libs": "-lgds32_ms", "condition": "config.win32" },
++                { "libs": "-lfbclient", "condition": "config.win32" },
+                 { "libs": "-lgds", "condition": "!config.win32" }
+             ]
+         },
+@@ -61,7 +61,7 @@
+                 { "type": "mysqlConfig", "query": "--libs_r" },
+                 { "type": "mysqlConfig", "query": "--libs" },
+                 { "libs": "-lmysqlclient_r", "condition": "!config.win32" },
+-                { "libs": "-llibmysql", "condition": "config.win32" },
++                { "libs": "-lmysqlclient", "condition": "config.win32" },
+                 { "libs": "-lmysqlclient", "condition": "!config.win32" }
+             ]
+         },
+@@ -180,16 +180,6 @@
+         }
+     },
+ 
+-    "report": [
+-        {
+-            "type": "warning",
+-            "condition": "config.win32 && !config.msvc && features.sql-oci",
+-            "message": "Qt does not support compiling the Oracle database driver with
+-MinGW, due to lack of such support from Oracle. Consider disabling the
+-Oracle driver, as the current build will most likely fail."
+-        }
+-    ],
+-
+     "summary": [
+         {
+             "section": "Qt Sql",

mingw-w64-qt5-git/0001-qt-5.9.1-fix-sql-libraries-mingw.patch

@@ -0,0 +1,39 @@
+--- qt-everywhere-opensource-src-5.9.1/qtbase/src/plugins/sqldrivers/configure.json.orig	2017-01-25 13:37:26.111247700 +0300
++++ qt-everywhere-opensource-src-5.9.1/qtbase/src/plugins/sqldrivers/configure.json	2017-01-25 13:40:54.161502400 +0300
+@@ -50,7 +50,7 @@
+             "label": "InterBase",
+             "test": "unix/ibase",
+             "sources": [
+-                { "libs": "-lgds32_ms", "condition": "config.win32" },
++                { "libs": "-lfbclient", "condition": "config.win32" },
+                 { "libs": "-lgds", "condition": "!config.win32" }
+             ]
+         },
+@@ -61,8 +61,8 @@
+                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": false },
+                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": false },
+                 { "libs": "-lmysqlclient_r", "condition": "!config.win32" },
+-                { "libs": "-llibmysql", "condition": "config.win32" },
+-                { "libs": "-lmysqlclient", "condition": "!config.win32" }
++                { "libs": "-llibmysql", "condition": "config.msvc" },
++                { "libs": "-lmysqlclient", "condition": "!config.msvc" }
+             ]
+         },
+         "psql": {
+@@ -180,16 +180,6 @@
+         }
+     },
+ 
+-    "report": [
+-        {
+-            "type": "warning",
+-            "condition": "config.win32 && !config.msvc && features.sql-oci",
+-            "message": "Qt does not support compiling the Oracle database driver with
+-MinGW, due to lack of such support from Oracle. Consider disabling the
+-Oracle driver, as the current build will most likely fail."
+-        }
+-    ],
+-
+     "summary": [
+         {
+             "section": "Qt Sql",

mingw-w64-qt5-git/0002-qt-5.8.0-configure-gcc-before-clang.patch

@@ -0,0 +1,11 @@
+--- x86_64/qtbase/configure.bat.orig	2017-01-26 10:49:27.923099300 +0300
++++ x86_64/qtbase/configure.bat	2017-01-26 10:50:56.168562200 +0300
+@@ -150,7 +150,7 @@
+ :doneargs
+ 
+ rem Find various executables
+-for %%C in (clang-cl.exe cl.exe icl.exe g++.exe perl.exe jom.exe) do set %%C=%%~$PATH:C
++for %%C in (g++.exe clang-cl.exe cl.exe icl.exe perl.exe jom.exe) do set %%C=%%~$PATH:C
+ 
+ rem Determine host spec
+ 

mingw-w64-qt5-git/0002-qt-5.8.1-configure-gcc-before-clang.patch

@@ -0,0 +1,19 @@
+--- a/qtbase/configure.bat
++++ b/qtbase/configure.bat
+@@ -157,12 +157,12 @@ rem Determine host spec
+ if "%PLATFORM%" == "" (
+     if not "%icl.exe%" == "" (
+         set PLATFORM=win32-icc
+-    ) else if not "%clang-cl.exe%" == "" (
+-        set PLATFORM=win32-clang-msvc
+     ) else if not "%cl.exe%" == "" (
+         set PLATFORM=win32-msvc
+     ) else if not "%g++.exe%" == "" (
+         set PLATFORM=win32-g++
++    ) else if not "%clang-cl.exe%" == "" (
++        set PLATFORM=win32-clang-msvc
+     ) else (
+         echo Cannot detect host toolchain. Please use -platform. Aborting. >&2
+         exit /b 1
+-- 
+2.13.0.windows.1

mingw-w64-qt5-git/0003-qt-5.8.0-autodetect-fontconfig.patch

@@ -0,0 +1,18 @@
+--- x86_64/qtbase/src/gui/configure.json.orig	2017-01-26 11:44:31.552004100 +0300
++++ x86_64/qtbase/src/gui/configure.json	2017-01-26 11:45:32.569724600 +0300
+@@ -465,13 +465,13 @@
+             "label": "  Using system FreeType",
+             "enable": "input.freetype == 'system'",
+             "disable": "input.freetype == 'qt'",
+-            "autoDetect": "!config.win32",
++            "autoDetect": "!config.msvc",
+             "condition": "features.freetype && libs.freetype",
+             "output": [ "privateFeature" ]
+         },
+         "fontconfig": {
+             "label": "Fontconfig",
+-            "condition": "!config.win32 && !config.darwin && features.system-freetype && libs.fontconfig",
++            "condition": "!config.msvc && !config.darwin && features.system-freetype && libs.fontconfig",
+             "output": [ "privateFeature", "feature" ]
+         },
+         "gbm": {

mingw-w64-qt5-git/0007-qt-5.9.0-win32-g-Enable-static-builds.patch

@@ -0,0 +1,40 @@
+From 5d2359f12904691329be75a348d28c59bc299929 Mon Sep 17 00:00:00 2001
+From: Ray Donnelly <mingw.android@gmail.com>
+Date: Mon, 10 Mar 2014 23:25:11 +0000
+Subject: [PATCH] win32-g++: Enable static builds
+
+Change-Id: I05944b0d9d0f6f987331e98a4d9071803349833f
+---
+ mkspecs/features/default_post.prf | 2 +-
+ mkspecs/win32-g++/qmake.conf      | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
+index 938670b..23deaec 100644
+--- a/mkspecs/features/default_post.prf
++++ b/mkspecs/features/default_post.prf
+@@ -61,8 +61,8 @@ debug {
+     QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE
+ }
+ 
++static: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
+ dll:win32: QMAKE_LFLAGS += $$QMAKE_LFLAGS_DLL
+-static:mac: QMAKE_LFLAGS += $$QMAKE_LFLAGS_STATIC_LIB
+ staticlib:unix {
+     QMAKE_CFLAGS += $$QMAKE_CFLAGS_STATIC_LIB
+     QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_STATIC_LIB
+diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
+index 1ac3561..c0f9daa 100644
+--- a/mkspecs/win32-g++/qmake.conf
++++ b/mkspecs/win32-g++/qmake.conf
+@@ -49,6 +49,7 @@ QMAKE_LFLAGS_DEBUG      =
+ QMAKE_LFLAGS_CONSOLE    = -Wl,-subsystem,console
+ QMAKE_LFLAGS_WINDOWS    = -Wl,-subsystem,windows
+ QMAKE_LFLAGS_DLL        = -shared
++QMAKE_LFLAGS_STATIC_LIB = -static
+ QMAKE_LFLAGS_GCSECTIONS = -Wl,--gc-sections
+ QMAKE_LINK_OBJECT_MAX   = 10
+ QMAKE_LINK_OBJECT_SCRIPT = object_script
+-- 
+1.9.2
+

mingw-w64-qt5-git/0011-qt-5.8.0-mingw-dbus-and-pkg-config.patch

@@ -0,0 +1,23 @@
+--- qt-everywhere-opensource-src-5.8.0/qtbase/configure.json.orig	2017-01-25 16:08:36.160957400 +0300
++++ qt-everywhere-opensource-src-5.8.0/qtbase/configure.json	2017-01-26 07:12:57.018632800 +0300
+@@ -163,9 +163,9 @@
+                         "debug": "-ldbus-1d",
+                         "release": "-ldbus-1"
+                     },
+-                    "condition": "config.win32"
++                    "condition": "config.msvc"
+                 },
+-                { "libs": "-ldbus-1", "condition": "!config.win32" }
++                { "libs": "-ldbus-1", "condition": "!config.msvc" }
+             ]
+         },
+         "host_dbus": {
+@@ -467,7 +467,7 @@
+         },
+         "pkg-config": {
+             "label": "Using pkg-config",
+-            "autoDetect": "!config.darwin && !config.win32",
++            "autoDetect": "!config.darwin && !config.msvc",
+             "condition": "tests.pkg-config",
+             "output": [
+                 "publicFeature",

mingw-w64-qt5-git/0016-qt-5.8.0-win32-g++-use-qpa-genericunixfontdatabase.patch

@@ -0,0 +1,11 @@
+--- a/qtbase/src/platformsupport/fontdatabases/fontdatabases.pro	2014-04-08 22:03:26.386318500 +0100
++++ b/qtbase/src/platformsupport/fontdatabases/fontdatabases.pro	2014-04-08 22:01:12.262286900 +0100
+@@ -14,7 +14,7 @@
+         include($$PWD/basic/basic.pri)
+     }
+ 
+-    unix {
++    unix|win32-g++ {
+         include($$PWD/genericunix/genericunix.pri)
+         qtConfig(fontconfig) {
+             include($$PWD/fontconfig/fontconfig.pri)

mingw-w64-qt5-git/0020-qt-5.3.0-use-external-angle-library.patch

@@ -0,0 +1,113 @@
+--- a/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in	2014-12-05 09:24:36.000000000 -0700
++++ b/qtbase/src/gui/Qt5GuiConfigExtras.cmake.in	2014-12-11 10:19:51.599972209 -0700
+@@ -2,9 +2,9 @@
+ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE)
+ 
+ !!IF isEmpty(CMAKE_INCLUDE_DIR_IS_ABSOLUTE)
+-set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR/QtANGLE\")
++set(Qt5Gui_EGL_INCLUDE_DIRS \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$$CMAKE_INCLUDE_DIR\")
+ !!ELSE
+-set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR/QtANGLE\")
++set(Qt5Gui_EGL_INCLUDE_DIRS \"$$CMAKE_INCLUDE_DIR\")
+ !!ENDIF
+ 
+ _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS})
+--- a/qtbase/src/gui/gui.pro	2014-12-05 09:24:35.000000000 -0700
++++ b/qtbase/src/gui/gui.pro	2014-12-11 10:22:37.644366784 -0700
+@@ -17,12 +17,6 @@
+     imageformats \
+     egldeviceintegrations
+ 
+-# This is here only because the platform plugin is no module, obviously.
+-win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
+-    MODULE_AUX_INCLUDES = \
+-        \$\$QT_MODULE_INCLUDE_BASE/QtANGLE
+-}
+-
+ load(qt_module)
+ 
+ # Code coverage with TestCocoon
+@@ -33,6 +27,10 @@
+ 
+ mac:!ios: LIBS_PRIVATE += -framework Cocoa
+ 
++win32:contains(QT_CONFIG, angle) {
++    LIBS_PRIVATE += -lGLESv2
++}
++
+ CONFIG += simd optimize_full
+ 
+ include(accessible/accessible.pri)
+@@ -55,13 +53,21 @@
+ contains(QT_CONFIG, angle) {
+     CMAKE_GL_INCDIRS = $$CMAKE_INCLUDE_DIR
+     CMAKE_ANGLE_EGL_DLL_RELEASE = libEGL.dll
+-    CMAKE_ANGLE_EGL_IMPLIB_RELEASE = libEGL.lib
+     CMAKE_ANGLE_GLES2_DLL_RELEASE = libGLESv2.dll
+-    CMAKE_ANGLE_GLES2_IMPLIB_RELEASE = libGLESv2.lib
+     CMAKE_ANGLE_EGL_DLL_DEBUG = libEGLd.dll
+-    CMAKE_ANGLE_EGL_IMPLIB_DEBUG = libEGLd.lib
+     CMAKE_ANGLE_GLES2_DLL_DEBUG = libGLESv2d.dll
+-    CMAKE_ANGLE_GLES2_IMPLIB_DEBUG = libGLESv2d.lib
++
++    win32-g++* {
++        CMAKE_ANGLE_EGL_IMPLIB_RELEASE = libEGL.dll.a
++        CMAKE_ANGLE_GLES2_IMPLIB_RELEASE = libGLESv2.dll.a
++        CMAKE_ANGLE_EGL_IMPLIB_DEBUG = libEGLd.dll.a
++        CMAKE_ANGLE_GLES2_IMPLIB_DEBUG = libGLESv2d.dll.a
++    } else {
++        CMAKE_ANGLE_EGL_IMPLIB_RELEASE = libEGL.lib
++        CMAKE_ANGLE_GLES2_IMPLIB_RELEASE = libGLESv2.lib
++        CMAKE_ANGLE_EGL_IMPLIB_DEBUG = libEGLd.lib
++        CMAKE_ANGLE_GLES2_IMPLIB_DEBUG = libGLESv2d.lib
++    }
+ 
+     CMAKE_QT_OPENGL_IMPLEMENTATION = GLESv2
+ } else {
+--- a/qtbase/src/opengl/opengl.pro	2014-12-05 09:24:31.000000000 -0700
++++ b/qtbase/src/opengl/opengl.pro	2014-12-11 10:15:45.884805707 -0700
+@@ -13,6 +13,10 @@
+ contains(QT_CONFIG, opengl):CONFIG += opengl
+ contains(QT_CONFIG, opengles2):CONFIG += opengles2
+ 
++win32:contains(QT_CONFIG, angle) {
++    LIBS_PRIVATE += -lGLESv2
++}
++
+ HEADERS += qgl.h \
+            qgl_p.h \
+            qglcolormap.h \
+--- a/qtbase/src/plugins/platforms/windows/windows.pri	2014-12-05 09:24:37.000000000 -0700
++++ b/qtbase/src/plugins/platforms/windows/windows.pri	2014-12-11 10:13:45.228261276 -0700
+@@ -3,6 +3,7 @@
+ !wince: LIBS *= -luser32 -lwinspool -limm32 -lwinmm -loleaut32
+ 
+ contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): LIBS *= -lopengl32
++contains(QT_CONFIG, angle):LIBS += -lGLESv2 -lEGL
+ 
+ mingw: LIBS *= -luuid
+ # For the dialog helpers:
+--- a/qtbase/src/src.pro	2014-12-05 09:24:31.000000000 -0700
++++ b/qtbase/src/src.pro	2014-12-11 10:06:14.882845813 -0700
+@@ -155,10 +155,6 @@
+         SUBDIRS += src_3rdparty_harfbuzzng
+         src_gui.depends += src_3rdparty_harfbuzzng
+     }
+-    win32:contains(QT_CONFIG, angle)|contains(QT_CONFIG, dynamicgl) {
+-        SUBDIRS += src_angle
+-        src_gui.depends += src_angle
+-    }
+     contains(QT_CONFIG, freetype) {
+         SUBDIRS += src_3rdparty_freetype
+         src_platformsupport.depends += src_3rdparty_freetype
+--- a/qtbase/src/plugins/platforms/windows/qwindowseglcontext.cpp	2014-12-05 09:24:37.000000000 -0700
++++ b/qtbase/src/plugins/platforms/windows/qwindowseglcontext.cpp	2014-12-11 20:07:27.099190408 -0700
+@@ -39,7 +39,7 @@
+ #include <QtGui/QOpenGLContext>
+ 
+ #if defined(QT_OPENGL_ES_2_ANGLE) || defined(QT_OPENGL_DYNAMIC)
+-#  include <QtANGLE/EGL/eglext.h>
++#  include <EGL/eglext.h>
+ #endif
+ 
+ QT_BEGIN_NAMESPACE

mingw-w64-qt5-git/0023-qt-5.3.0-env-set-external-angle.patch

@@ -0,0 +1,53 @@
+--- x86_64/qtbase/tools/configure/configureapp.cpp.orig	2014-03-23 03:12:04.000000000 +0400
++++ x86_64/qtbase/tools/configure/configureapp.cpp	2014-04-10 22:56:50.341400000 +0400
+@@ -2077,6 +2077,8 @@
+ 
+ bool Configure::checkAngleAvailability(QString *errorMessage /* = 0 */) const
+ {
++    const QByteArray externalAngle = qgetenv("EXTERNAL_ANGLE");
++    if (externalAngle.isEmpty()) {
+     // Check for Direct X SDK (include lib and direct shader compiler 'fxc').
+     // Up to Direct X SDK June 2010 and for MinGW, this is pointed to by the
+     // DXSDK_DIR variable. Starting with Windows Kit 8, it is included
+@@ -2120,6 +2122,7 @@
+             *errorMessage = QString::fromLatin1("The shader compiler '%1' could not be found.").arg(fxcBinary);
+         return false;
+     }
++    }
+     return true;
+ }
+ 
+--- x86_64/qtbase/tools/configure/environment.cpp.orig	2014-04-10 22:49:11.171000000 +0400
++++ x86_64/qtbase/tools/configure/environment.cpp	2014-04-10 22:57:20.901800000 +0400
+@@ -610,11 +610,14 @@
+     // MinGW: Although gcc doesn't care about INCLUDE, qmake automatically adds it via -I
+     headerPaths += splitPathList(QString::fromLocal8Bit(getenv("INCLUDE")));
+ 
++    const QByteArray externalAngle = qgetenv("EXTERNAL_ANGLE");
++    if (externalAngle.isEmpty()) {
+     // Add Direct X SDK for ANGLE
+     const QString directXSdk = detectDirectXSdk();
+     if (!directXSdk.isEmpty()) // Add Direct X SDK for ANGLE
+         headerPaths += directXSdk + QLatin1String("/include");
+     return headerPaths;
++    }
+ }
+ 
+ QStringList Environment::libraryPaths(Compiler compiler)
+@@ -626,6 +629,8 @@
+     // MinGW: Although gcc doesn't care about LIB, qmake automatically adds it via -L
+     libraryPaths += splitPathList(QString::fromLocal8Bit(qgetenv("LIB")));
+ 
++    const QByteArray externalAngle = qgetenv("EXTERNAL_ANGLE");
++    if (externalAngle.isEmpty()) {
+     // Add Direct X SDK for ANGLE
+     const QString directXSdk = detectDirectXSdk();
+     if (!directXSdk.isEmpty()) {
+@@ -635,6 +640,7 @@
+         libraryPaths += directXSdk + QLatin1String("/lib/x86");
+ #endif
+     }
++    }
+     return libraryPaths;
+ }
+ 

mingw-w64-qt5-git/0024-qt-5.9.2-icu-add-U_LIB_SUFFIX_C_NAME.patch

@@ -0,0 +1,21 @@
+--- a/qtlocation/src/3rdparty/icu_dependency.pri
++++ b/qtlocation/src/3rdparty/icu_dependency.pri
+@@ -2,11 +2,17 @@
+     CONFIG(static, static|shared) {
+         CONFIG(debug, debug|release) {
+             LIBS_PRIVATE += -lsicuind -lsicuucd -lsicudtd
++            DEFINES += "U_LIB_SUFFIX_C_NAME=d"
+         } else {
+             LIBS_PRIVATE += -lsicuin -lsicuuc -lsicudt
+         }
+     } else {
+-        LIBS_PRIVATE += -licuin -licuuc -licudt
++        CONFIG(debug, debug|release) {
++            LIBS_PRIVATE += -licuind -licuucd -licudtd
++            DEFINES += "U_LIB_SUFFIX_C_NAME=d"
++        } else {
++            LIBS_PRIVATE += -licuin -licuuc -licudt
++        }
+     }
+ } else {
+     LIBS_PRIVATE += -licui18n -licuuc -licudata

mingw-w64-qt5-git/0025-qt-5.8.0-force-using-make-on-msys.patch

@@ -0,0 +1,17 @@
+--- qt-everywhere-opensource-src-5.8.0/qtbase/mkspecs/features/configure_base.prf.orig	2014-04-20 21:21:48.808906400 +0100
++++ qt-everywhere-opensource-src-5.8.0/qtbase/mkspecs/features/configure_base.prf	2014-04-20 21:20:41.677381800 +0100
+@@ -10,10 +10,10 @@
+ !isEmpty(QMAKE_MAKE) {
+     # We were called recursively. Use the same make.
+ } else: if(equals(MAKEFILE_GENERATOR, UNIX)|equals(MAKEFILE_GENERATOR, MINGW)) {
+-    !equals(QMAKE_HOST.os, Windows): \
+-        QMAKE_MAKE = make
+-    else: \
+-        QMAKE_MAKE = mingw32-make
++    equals(QMAKE_HOST.os, Windows):isEmpty(QMAKE_SH): \
++        QMAKE_MAKE = mingw32-make
++    else: \
++        QMAKE_MAKE = make
+ } else: if(equals(MAKEFILE_GENERATOR, MSVC.NET)|equals(MAKEFILE_GENERATOR, MSBUILD)) {
+     QMAKE_MAKE = nmake
+ } else {

mingw-w64-qt5-git/0028-qt-5.8.0-Revert-untangle-use-of-system-vs.-shell-path-list-se.patch

@@ -0,0 +1,103 @@
+From f5380f44d371f470b3455e1b604046af655e5be9 Mon Sep 17 00:00:00 2001
+From: Ray Donnelly <mingw.android@gmail.com>
+Date: Sun, 29 Jun 2014 21:16:08 +0100
+Subject: [PATCH] Revert "untangle use of system vs. shell path(-list)
+ semantics"
+
+This reverts commit e5024c219fffa972e087a684bacef240082dca82.
+---
+ mkspecs/features/default_post.prf      | 4 ++--
+ mkspecs/features/incredibuild_xge.prf  | 2 +-
+ mkspecs/features/java.prf              | 2 +-
+ mkspecs/features/testcase.prf          | 2 +-
+ mkspecs/features/win32/windeployqt.prf | 6 +++---
+ qtbase.pro                             | 2 +-
+ 7 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf
+index 6fb140b..938670b 100644
+--- a/mkspecs/features/default_post.prf
++++ b/mkspecs/features/default_post.prf
+@@ -83,8 +83,8 @@ silent {
+ 
+ breakpad {
+     load(resolve_target)
+-    DEBUGFILENAME = $$shell_quote($$system_path($$QMAKE_RESOLVED_TARGET))
+-    PROJECTPATH = $$shell_quote($$system_path($$OUT_PWD))
++    DEBUGFILENAME = $$shell_quote($$shell_path($$QMAKE_RESOLVED_TARGET))
++    PROJECTPATH = $$shell_quote($$shell_path($$OUT_PWD))
+ 
+     !isEmpty(QMAKE_POST_LINK):QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)
+     QMAKE_POST_LINK = $$QMAKE_POST_LINK$$quote($${QT_BREAKPAD_ROOT_PATH}$${QMAKE_DIR_SEP}qtbreakpadsymbols $$DEBUGFILENAME $$PROJECTPATH)
+diff --git a/mkspecs/features/incredibuild_xge.prf b/mkspecs/features/incredibuild_xge.prf
+index 75c7a9a..b43ecf2 100644
+--- a/mkspecs/features/incredibuild_xge.prf
++++ b/mkspecs/features/incredibuild_xge.prf
+@@ -3,6 +3,6 @@ contains(TEMPLATE, "vc.*") {
+     EOC = $$escape_expand(\\r\\h)
+ 
+     for(xge, INCREDIBUILD_XGE) {
+-        $${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$system_path($${xge}.output) $$EOC $$eval($${xge}.commands)
++        $${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$shell_path($${xge}.output) $$EOC $$eval($${xge}.commands)
+     }
+ }
+diff --git a/mkspecs/features/java.prf b/mkspecs/features/java.prf
+index 790724c..eeaafcc 100644
+--- a/mkspecs/features/java.prf
++++ b/mkspecs/features/java.prf
+@@ -44,7 +44,7 @@ CONFIG += plugin no_plugin_name_prefix
+ javac.input = JAVASOURCES
+ javac.output = $$CLASS_DIR
+ javac.CONFIG += combine
+-javac.commands = javac -source 6 -target 6 -Xlint:unchecked -bootclasspath $$ANDROID_JAR_FILE -cp $$shell_quote($$system_path($$join(JAVACLASSPATH, $$DIRLIST_SEPARATOR))) -d $$shell_quote($$CLASS_DIR) ${QMAKE_FILE_IN}
++javac.commands = javac -source 6 -target 6 -Xlint:unchecked -bootclasspath $$ANDROID_JAR_FILE -cp $$shell_quote($$shell_path($$join(JAVACLASSPATH, $$QMAKE_DIRLIST_SEP))) -d $$shell_quote($$CLASS_DIR) ${QMAKE_FILE_IN}
+ # Force rebuild every time, because we don't know the paths of the destination files
+ # as they depend on the code.
+ javac.depends = FORCE
+diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf
+index 770afa3..c06cbf1 100644
+--- a/mkspecs/features/testcase.prf
++++ b/mkspecs/features/testcase.prf
+@@ -45,8 +45,7 @@ qtAddTargetEnv(check.commands, QT)
+ # Allow for custom arguments to tests
+ $${type}.commands += $(TESTARGS)
+ 
+-!isEmpty(TESTRUN_CWD):!contains(TESTRUN_CWD, ^\\./?): \
+-    $${type}.commands = $$QMAKE_CD $$shell_path($$TESTRUN_CWD) && $$eval($${type}.commands)
++    $${type}.commands = $$QMAKE_CD $$system_path($$TESTRUN_CWD) && $$eval($${type}.commands)
+ 
+ # If the test is marked as insignificant, discard the exit code
+ insignificant_test: $${type}.commands = -$$eval($${type}.commands)
+diff --git a/mkspecs/features/win32/windeployqt.prf b/mkspecs/features/win32/windeployqt.prf
+index 22253f6..f49df47 100644
+--- a/mkspecs/features/win32/windeployqt.prf
++++ b/mkspecs/features/win32/windeployqt.prf
+@@ -3,9 +3,9 @@ qtPrepareTool(QMAKE_WINDEPLOYQT, windeployqt)
+ build_pass {
+     load(resolve_target)
+ 
+-    isEmpty(WINDEPLOYQT_OPTIONS): WINDEPLOYQT_OPTIONS = -qmldir $$shell_quote($$system_path($$_PRO_FILE_PWD_))
+-    WINDEPLOYQT_TARGET = $$shell_quote($$system_path($$QMAKE_RESOLVED_TARGET))
+-    WINDEPLOYQT_OUTPUT = $$shell_quote($$system_path($$dirname(QMAKE_RESOLVED_TARGET)/$$basename(TARGET).windeployqt))
++    isEmpty(WINDEPLOYQT_OPTIONS): WINDEPLOYQT_OPTIONS = -qmldir $$shell_quote($$shell_path($$_PRO_FILE_PWD_))
++    WINDEPLOYQT_TARGET = $$shell_quote($$shell_path($$QMAKE_RESOLVED_TARGET))
++    WINDEPLOYQT_OUTPUT = $$shell_quote($$shell_path($$dirname(QMAKE_RESOLVED_TARGET)/$$basename(TARGET).windeployqt))
+     windeployqt.target = windeployqt
+     windeployqt.commands = $$QMAKE_WINDEPLOYQT $$WINDEPLOYQT_OPTIONS -list target $$WINDEPLOYQT_TARGET > $$WINDEPLOYQT_OUTPUT
+ 
+diff --git a/qtbase.pro b/qtbase.pro
+index d6861cf..ed6fc39 100644
+--- a/qtbase.pro
++++ b/qtbase.pro
+@@ -87,7 +87,7 @@ INSTALLS += syncqt
+ # qtPrepareTool() to find the non-installed syncqt.
+ prefix_build|!equals(PWD, $$OUT_PWD) {
+ 
+-    cmd = perl -w $$system_path($$PWD/bin/syncqt.pl)
++    cmd = perl -w $$shell_path($$PWD/bin/syncqt.pl)
+ 
+     TOOL_PRI = $$OUT_PWD/mkspecs/modules/qt_tool_syncqt.pri
+ 
+-- 
+2.0.1
+

mingw-w64-qt5-git/0029-qt-5.8.0-Revert-fix-quoting-and-path-separators-in-qtPrepareT.patch

@@ -0,0 +1,96 @@
+From 036ba8edbe4103a7f7b63d2f84730afbddbb3d7d Mon Sep 17 00:00:00 2001
+From: Ray Donnelly <mingw.android@gmail.com>
+Date: Sun, 29 Jun 2014 20:30:50 +0100
+Subject: [PATCH] Revert "fix quoting and path separators in qtPrepareTool()"
+
+This reverts commit 4a35f21208f2f6ae23a4a2f668c72ea6d9def4c9.
+---
+ mkspecs/features/qt_functions.prf | 24 ++++++++++--------------
+ mkspecs/features/qt_tool.prf      |  3 +--
+ 2 files changed, 11 insertions(+), 16 deletions(-)
+
+diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
+index 9a4d80e..5dd6987 100644
+--- a/mkspecs/features/qt_functions.prf
++++ b/mkspecs/features/qt_functions.prf
+@@ -55,40 +55,36 @@ defineTest(qtAddRpathLink) {
+ 
+ # variable, default, [suffix for variable for system() use], [prepare primary variable for system() use]
+ defineTest(qtPrepareTool) {
+-    cmd = $$eval(QT_TOOL.$${2}.binary)
+-    isEmpty(cmd) {
+-        cmd = $$[QT_HOST_BINS]/$$2
+-        exists($${cmd}.pl) {
+-            $${1}_EXE = $${cmd}.pl
+-            cmd = perl -w $$system_path($${cmd}.pl)
++    $$1 = $$eval(QT_TOOL.$${2}.binary)
++    isEmpty($$1) {
++        $$1 = $$[QT_HOST_BINS]/$$2
++        exists($$eval($$1).pl) {
++            $${1}_EXE =  $$eval($$1).pl
++            $$1 = perl -w $$eval($$1).pl
+         } else: contains(QMAKE_HOST.os, Windows) {
+-            $${1}_EXE = $${cmd}.exe
+-            cmd = $$system_path($${cmd}.exe)
++            $${1}_EXE = $$eval($$1).exe
++            $$1 = $$eval($$1).exe
+         } else:contains(QMAKE_HOST.os, Darwin) {
+-            BUNDLENAME = $${cmd}.app/Contents/MacOS/$$2
++            BUNDLENAME = $$eval($$1).app/Contents/MacOS/$$2
+             exists($$BUNDLENAME) {
+-                cmd = $$BUNDLENAME
++                $$1 = $$BUNDLENAME
+             }
+-            $${1}_EXE = $$cmd
++            $${1}_EXE = $$eval($$1).exe
+         } else {
+-            $${1}_EXE = $$cmd
++            $${1}_EXE = $$eval($$1).exe
+         }
+     } else {
+-        $${1}_EXE = $$last(cmd)
++        $${1}_EXE = $$last($$eval($$1))
+     }
+     export($${1}_EXE)
+     QT_TOOL_ENV += $$eval(QT_TOOL.$${2}.envvars)
+     QT_TOOL_NAME = $$2
+     !isEmpty(3)|!isEmpty(4) {
+-        $$1$$3 =
+-        for (arg, cmd): \
+-            $$1$$3 += $$system_quote($$arg)
++        $$1$$3 = $$system_path($$eval($$1))
+         qtAddTargetEnv($$1$$3, QT_TOOL.$${2}.depends, system)
+     }
+     isEmpty(4) {
+-        $$1 =
+-        for (arg, cmd): \
+-            $$1 += $$shell_quote($$arg)
++        $$1 = $$shell_path($$eval($$1))
+         qtAddTargetEnv($$1, QT_TOOL.$${2}.depends, )
+     }
+ }
+diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf
+index 1d3e88c..f0864f9 100644
+--- a/mkspecs/features/qt_tool.prf
++++ b/mkspecs/features/qt_tool.prf
+@@ -45,15 +45,14 @@ CONFIG += console
+             module_envvars =
+         }
+ 
+-        bin = $$system_path($$QMAKE_RESOLVED_TARGET)
++        bin = $$QMAKE_RESOLVED_TARGET
+     } else {
+         bin = $${HOST_QT_TOOLS}/$${TARGET}
+         equals(QMAKE_HOST.os, Windows): bin = $${bin}.exe
+-        bin = $$system_path($$bin)
+     }
+ 
+     TOOL_PRI_CONT = \
+-        "QT_TOOL.$${MODULE}.binary = $$val_escape(bin)" \
++        "QT_TOOL.$${MODULE}.binary = $$bin" \
+         "QT_TOOL.$${MODULE}.depends =$$join(MODULE_DEPENDS, " ", " ")" \
+         $$module_envvars
+     write_file($$TOOL_PRI, TOOL_PRI_CONT)|error()
+-- 
+2.0.1
+

mingw-w64-qt5-git/0046-qt-5.4.1-Revert-Revert-fix-NTFS-mount-points.patch

@@ -0,0 +1,120 @@
+From 1d9aff66270aba6d16077f460aa85fbf161aba99 Mon Sep 17 00:00:00 2001
+From: Joerg Bornemann <joerg.bornemann@nokia.com>
+Date: Tue, 17 Jan 2012 14:21:05 +0100
+Subject: [PATCH] Revert "Revert "fix NTFS mount points""
+
+This reverts commit 49d1b068987d0895b2429b3d87beb561d9fbcbd7
+
+Because of https://github.com/msys2/msys2.github.io/issues/4
+
+.. bringing back:
+
+fix NTFS mount points
+
+NTFS mount points are not treated as symlinks, because they might
+not have a link target.
+This is the case when a volume is mounted as a single mount point
+without a drive letter.
+This patch fixes building Qt in an NTFS mount point.
+
+Task-number: QTBUG-20431
+Change-Id: Ie2e15212e1a7ca7fa0067b7ca8857e243e42c21a
+Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
+---
+ src/corelib/io/qfilesystemengine_win.cpp   | 10 ++++++----
+ src/corelib/io/qfilesystemiterator_win.cpp |  2 +-
+ src/corelib/io/qfilesystemmetadata_p.h     | 23 +++++++++++++++++------
+ 3 files changed, 24 insertions(+), 11 deletions(-)
+
+diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp
+index 221cea3..fa56d7c 100644
+--- a/src/corelib/io/qfilesystemengine_win.cpp
++++ b/src/corelib/io/qfilesystemengine_win.cpp
+@@ -914,9 +914,10 @@ static bool tryFindFallback(const QFileSystemEntry &fname, QFileSystemMetaData &
+     int errorCode = GetLastError();
+     if (errorCode == ERROR_ACCESS_DENIED || errorCode == ERROR_SHARING_VIOLATION) {
+         WIN32_FIND_DATA findData;
+-        if (getFindData(fname.nativeFilePath(), findData)
++        const QString nativeFilePath = fname.nativeFilePath();
++        if (getFindData(nativeFilePath, findData)
+             && findData.dwFileAttributes != INVALID_FILE_ATTRIBUTES) {
+-            data.fillFromFindData(findData, true, fname.isDriveRoot());
++            data.fillFromFindData(findData, true, fname.isDriveRoot(), nativeFilePath);
+             filledData = true;
+         }
+     }
+@@ -1031,8 +1032,9 @@ bool QFileSystemEngine::fillMetaData(const QFileSystemEntry &entry, QFileSystemM
+         data.knownFlagsMask |= QFileSystemMetaData::LinkType;
+         if (data.fileAttribute_ & FILE_ATTRIBUTE_REPARSE_POINT) {
+             WIN32_FIND_DATA findData;
+-            if (getFindData(fname.nativeFilePath(), findData))
+-                data.fillFromFindData(findData, true);
++            const QString nativeFilePath = fname.nativeFilePath();
++            if (getFindData(nativeFilePath, findData))
++                data.fillFromFindData(findData, true, false, nativeFilePath);
+         }
+     }
+     data.knownFlagsMask |= what;
+diff --git a/src/corelib/io/qfilesystemiterator_win.cpp b/src/corelib/io/qfilesystemiterator_win.cpp
+index 6351a35..6fa22ef 100644
+--- a/src/corelib/io/qfilesystemiterator_win.cpp
++++ b/src/corelib/io/qfilesystemiterator_win.cpp
+@@ -138,7 +138,7 @@ bool QFileSystemIterator::advance(QFileSystemEntry &fileEntry, QFileSystemMetaDa
+         fileEntry = QFileSystemEntry(dirPath + fileName);
+         metaData = QFileSystemMetaData();
+         if (!fileName.endsWith(QLatin1String(".lnk"))) {
+-            metaData.fillFromFindData(findData, true);
++            metaData.fillFromFindData(findData, true, false, fileEntry.nativeFilePath());
+         }
+         return true;
+     }
+diff --git a/src/corelib/io/qfilesystemmetadata_p.h b/src/corelib/io/qfilesystemmetadata_p.h
+index da9576b..266111e 100644
+--- a/src/corelib/io/qfilesystemmetadata_p.h
++++ b/src/corelib/io/qfilesystemmetadata_p.h
+@@ -211,7 +211,7 @@ public:
+ 
+ #if defined(Q_OS_WIN)
+     inline void fillFromFileAttribute(DWORD fileAttribute, bool isDriveRoot = false);
+-    inline void fillFromFindData(WIN32_FIND_DATA &findData, bool setLinkType = false, bool isDriveRoot = false);
++    inline void fillFromFindData(WIN32_FIND_DATA &findData, bool setLinkType = false, bool isDriveRoot = false, const QString &nativeFullFilePath = QString());
+ #  ifndef Q_OS_WINRT
+     inline void fillFromFindInfo(BY_HANDLE_FILE_INFORMATION &fileInfo);
+ #  endif
+@@ -308,7 +308,7 @@ inline void QFileSystemMetaData::fillFromFileAttribute(DWORD fileAttribute,bool
+     knownFlagsMask |= FileType | DirectoryType | HiddenAttribute | ExistsAttribute;
+ }
+ 
+-inline void QFileSystemMetaData::fillFromFindData(WIN32_FIND_DATA &findData, bool setLinkType, bool isDriveRoot)
++inline void QFileSystemMetaData::fillFromFindData(WIN32_FIND_DATA &findData, bool setLinkType, bool isDriveRoot, const QString &nativeFullFilePath)
+ {
+     fillFromFileAttribute(findData.dwFileAttributes, isDriveRoot);
+     creationTime_ = findData.ftCreationTime;
+@@ -326,9 +326,21 @@ inline void QFileSystemMetaData::fillFromFindData(WIN32_FIND_DATA &findData, boo
+     if (setLinkType) {
+         knownFlagsMask |=  LinkType;
+         entryFlags &= ~LinkType;
+-        if ((fileAttribute_ & FILE_ATTRIBUTE_REPARSE_POINT)
+-            && (findData.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
+-            entryFlags |= LinkType;
++        if (fileAttribute_ & FILE_ATTRIBUTE_REPARSE_POINT) {
++            if (findData.dwReserved0 == IO_REPARSE_TAG_SYMLINK) {
++                entryFlags |= LinkType;
++            } else if (findData.dwReserved0 == IO_REPARSE_TAG_MOUNT_POINT) {
++                // Junctions and mount points are implemented as NTFS reparse points.
++                // But mount points cannot be treated as symlinks because they might
++                // not have a link target.
++                wchar_t buf[50];
++                QString path = nativeFullFilePath;
++                if (!path.endsWith(QLatin1Char('\\')))
++                    path.append(QLatin1Char('\\'));
++                BOOL isMountPoint = GetVolumeNameForVolumeMountPoint(reinterpret_cast<const wchar_t*>(path.utf16()), buf, sizeof(buf) / sizeof(wchar_t));
++                if (!isMountPoint)
++                    entryFlags |= LinkType;
++            }
+         }
+     }
+ }
+-- 
+2.3.4
+

mingw-w64-qt5-git/0049-qt-5.8.0-win32-do-not-use-fontconfig.patch

@@ -0,0 +1,11 @@
+--- x86_64/qtbase/src/plugins/platforms/minimal/qminimalintegration.cpp.orig	2016-06-08 20:09:49.795870200 +0300
++++ x86_64/qtbase/src/plugins/platforms/minimal/qminimalintegration.cpp	2016-06-08 20:10:59.856863400 +0300
+@@ -112,7 +112,7 @@
+ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const
+ {
+     if (m_options & EnableFonts) {
+-#if QT_CONFIG(fontconfig)
++#if QT_CONFIG(fontconfig) && !defined(Q_OS_WIN)
+         if (!m_fontDatabase)
+             m_fontDatabase = new QGenericUnixFontDatabase;
+ #else

mingw-w64-qt5-git/0049-qt-5.9.0-win32-do-not-use-fontconfig.patch

@@ -0,0 +1,11 @@
+--- x86_64/qtbase/src/plugins/platforms/minimal/qminimalintegration.cpp.orig	2016-06-08 20:09:49.795870200 +0300
++++ x86_64/qtbase/src/plugins/platforms/minimal/qminimalintegration.cpp	2016-06-08 20:10:59.856863400 +0300
+@@ -129,7 +129,7 @@
+ QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const
+ {
+     if (!m_fontDatabase && (m_options & EnableFonts)) {
+-#if QT_CONFIG(fontconfig)
++#if QT_CONFIG(fontconfig) && !defined(Q_OS_WIN)
+         m_fontDatabase = new QGenericUnixFontDatabase;
+ #elif defined(Q_OS_WINRT)
+         m_fontDatabase = new QWinRTFontDatabase;

mingw-w64-qt5-git/0051-qt-5.9.0-disable-qtlocation-mapboxgl-plugin.patch

@@ -0,0 +1,22 @@
+--- qt-everywhere-opensource-src-5.9.0.orig/qtlocation/src/plugins/geoservices/geoservices.pro	2017-06-07 19:05:58.022981900 +0200
++++ qt-everywhere-opensource-src-5.9.0/qtlocation/src/plugins/geoservices/geoservices.pro	2017-06-07 19:00:24.921062300 +0200
+@@ -6,11 +6,11 @@
+     SUBDIRS += osm
+ }
+ 
+-qtConfig(c++14):!win32|mingw:!qnx {
+-    !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
+-        warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
+-    } else {
+-        SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native
+-        mapboxgl.depends = ../../3rdparty/mapbox-gl-native
+-    }
+-}
++#qtConfig(c++14):!win32|mingw:!qnx {
++#    !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
++#        warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
++#    } else {
++#        SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native
++#        mapboxgl.depends = ../../3rdparty/mapbox-gl-native
++#    }
++#}

mingw-w64-qt5-git/0051-qt-5.9.1-disable-qtlocation-mapboxgl-plugin.patch

@@ -0,0 +1,22 @@
+--- a/qtlocation/src/plugins/geoservices/geoservices.pro
++++ b/qtlocation/src/plugins/geoservices/geoservices.pro
+@@ -6,11 +6,11 @@ qtConfig(concurrent) {
+     SUBDIRS += osm
+ }
+ 
+-qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
+-    !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
+-        warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
+-    } else {
+-        SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native
+-        mapboxgl.depends = ../../3rdparty/mapbox-gl-native
+-    }
+-}
++#qtConfig(opengl):qtConfig(c++14):!win32|mingw:!qnx {
++#    !exists(../../3rdparty/mapbox-gl-native/CMakeLists.txt) {
++#        warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.")
++#    } else {
++#        SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native
++#        mapboxgl.depends = ../../3rdparty/mapbox-gl-native
++#    }
++#}

mingw-w64-qt5-git/0125-qt-5.8.0-windeployqt-fixes.patch

@@ -0,0 +1,74 @@
+From fccfcf6e3b023ef392e1a199a14459ae30a6b44f Mon Sep 17 00:00:00 2001
+From: James Duley <jagduley@gmail.com>
+Date: Mon, 20 Jun 2016 15:10:09 +0100
+Subject: [PATCH] Fix windeployqt for MSYS2
+
+Note this breaks normal MinGW deployment
+---
+ src/windeployqt/main.cpp | 36 +-----------------------------------
+ 1 file changed, 1 insertion(+), 35 deletions(-)
+
+diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
+index 6c78353..3ac75d8 100644
+--- a/src/windeployqt/main.cpp
++++ b/src/windeployqt/main.cpp
+@@ -1010,7 +1010,7 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned
+     QStringList result;
+     switch (platform) {
+     case WindowsMinGW: { // MinGW: Add runtime libraries
+-        static const char *minGwRuntimes[] = {"*gcc_", "*stdc++", "*winpthread"};
++        static const char *minGwRuntimes[] = {"*gcc_s_", "*stdc++", "*winpthread"};
+         const QString gcc = findInPath(QStringLiteral("g++.exe"));
+         if (gcc.isEmpty()) {
+             std::wcerr << "Warning: Cannot find GCC installation directory. g++.exe must be in the path.\n";
+@@ -1194,38 +1194,6 @@ static DeployResult deploy(const Options &options,
+         return result;
+     }
+ 
+-    // Some Windows-specific checks: Qt5Core depends on ICU when configured with "-icu". Other than
+-    // that, Qt5WebKit has a hard dependency on ICU.
+-    if (options.platform & WindowsBased)  {
+-        const QStringList qtLibs = dependentQtLibs.filter(QStringLiteral("Qt5Core"), Qt::CaseInsensitive)
+-            + dependentQtLibs.filter(QStringLiteral("Qt5WebKit"), Qt::CaseInsensitive);
+-        foreach (const QString &qtLib, qtLibs) {
+-            QStringList icuLibs = findDependentLibraries(qtLib, options.platform, errorMessage).filter(QStringLiteral("ICU"), Qt::CaseInsensitive);
+-            if (!icuLibs.isEmpty()) {
+-                // Find out the ICU version to add the data library icudtXX.dll, which does not show
+-                // as a dependency.
+-                QRegExp numberExpression(QStringLiteral("\\d+"));
+-                Q_ASSERT(numberExpression.isValid());
+-                const int index = numberExpression.indexIn(icuLibs.front());
+-                if (index >= 0)  {
+-                    const QString icuVersion = icuLibs.front().mid(index, numberExpression.matchedLength());
+-                    if (optVerboseLevel > 1)
+-                        std::wcout << "Adding ICU version " << icuVersion << '\n';
+-                    icuLibs.push_back(QStringLiteral("icudt") + icuVersion + QLatin1String(windowsSharedLibrarySuffix));
+-                }
+-                foreach (const QString &icuLib, icuLibs) {
+-                    const QString icuPath = findInPath(icuLib);
+-                    if (icuPath.isEmpty()) {
+-                        *errorMessage = QStringLiteral("Unable to locate ICU library ") + icuLib;
+-                        return result;
+-                    }
+-                    dependentQtLibs.push_back(icuPath);
+-                } // foreach icuLib
+-                break;
+-            } // !icuLibs.isEmpty()
+-        } // Qt5Core/Qt5WebKit
+-    } // Windows
+-
+     // Scan Quick2 imports
+     QmlImportScanResult qmlScanResult;
+     if (options.quickImports && usesQml2) {
+@@ -1522,8 +1490,6 @@ int main(int argc, char **argv)
+     const QMap<QString, QString> qmakeVariables = queryQMakeAll(&errorMessage);
+     const QString xSpec = qmakeVariables.value(QStringLiteral("QMAKE_XSPEC"));
+     options.platform = platformFromMkSpec(xSpec);
+-    if (options.platform == WindowsMinGW || options.platform == Windows)
+-        options.compilerRunTime = true;
+ 
+     {   // Command line
+         QCommandLineParser parser;
+-- 
+2.8.2
+

mingw-w64-qt5-git/0125-qt-5.9.0-windeployqt-fixes.patch

@@ -0,0 +1,35 @@
+From fccfcf6e3b023ef392e1a199a14459ae30a6b44f Mon Sep 17 00:00:00 2001
+From: James Duley <jagduley@gmail.com>
+Date: Mon, 20 Jun 2016 15:10:09 +0100
+Subject: [PATCH] Fix windeployqt for MSYS2
+
+Note this breaks normal MinGW deployment
+---
+ src/windeployqt/main.cpp | 36 +-----------------------------------
+ 1 file changed, 1 insertion(+), 35 deletions(-)
+
+diff --git a/src/windeployqt/main.cpp b/src/windeployqt/main.cpp
+index 6c78353..3ac75d8 100644
+--- a/src/windeployqt/main.cpp
++++ b/src/windeployqt/main.cpp
+@@ -1010,7 +1010,7 @@ static QStringList compilerRunTimeLibs(Platform platform, bool isDebug, unsigned
+     QStringList result;
+     switch (platform) {
+     case WindowsMinGW: { // MinGW: Add runtime libraries
+-        static const char *minGwRuntimes[] = {"*gcc_", "*stdc++", "*winpthread"};
++        static const char *minGwRuntimes[] = {"*gcc_s_", "*stdc++", "*winpthread"};
+         const QString gcc = findInPath(QStringLiteral("g++.exe"));
+         if (gcc.isEmpty()) {
+             std::wcerr << "Warning: Cannot find GCC installation directory. g++.exe must be in the path.\n";
+@@ -1522,8 +1490,6 @@ int main(int argc, char **argv)
+     const QMap<QString, QString> qmakeVariables = queryQMakeAll(&errorMessage);
+     const QString xSpec = qmakeVariables.value(QStringLiteral("QMAKE_XSPEC"));
+     options.platform = platformFromMkSpec(xSpec);
+-    if (options.platform == WindowsMinGW || options.platform == Windows)
+-        options.compilerRunTime = true;
+ 
+     {   // Command line
+         QCommandLineParser parser;
+-- 
+2.8.2
+

mingw-w64-qt5-git/0300-qt-5.8.0-cast-errors.patch

@@ -0,0 +1,11 @@
+--- x86_64/qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp.orig	2017-01-26 15:35:53.584495700 +0300
++++ x86_64/qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp	2017-01-26 15:40:06.088564600 +0300
+@@ -113,7 +113,7 @@
+                         UINT size;
+                         DWORD *fi;
+ 
+-                        if (VerQueryValue(info.constData(), __TEXT("\\"), (LPVOID *) &fi, &size) && size) {
++                        if (VerQueryValue(info.data(), __TEXT("\\"), (LPVOID *) &fi, &size) && size) {
+                             VS_FIXEDFILEINFO *verInfo = (VS_FIXEDFILEINFO *) fi;
+                             return Direct2DVersion(HIWORD(verInfo->dwFileVersionMS),
+                                                    LOWORD(verInfo->dwFileVersionMS),