summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorSteve Lhomme <robux4_qt@ycbcr.xyz>2019-04-29 10:49:01 +0200
committerJoerg Bornemann <joerg.bornemann@qt.io>2019-05-14 11:07:14 +0000
commit02a14e6e1b0f6e4594dc68678570f68461a19c7d (patch)
tree07f43bbae5fd823dc196510f74f7cd32546f30a4 /mkspecs
parentc493076a04637c632fefe129a156388f0d9f2a63 (diff)
Include MODULE_AUX_INCLUDES in the generated .pc files
QtANGLE is set on MODULE_AUX_INCLUDES so the headers can be found when building with ANGLE (gui.pro) but the pkg-config file is missing this header and the Qt headers cannot be compiled with the path from this config. Fixes: QTBUG-75495 Change-Id: I4d795b3495b8d08c65f9ddffad4fc838b4f04c31 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_module.prf2
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 8bd2d92421..a52a4486bc 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -277,6 +277,8 @@ load(qt_targets)
} else {
QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]
QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME
+ for(inc, MODULE_AUX_INCLUDES): \
+ QMAKE_PKGCONFIG_CFLAGS += -I${includedir}/$$section(inc, /, 1, 1)
}
QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ")
QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION)