2023-04-29 16:46:19 +00:00
|
|
|
From f52f3c2cb1703592eaeb43e80f585a24ce8402d7 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Nick Cao <nickcao@nichi.co>
|
|
|
|
|
Date: Fri, 14 Apr 2023 09:34:46 +0800
|
|
|
|
|
Subject: [PATCH 3/6] qtbase: qmake: fix includedir in generated pkg-config
|
|
|
|
|
|
|
|
|
|
---
|
|
|
|
|
qmake/generators/makefile.cpp | 3 +--
|
|
|
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
|
|
2022-10-21 18:38:19 +00:00
|
|
|
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
|
2023-04-29 16:46:19 +00:00
|
|
|
index cc985a878b4..4e3b383d812 100644
|
2022-10-21 18:38:19 +00:00
|
|
|
--- a/qmake/generators/makefile.cpp
|
|
|
|
|
+++ b/qmake/generators/makefile.cpp
|
2023-04-29 16:46:19 +00:00
|
|
|
@@ -3403,8 +3403,7 @@ MakefileGenerator::writePkgConfigFile()
|
2022-10-21 18:38:19 +00:00
|
|
|
<< varGlue("QMAKE_PKGCONFIG_CFLAGS", "", " ", " ")
|
|
|
|
|
// << varGlue("DEFINES","-D"," -D"," ")
|
|
|
|
|
;
|
|
|
|
|
- if (!project->values("QMAKE_DEFAULT_INCDIRS").contains(includeDir))
|
|
|
|
|
- t << "-I${includedir}";
|
|
|
|
|
+ t << "-I${includedir}";
|
|
|
|
|
if (target_mode == TARG_MAC_MODE && project->isActiveConfig("lib_bundle")
|
|
|
|
|
&& libDir != QLatin1String("/Library/Frameworks")) {
|
|
|
|
|
t << " -F${libdir}";
|
2023-04-29 16:46:19 +00:00
|
|
|
--
|
|
|
|
|
2.39.2
|
2022-10-21 18:38:19 +00:00
|
|
|
|
