Update to 5.8.0

1 files changed, 9 insertions, 21 deletions

diff --git a/0020-Use-.dll.a-as-import-lib-extension.patch b/0020-Use-.dll.a-as-import-lib-extension.patch
index d86cb4642eb0..0f840ab8ae7a 100644
--- a/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/0020-Use-.dll.a-as-import-lib-extension.patch
@@ -1,16 +1,17 @@
-From dd6f19fca955ac5918c3b0dca245f9eec9f0755e Mon Sep 17 00:00:00 2001
+From 6993d2146fb9adf79f7e1f28b44b12a2104ed71c Mon Sep 17 00:00:00 2001
 From: Martchus <martchus@gmx.net>
 Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 20/26] Use *.dll.a as import lib extension
+Subject: [PATCH 20/30] Use *.dll.a as import lib extension
 
+The variables used here are provided by
+mingw-w64 specific mkspec
 ---
  mkspecs/features/create_cmake.prf      |  5 +++--
- mkspecs/win32-g++/qmake.conf           |  2 +-
  qmake/generators/win32/winmakefile.cpp | 17 ++++++++++++-----
- 3 files changed, 16 insertions(+), 8 deletions(-)
+ 2 files changed, 15 insertions(+), 7 deletions(-)
 
 diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 4adacf6762..0ff1c6d142 100644
+index ed9b82fba9..461a7fdff5 100644
 --- a/mkspecs/features/create_cmake.prf
 +++ b/mkspecs/features/create_cmake.prf
 @@ -236,8 +236,9 @@ mac {
@@ -25,21 +26,8 @@ index 4adacf6762..0ff1c6d142 100644
          }
      } else {
          CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib
-diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
-index 3ee820e54b..44253a2a37 100644
---- a/mkspecs/win32-g++/qmake.conf
-+++ b/mkspecs/win32-g++/qmake.conf
-@@ -93,7 +93,7 @@ QMAKE_PREFIX_SHLIB      =
- QMAKE_EXTENSION_SHLIB   = dll
- QMAKE_PREFIX_STATICLIB  = lib
- QMAKE_EXTENSION_STATICLIB = a
--QMAKE_LIB_EXTENSIONS    = a dll.a
-+QMAKE_EXTENSION_IMPORTLIB    = dll.a
- 
- QMAKE_LIBS              =
- QMAKE_LIBS_CORE         = -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32 -lz -lpcre16
 diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
-index 543e905051..456f21cedb 100644
+index caa000ea53..e6338546bb 100644
 --- a/qmake/generators/win32/winmakefile.cpp
 +++ b/qmake/generators/win32/winmakefile.cpp
 @@ -80,10 +80,14 @@ Win32MakefileGenerator::parseLibFlag(const ProString &flag, ProString *arg)
@@ -61,7 +49,7 @@ index 543e905051..456f21cedb 100644
    static const char * const lflags[] = { "QMAKE_LIBS", "QMAKE_LIBS_PRIVATE", 0 };
    for (int i = 0; lflags[i]; i++) {
      ProStringList &l = project->values(lflags[i]);
-@@ -228,9 +232,12 @@ void Win32MakefileGenerator::fixTargetExt()
+@@ -231,9 +235,12 @@ void Win32MakefileGenerator::fixTargetExt()
      if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
          project->values("TARGET_EXT").append(".exe");
      } else if (project->isActiveConfig("shared")) {
@@ -76,5 +64,5 @@ index 543e905051..456f21cedb 100644
                  + project->first("QMAKE_EXTENSION_SHLIB"));
          project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
 -- 
-2.11.0
+2.11.1