diff options
Diffstat (limited to '0019-Use-.dll.a-as-import-lib-extension.patch')
| -rw-r--r-- | 0019-Use-.dll.a-as-import-lib-extension.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/0019-Use-.dll.a-as-import-lib-extension.patch b/0019-Use-.dll.a-as-import-lib-extension.patch index f7850315bc8f..30de2d56d518 100644 --- a/0019-Use-.dll.a-as-import-lib-extension.patch +++ b/0019-Use-.dll.a-as-import-lib-extension.patch @@ -1,4 +1,4 @@ -From 2ca67ced5786373e565493f78b26d24ee29bf362 Mon Sep 17 00:00:00 2001 +From 366f840385b1e1f575bfb291806d5d0578e195af Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 18:26:18 +0200 Subject: [PATCH 19/31] Use *.dll.a as import lib extension @@ -30,10 +30,10 @@ index 593161f362..37689938eb 100644 CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qt5main$${QT_LIBINFIX}$${debug_suffix}.lib CMAKE_WINMAIN_FILE_LOCATION_RELEASE = qt5main$${QT_LIBINFIX}.lib diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf -index f996e53d2c..4632cb8b30 100644 +index 2bc7b1dedd..b79b324b88 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf -@@ -213,12 +213,21 @@ for(ever) { +@@ -216,12 +216,21 @@ for(ever) { LIBS$$var_sfx += -framework $$framework } else { lib = $$MODULE_MODULE$$qtPlatformTargetSuffix() @@ -59,7 +59,7 @@ index f996e53d2c..4632cb8b30 100644 } } diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp -index fb9558055d..ad5086aadd 100644 +index 183cef2908..03732df4a8 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -99,9 +99,13 @@ private: @@ -94,5 +94,5 @@ index fb9558055d..ad5086aadd 100644 + project->first("QMAKE_EXTENSION_SHLIB")); project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET"); -- -2.26.2 +2.28.0 |