aboutsummarylogtreecommitdiffstats
path: root/0020-Use-.dll.a-as-import-lib-extension.patch
diff options
context:
space:
mode:
authorMartchus2018-05-28 21:50:43 +0200
committerMartchus2018-05-28 21:50:43 +0200
commit2f92ee836d3ae79a9295962f319a7f864708be35 (patch)
treeca5914172508dfbeef03643878a70ccd0d8db29d /0020-Use-.dll.a-as-import-lib-extension.patch
parent2660e624877e04323aaac908770b038c92b7abc0 (diff)
downloadaur-2f92ee836d3ae79a9295962f319a7f864708be35.tar.gz
Update to 5.11.0
Diffstat (limited to '0020-Use-.dll.a-as-import-lib-extension.patch')
-rw-r--r--0020-Use-.dll.a-as-import-lib-extension.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/0020-Use-.dll.a-as-import-lib-extension.patch b/0020-Use-.dll.a-as-import-lib-extension.patch
index 39d3af6e9432..c1473f53674a 100644
--- a/0020-Use-.dll.a-as-import-lib-extension.patch
+++ b/0020-Use-.dll.a-as-import-lib-extension.patch
@@ -1,7 +1,7 @@
-From e01cb55796ac795043b4e3afd6811c8d0bfaf6c1 Mon Sep 17 00:00:00 2001
+From b2f4400da1fce797a2a939f731ef2f5689a300c5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 18:26:18 +0200
-Subject: [PATCH 20/32] Use *.dll.a as import lib extension
+Subject: [PATCH 20/33] Use *.dll.a as import lib extension
The variables used here are provided by
mingw-w64 specific mkspec
@@ -11,10 +11,10 @@ mingw-w64 specific mkspec
2 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
-index 146e83ae67..15fc070008 100644
+index 5d553d9ca6..3e5ec55dae 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
-@@ -236,8 +236,9 @@ mac {
+@@ -238,8 +238,9 @@ mac {
CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl
CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl
} else {
@@ -64,5 +64,5 @@ index 737f3abc3a..2e6d5d94a9 100644
+ project->first("QMAKE_EXTENSION_SHLIB"));
project->values("TARGET").first() = project->first("QMAKE_PREFIX_SHLIB") + project->first("TARGET");
--
-2.16.1
+2.17.0