|
 |
411b220 |
diff -rupN --no-dereference qtbase-everywhere-src-5.15.10/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.15.10-new/mkspecs/features/create_cmake.prf
|
|
|
411b220 |
--- qtbase-everywhere-src-5.15.10/mkspecs/features/create_cmake.prf 2023-06-15 10:07:50.737795733 +0200
|
|
|
411b220 |
+++ qtbase-everywhere-src-5.15.10-new/mkspecs/features/create_cmake.prf 2023-06-15 10:07:52.324809794 +0200
|
|
|
3ef1913 |
@@ -339,8 +339,14 @@ mac {
|
|
|
bebf009 |
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqt5main$${QT_LIBINFIX}$${debug_suffix}.a
|
|
|
bebf009 |
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqt5main$${QT_LIBINFIX}.a
|
|
|
bebf009 |
|
|
|
bebf009 |
- CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}$${debug_suffix}.a
|
|
|
bebf009 |
- CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
|
|
|
bebf009 |
+ isEmpty(QMAKE_EXTENSION_IMPORTLIB): QMAKE_EXTENSION_IMPORTLIB = a
|
|
|
56e26e7 |
+ !isEmpty(CMAKE_STATIC_TYPE) {
|
|
|
56e26e7 |
+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.a
|
|
|
56e26e7 |
+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.a
|
|
|
56e26e7 |
+ } else {
|
|
|
56e26e7 |
+ CMAKE_IMPLIB_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.$${QMAKE_EXTENSION_IMPORTLIB}
|
|
|
56e26e7 |
+ CMAKE_IMPLIB_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.$${QMAKE_EXTENSION_IMPORTLIB}
|
|
|
56e26e7 |
+ }
|
|
|
ef0e284 |
} else {
|
|
|
bebf009 |
CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib
|
|
|
bebf009 |
CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib
|
|
|
411b220 |
diff -rupN --no-dereference qtbase-everywhere-src-5.15.10/mkspecs/features/qt.prf qtbase-everywhere-src-5.15.10-new/mkspecs/features/qt.prf
|
|
|
411b220 |
--- qtbase-everywhere-src-5.15.10/mkspecs/features/qt.prf 2023-04-24 15:43:14.000000000 +0200
|
|
|
411b220 |
+++ qtbase-everywhere-src-5.15.10-new/mkspecs/features/qt.prf 2023-06-15 10:07:52.324809794 +0200
|
|
|
2f20ec1 |
@@ -217,13 +217,18 @@ for(ever) {
|
|
|
59d54d2 |
} else {
|
|
|
2f20ec1 |
candidates = $$MODULE_MODULE$$qtPlatformTargetSuffix()
|
|
|
2f20ec1 |
darwin: candidates *= $$MODULE_MODULE
|
|
|
59d54d2 |
- win32|contains(MODULE_CONFIG, staticlib) {
|
|
|
59d54d2 |
+ contains(MODULE_CONFIG, staticlib) {
|
|
|
2f20ec1 |
lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB
|
|
|
2f20ec1 |
lib_suffix = $$QMAKE_EXTENSION_STATICLIB
|
|
|
2f20ec1 |
add_lib_to_pretargetdeps = true
|
|
|
59d54d2 |
} else {
|
|
|
2f20ec1 |
- lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB
|
|
|
2f20ec1 |
- lib_suffix = $$QMAKE_EXTENSION_SHLIB
|
|
|
59d54d2 |
+ win32 {
|
|
|
2f20ec1 |
+ lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB
|
|
|
2f20ec1 |
+ lib_suffix = $$QMAKE_EXTENSION_IMPORTLIB
|
|
|
59d54d2 |
+ } else {
|
|
|
2f20ec1 |
+ lib_prefix = $$MODULE_LIBS/$$QMAKE_PREFIX_SHLIB
|
|
|
2f20ec1 |
+ lib_suffix = $$QMAKE_EXTENSION_SHLIB
|
|
|
59d54d2 |
+ }
|
|
|
2f20ec1 |
add_lib_to_pretargetdeps = false
|
|
|
59d54d2 |
}
|
|
|
2f20ec1 |
lib_missing = true
|
|
|
411b220 |
diff -rupN --no-dereference qtbase-everywhere-src-5.15.10/qmake/generators/win32/winmakefile.cpp qtbase-everywhere-src-5.15.10-new/qmake/generators/win32/winmakefile.cpp
|
|
|
411b220 |
--- qtbase-everywhere-src-5.15.10/qmake/generators/win32/winmakefile.cpp 2023-04-24 15:43:14.000000000 +0200
|
|
|
411b220 |
+++ qtbase-everywhere-src-5.15.10-new/qmake/generators/win32/winmakefile.cpp 2023-06-15 10:07:52.325809803 +0200
|
|
|
bebf009 |
@@ -99,9 +99,13 @@ private:
|
|
|
ef0e284 |
bool
|
|
|
ef0e284 |
Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags)
|
|
|
ef0e284 |
{
|
|
|
ef0e284 |
- ProStringList impexts = project->values("QMAKE_LIB_EXTENSIONS");
|
|
|
ef0e284 |
- if (impexts.isEmpty())
|
|
|
ef0e284 |
- impexts = project->values("QMAKE_EXTENSION_STATICLIB");
|
|
|
59d54d2 |
+ ProStringList impexts;
|
|
|
59d54d2 |
+ if (project->isActiveConfig("staticlib")) {
|
|
|
59d54d2 |
+ impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
|
|
|
59d54d2 |
+ } else {
|
|
|
59d54d2 |
+ impexts.append(project->values("QMAKE_EXTENSION_IMPORTLIB"));
|
|
|
59d54d2 |
+ impexts.append(project->values("QMAKE_EXTENSION_STATICLIB"));
|
|
|
59d54d2 |
+ }
|
|
|
bebf009 |
QVector<LibrarySearchPath> dirs;
|
|
|
76cce5d |
int libidx = 0;
|
|
|
76cce5d |
for (const ProString &dlib : project->values("QMAKE_DEFAULT_LIBDIRS"))
|
|
|
bebf009 |
@@ -283,9 +287,12 @@ void Win32MakefileGenerator::fixTargetEx
|
|
|
ef0e284 |
if (!project->values("QMAKE_APP_FLAG").isEmpty()) {
|
|
|
ef0e284 |
project->values("TARGET_EXT").append(".exe");
|
|
|
ef0e284 |
} else if (project->isActiveConfig("shared")) {
|
|
|
ef0e284 |
+ ProString impext = project->first("QMAKE_EXTENSION_IMPORTLIB");
|
|
|
ef0e284 |
+ if (impext.isEmpty())
|
|
|
ef0e284 |
+ impext = project->first("QMAKE_PREFIX_STATICLIB");
|
|
|
ef0e284 |
project->values("LIB_TARGET").prepend(project->first("QMAKE_PREFIX_STATICLIB")
|
|
|
ef0e284 |
+ project->first("TARGET") + project->first("TARGET_VERSION_EXT")
|
|
|
ef0e284 |
- + '.' + project->first("QMAKE_EXTENSION_STATICLIB"));
|
|
|
ef0e284 |
+ + '.' + impext);
|
|
|
ef0e284 |
project->values("TARGET_EXT").append(project->first("TARGET_VERSION_EXT") + "."
|
|
|
ef0e284 |
+ project->first("QMAKE_EXTENSION_SHLIB"));
|
|
|
ef0e284 |
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
|