summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2017-09-15 15:06:30 +0200
committerPeter Varga <pvarga@inf.u-szeged.hu>2017-09-20 14:24:29 +0000
commita73e6652f2a994341a5171cea4e798a3ae175138 (patch)
tree52b783794b978c469a423d2c8310de26b8e41af1
parent22ab4faac5147cebed02ed7201a41491be548495 (diff)
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>
-rw-r--r--mkspecs/features/gn_generator.prf3
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/gn_generator.prf b/mkspecs/features/gn_generator.prf
index b2b74915..072b0444 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)) {"\