diff options
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.patch | 28 |
1 files changed, 28 insertions, 0 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 new file mode 100644 index 000000000000..6c7a6dec6276 --- /dev/null +++ b/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -0,0 +1,28 @@ +From 19a847d6ea1601de83ad067ba6c0fcf562273e72 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 18 Sep 2016 13:58:28 +0200 +Subject: [PATCH 06/32] Don't add resource files to LIBS parameter + +Solves an issue where the generated pkg-config +files contained invalid Libs.private references +like .obj/debug/Qt5Cored_resource_res.o +--- + qmake/generators/win32/mingw_make.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp +index d6d6b04148..7bb616302f 100644 +--- a/qmake/generators/win32/mingw_make.cpp ++++ b/qmake/generators/win32/mingw_make.cpp +@@ -196,7 +196,7 @@ void MingwMakefileGenerator::init() + + processVars(); + +- project->values("QMAKE_LIBS") += project->values("RES_FILE"); ++ project->values("OBJECTS") += project->values("RES_FILE"); + + if (project->isActiveConfig("dll")) { + QString destDir = ""; +-- +2.16.1 + |