Blob Blame History Raw
diff -rupN --no-dereference qtbase-everywhere-src-5.12.5/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.12.5-new/mkspecs/features/create_cmake.prf
--- qtbase-everywhere-src-5.12.5/mkspecs/features/create_cmake.prf	2019-09-25 09:47:24.638578112 +0200
+++ qtbase-everywhere-src-5.12.5-new/mkspecs/features/create_cmake.prf	2019-09-25 09:47:26.592572867 +0200
@@ -255,8 +255,9 @@ mac {
             CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
             CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
         } else {
-            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a
-            CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
+            isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
+            CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.$${QMAKE_EXTENSION_IMPORTLIB}
+            CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB}
         }
     } else {
         CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}d.lib
diff -rupN --no-dereference qtbase-everywhere-src-5.12.5/mkspecs/features/qt.prf qtbase-everywhere-src-5.12.5-new/mkspecs/features/qt.prf
--- qtbase-everywhere-src-5.12.5/mkspecs/features/qt.prf	2019-09-03 20:52:35.000000000 +0200
+++ qtbase-everywhere-src-5.12.5-new/mkspecs/features/qt.prf	2019-09-25 09:47:26.592572867 +0200
@@ -213,11 +213,15 @@ for(ever) {
                 LIBS$$var_sfx += -framework $$framework
             } else {
                 lib = $$MODULE_MODULE$$qtPlatformTargetSuffix()
-                win32|contains(MODULE_CONFIG, staticlib) {
+                contains(MODULE_CONFIG, staticlib) {
                     lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_STATICLIB
                     PRE_TARGETDEPS += $$lib
                 } else {
-                    lib = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB$${lib}.$$QMAKE_EXTENSION_SHLIB
+                    win32 {
+                        lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_IMPORTLIB
+                    } else {
+                        lib = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB$${lib}.$$QMAKE_EXTENSION_SHLIB
+                    }
                 }
                 LIBS$$var_sfx += $$lib
             }
diff -rupN --no-dereference qtbase-everywhere-src-5.12.5/qmake/generators/win32/winmakefile.cpp qtbase-everywhere-src-5.12.5-new/qmake/generators/win32/winmakefile.cpp
--- qtbase-everywhere-src-5.12.5/qmake/generators/win32/winmakefile.cpp	2019-09-03 20:52:35.000000000 +0200
+++ qtbase-everywhere-src-5.12.5-new/qmake/generators/win32/winmakefile.cpp	2019-09-25 09:47:26.592572867 +0200
@@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(con
 bool
 Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
 {
-    ProStringList impexts = project->values("QMAKE_LIB_EXTENSIONS");
-    if (impexts.isEmpty())
-        impexts = project->values("QMAKE_EXTENSION_STATICLIB");
+    ProStringList impexts;
+    if (project->isActiveConfig("staticlib")) {
+        impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
+    } else {
+        impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
+        impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
+    }
     QList<QMakeLocalFileName> dirs;
     int libidx = 0;
     for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
@@ -257,9 +261,12 @@ void Win32MakefileGenerator::fixTargetEx
     if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
         project->values("TARGET_EXT").append(".exe");
     } else if (project->isActiveConfig("shared")) {
+        ProString impext = project->first("QMAKE_EXTENSION_IMPORTLIB");
+        if (impext.isEmpty())
+          impext = project->first("QMAKE_PREFIX_STATICLIB");
         project->values("LIB_TARGET").prepend(project->first("QMAKE_PREFIX_STATICLIB")
                                               + project->first("TARGET") + project->first("TARGET_VERSION_EXT")
-                                              + '.' + project->first("QMAKE_EXTENSION_STATICLIB"));
+                                              + '.' + impext);
         project->values("TARGET_EXT").append(project->first("TARGET_VERSION_EXT") + "."
                 + project->first("QMAKE_EXTENSION_SHLIB"));
         project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");