diff options
| author | Martchus | 2018-12-11 18:56:57 +0000 |
|---|---|---|
| committer | Martchus | 2018-12-11 18:56:57 +0000 |
| commit | f835d8ffaedccfa55c5545559c505caf698f62e2 (patch) | |
| tree | 5b20d43d9d1a17b5cf70ab9e10196cc3deb7ef90 /0006-Don-t-add-resource-files-to-LIBS-parameter.patch | |
| parent | c1312e3ce7592b30f5454345d5ae8a61302b8ef3 (diff) | |
| download | aur-f835d8ffaedccfa55c5545559c505caf698f62e2.tar.gz | |
Update to 5.12.0
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 | 10 |
1 files changed, 5 insertions, 5 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 f61ea5519033..0a9cb5c2cb0b 100644 --- a/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ b/0006-Don-t-add-resource-files-to-LIBS-parameter.patch @@ -1,4 +1,4 @@ -From 346528ea0e3b2966e798b9492b72b087561781af Mon Sep 17 00:00:00 2001 +From f02b2a6ef057ac969eb813735a88e3dfedf924a2 Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:58:28 +0200 Subject: [PATCH 06/33] Don't add resource files to LIBS parameter @@ -11,18 +11,18 @@ 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 6fcfe96380..f482cae21a 100644 +index de7363e51b..b2b9d01799 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp -@@ -195,7 +195,7 @@ void MingwMakefileGenerator::init() +@@ -209,7 +209,7 @@ void MingwMakefileGenerator::init() processVars(); -- project->values("QMAKE_LIBS") += project->values("RES_FILE"); +- project->values("LIBS") += project->values("RES_FILE"); + project->values("OBJECTS") += project->values("RES_FILE"); if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.19.0 +2.19.2 |