diff -rupN --no-dereference qtbase-everywhere-src-5.15.2/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.15.2-new/mkspecs/features/create_cmake.prf --- qtbase-everywhere-src-5.15.2/mkspecs/features/create_cmake.prf 2020-11-23 10:29:30.179570101 +0100 +++ qtbase-everywhere-src-5.15.2-new/mkspecs/features/create_cmake.prf 2020-11-23 10:29:32.034565415 +0100 @@ -332,8 +332,14 @@ mac { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a - CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a - CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a + isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a + !isEmpty(CMAKE_STATIC_TYPE) { + CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a + CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a + } else { + 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}$${debug_suffix}.lib CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib diff -rupN --no-dereference qtbase-everywhere-src-5.15.2/mkspecs/features/qt.prf qtbase-everywhere-src-5.15.2-new/mkspecs/features/qt.prf --- qtbase-everywhere-src-5.15.2/mkspecs/features/qt.prf 2020-10-27 09:02:11.000000000 +0100 +++ qtbase-everywhere-src-5.15.2-new/mkspecs/features/qt.prf 2020-11-23 10:29:32.034565415 +0100 @@ -216,11 +216,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.15.2/qmake/generators/win32/winmakefile.cpp qtbase-everywhere-src-5.15.2-new/qmake/generators/win32/winmakefile.cpp --- qtbase-everywhere-src-5.15.2/qmake/generators/win32/winmakefile.cpp 2020-10-27 09:02:11.000000000 +0100 +++ qtbase-everywhere-src-5.15.2-new/qmake/generators/win32/winmakefile.cpp 2020-11-23 10:29:32.034565415 +0100 @@ -99,9 +99,13 @@ private: 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")); + } QVector dirs; int libidx = 0; for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS")) @@ -283,9 +287,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");