diff options
| author | Martchus | 2018-09-25 15:26:24 +0200 |
|---|---|---|
| committer | Martchus | 2018-09-25 15:26:24 +0200 |
| commit | 8186d9349d754c1a4f950c58f1a42ce6ef8ae520 (patch) | |
| tree | d263b4d90c1de94fa4b4b5ef37fe63ba0dca655d /0006-Don-t-add-resource-files-to-LIBS-parameter.patch | |
| parent | 6799728a799c22d3e722cadf8838f59d833cb026 (diff) | |
| download | aur-8186d9349d754c1a4f950c58f1a42ce6ef8ae520.tar.gz | |
Update to 5.11.2
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 bd2e4537f8a3..f61ea5519033 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 1eb6c3cccc09e51f68f30ab2fc6d8bbf04085031 Mon Sep 17 00:00:00 2001 +From 346528ea0e3b2966e798b9492b72b087561781af Mon Sep 17 00:00:00 2001 From: Martchus <martchus@gmx.net> Date: Sun, 18 Sep 2016 13:58:28 +0200 -Subject: [PATCH 06/34] 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,10 +11,10 @@ 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 d6d6b04148..7bb616302f 100644 +index 6fcfe96380..f482cae21a 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp -@@ -196,7 +196,7 @@ void MingwMakefileGenerator::init() +@@ -195,7 +195,7 @@ void MingwMakefileGenerator::init() processVars(); @@ -24,5 +24,5 @@ index d6d6b04148..7bb616302f 100644 if (project->isActiveConfig("dll")) { QString destDir = ""; -- -2.18.0 +2.19.0 |