diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-26 10:35:52 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-29 16:58:04 +0200 |
| commit | fa12e9c1c3634696cf3e0754ab9c374456945efc (patch) | |
| tree | 7729c6d1990dc2d9f4746c45e7fcae96d41a0128 /mkspecs | |
| parent | 9d962bc9424c71a451d04741619c9597f3da8010 (diff) | |
| parent | d044140246734b8851689f55197c03cfd29dec99 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7094e85a7770303a2ae30baccbc484c04f33600e
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/gn_generator.prf | 3 |
1 files changed, 2 insertions, 1 deletions
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)) {"\ |