diff options
| author | Joerg Bornemann <joerg.bornemann@theqtcompany.com> | 2016-03-30 17:50:23 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2016-03-31 10:49:42 +0000 |
| commit | 204de3973d7063f9ec65c0cd1ac15a13cde228c6 (patch) | |
| tree | 05dd4d81788e82268541ae1906ac129895aaaef5 | |
| parent | 665c422803e9d6767f9fa2fd69964c03a254167b (diff) | |
Fix Windows build when response files for moc are generated
moc.prf contains magic (translation: weird heuristics) to determine if
the moc command line would exceed the command line length limit on
Windows. If such an excess is detected a response file is created in
MOC_DIR. As our build directory is not qmake's default one, moc calls
will not find the response file.
Set MOC_DIR accordingly to generate the reponse file in the right
location.
Task-number: QTBUG-51847
Change-Id: Id0695451a986cd9514a7c965c6d33c5c3ef800cd
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| -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 e018c010f..58e83f954 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 |