K900
2873053688
- move patches to their corresponding modules - inline patches list for qtbase into the expression itself - don't treat patches as series, as they are not - clean up outdated headers from all the patches - drop doc tools patch, replace it with setting newly added cmake var in a hook - add a new patch to disable SBOM generation that's very broken with split installs
13 lines
568 B
Diff
13 lines
568 B
Diff
--- a/qmake/generators/makefile.cpp
|
|
+++ b/qmake/generators/makefile.cpp
|
|
@@ -3412,8 +3412,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}";
|