2021-04-13 12:24:25 +02:00
|
|
|
From ed8bf76c5e770f8097a375b49f58bedd738f84f7 Mon Sep 17 00:00:00 2001
|
2016-09-19 22:18:45 +02:00
|
|
|
From: Martchus <martchus@gmx.net>
|
|
|
|
|
Date: Sun, 18 Sep 2016 13:58:28 +0200
|
2019-12-13 01:00:48 +01:00
|
|
|
Subject: [PATCH 05/31] Don't add resource files to LIBS parameter
|
2016-09-19 22:18:45 +02:00
|
|
|
|
|
|
|
|
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
|
2020-09-10 21:17:46 +02:00
|
|
|
index ee9a41838b..8d1dcae85b 100644
|
2016-09-19 22:18:45 +02:00
|
|
|
--- a/qmake/generators/win32/mingw_make.cpp
|
|
|
|
|
+++ b/qmake/generators/win32/mingw_make.cpp
|
2020-09-10 21:17:46 +02:00
|
|
|
@@ -147,7 +147,7 @@ void MingwMakefileGenerator::init()
|
2016-09-19 22:18:45 +02:00
|
|
|
|
|
|
|
|
processVars();
|
|
|
|
|
|
2018-12-08 22:06:32 +01:00
|
|
|
- project->values("LIBS") += project->values("RES_FILE");
|
2016-09-19 22:18:45 +02:00
|
|
|
+ project->values("OBJECTS") += project->values("RES_FILE");
|
|
|
|
|
|
|
|
|
|
if (project->isActiveConfig("dll")) {
|
|
|
|
|
QString destDir = "";
|
|
|
|
|
--
|
2021-04-13 12:24:25 +02:00
|
|
|
2.31.1
|
2016-09-19 22:18:45 +02:00
|
|
|
|
