aboutsummarylogtreecommitdiffstats
path: root/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
diff options
context:
space:
mode:
Diffstat (limited to '0006-Don-t-add-resource-files-to-LIBS-parameter.patch')
-rw-r--r--0006-Don-t-add-resource-files-to-LIBS-parameter.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/0006-Don-t-add-resource-files-to-LIBS-parameter.patch b/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
index 82cc017729e9..43268114c14f 100644
--- a/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
+++ b/0006-Don-t-add-resource-files-to-LIBS-parameter.patch
@@ -1,7 +1,7 @@
-From ec5bc4a14e14c982902366f4345cb34e40f6ce1d Mon Sep 17 00:00:00 2001
+From 5731914d9e5d8a026901e5bbab3f3ee1b3ea50f3 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 18 Sep 2016 13:58:28 +0200
-Subject: [PATCH 06/31] Don't add resource files to LIBS parameter
+Subject: [PATCH 06/33] Don't add resource files to LIBS parameter
Solves an issue where the generated pkg-config
files contained invalid Libs.private references
@@ -11,7 +11,7 @@ like .obj/debug/Qt5Cored_resource_res.o
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
-index b9895fb10d..06211572e8 100644
+index bad53dc5b7..c730d641b2 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -202,7 +202,7 @@ void MingwMakefileGenerator::init()
@@ -24,5 +24,5 @@ index b9895fb10d..06211572e8 100644
if (project->isActiveConfig("dll")) {
QString destDir = "";
--
-2.13.2
+2.14.2