diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-13 17:50:25 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-13 17:50:56 +0200 |
| commit | 067e46c2b3371b7b4f952276ddcfc3e5af0d9551 (patch) | |
| tree | e36723270bea6b2a84db30b605bf208a9e3b6fcd /mkspecs | |
| parent | 052e79299f4ada27eacc89ab36ddafda2e91a4db (diff) | |
| parent | ee5070f95be237b0ced7e53c5ce7ffde68e57c99 (diff) | |
| download | qtwebengine-067e46c2b3371b7b4f952276ddcfc3e5af0d9551.tar.gz | |
Merge branch '5.10' into dev
Change-Id: I3a411e4019a5ec2f7d1a967b62a00ad7cf92f6f4
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 c59bc0d98..a819e146b 100644 --- a/mkspecs/features/gn_generator.prf +++ b/mkspecs/features/gn_generator.prf @@ -177,7 +177,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)) {"\ |