From a73e6652f2a994341a5171cea4e798a3ae175138 Mon Sep 17 00:00:00 2001
From: Peter Varga <pvarga@inf.u-szeged.hu>
Date: Fri, 15 Sep 2017 15:06:30 +0200
Subject: [PATCH] Add mkspecs include path to the gn build
INCLUDEPATH qmake variable doesn't contain mkspecs include path. Add it
explicitly to the include_dirs gn variable in the gn generator.
Change-Id: I454aa015794f258f588590b4662a16c04041c8fd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
mkspecs/features/gn_generator.prf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf
index b2b749154..072b0444e 100644
--- a/mkspecs/features/gn_generator.prf
+++ b/mkspecs/features/gn_generator.prf
@@ -175,7 +175,8 @@ GN_CONTENTS += " if (!defined(include_dirs)) {"\
" }"
GN_CONTENTS += " include_dirs += ["
for (path, INCLUDEPATH): GN_CONTENTS += " \"$$path\","
-GN_CONTENTS += " rebase_path(\"$target_gen_dir/.moc/\")"
+GN_CONTENTS += " rebase_path(\"$target_gen_dir/.moc/\"),"
+GN_CONTENTS += " \"$$QMAKESPEC\""
GN_CONTENTS += " ]"
GN_CONTENTS += " if (!defined(ldflags)) {"\
--
GitLab