diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:01:36 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 10:53:06 +0200 |
commit | 7978feadee937299798372bced1680f52b4b1842 (patch) | |
tree | bb844daade8c195c0a963f4663c2a0f880bd840a /src/core/core_gyp_generator.pro | |
parent | 56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 (diff) | |
parent | 56955e73d4be21bc3f086d1c805352a96944a25c (diff) |
Merge branch '5.6' into 5.7
Change-Id: I53645ee5405b1c43807123fd3c196e314cfd1ce9
Diffstat (limited to 'src/core/core_gyp_generator.pro')
-rw-r--r-- | src/core/core_gyp_generator.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/core_gyp_generator.pro b/src/core/core_gyp_generator.pro index e04e34c5a..639470a32 100644 --- a/src/core/core_gyp_generator.pro +++ b/src/core/core_gyp_generator.pro @@ -17,6 +17,9 @@ DEFINES += QT_NO_KEYWORDS \ QTWEBENGINECORE_VERSION_STR=\\\"$$MODULE_VERSION\\\" \ BUILDING_CHROMIUM +# Ensure that response files, generated by qtbase/mkspecs/features/moc.prf, are found by moc. +MOC_DIR = $$OUT_PWD/$$getConfigDir()/.moc + # Assume that we want mobile touch and low-end hardware behaviors # whenever we are cross compiling. cross_compile: DEFINES += QTWEBENGINE_EMBEDDED_SWITCHES |