diff options
author | Martchus | 2019-06-26 14:41:33 +0200 |
---|---|---|
committer | Martchus | 2019-06-26 14:41:33 +0200 |
commit | 7e9790ef70cdbf8552595445b938883ba09b475b (patch) | |
tree | 54f43d30ddceeb2d28776b5e9966044aab7f7f81 /0006-Don-t-add-resource-files-to-LIBS-parameter.patch | |
parent | 748a3f030424dc491a60d5166204dee722f9cbb6 (diff) | |
download | aur-7e9790ef70cdbf8552595445b938883ba09b475b.tar.gz |
Update to 5.13.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 | 28 |
1 files changed, 0 insertions, 28 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 deleted file mode 100644 index 463200858187..000000000000 --- a/0006-Don-t-add-resource-files-to-LIBS-parameter.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 75f422a35a62d1693e5d84d6745590d8088f6344 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 - -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 de7363e51b..b2b9d01799 100644 ---- a/qmake/generators/win32/mingw_make.cpp -+++ b/qmake/generators/win32/mingw_make.cpp -@@ -209,7 +209,7 @@ void MingwMakefileGenerator::init() - - processVars(); - -- project->values("LIBS") += project->values("RES_FILE"); -+ project->values("OBJECTS") += project->values("RES_FILE"); - - if (project->isActiveConfig("dll")) { - QString destDir = ""; --- -2.21.0 - |