mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-10-20 20:53:19 +02:00
ee5975319b
This is achieved by patching qtbase `qmake/generators/makefile.cpp` to
unconditionally add the missing `-I${includedir}`. The include path is
otherwise conditioned on whether it is already available or not. Since there is
no unified set of system include paths in nix this cause problems as reported
in #52457.
15 lines
644 B
Diff
15 lines
644 B
Diff
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
|
|
--- a/qmake/generators/makefile.cpp
|
|
+++ b/qmake/generators/makefile.cpp
|
|
@@ -3390,8 +3390,7 @@ MakefileGenerator::writePkgConfigFile()
|
|
<< 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}";
|
|
|