diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-31 01:00:13 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-31 01:00:13 +0200 |
| commit | ffb2c2ac6c3ba40acbe13a39899a72049585b427 (patch) | |
| tree | dbee14e6d1641e02ea1fd5fc67ce001ab12776ef /mkspecs | |
| parent | 6d0044f1dcffebc29dccd9d37d90f8abdb941a88 (diff) | |
| parent | dbdd5f0ffbce52c8b789ed09f1aa3f1da6c02e23 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I33b47095efdfe0ba698c6a88ca41ec911f432208
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/exclusive_builds.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/qt_build_config.prf | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mkspecs/features/exclusive_builds.prf b/mkspecs/features/exclusive_builds.prf index b477cff162..2d7f0e1ab6 100644 --- a/mkspecs/features/exclusive_builds.prf +++ b/mkspecs/features/exclusive_builds.prf @@ -38,5 +38,5 @@ defineTest(addExclusiveBuilds) { } # Default directories to process -QMAKE_DIR_REPLACE = OBJECTS_DIR MOC_DIR RCC_DIR PRECOMPILED_DIR QGLTF_DIR DESTDIR TRACEGEN_DIR -QMAKE_DIR_REPLACE_SANE += QGLTF_DIR TRACEGEN_DIR +QMAKE_DIR_REPLACE = OBJECTS_DIR MOC_DIR RCC_DIR PRECOMPILED_DIR QGLTF_DIR DESTDIR TRACEGEN_DIR QMLCACHE_DIR +QMAKE_DIR_REPLACE_SANE += QGLTF_DIR TRACEGEN_DIR QMLCACHE_DIR diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf index a2fa1be481..021036e4f9 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf @@ -26,6 +26,7 @@ MOC_DIR = .moc RCC_DIR = .rcc UI_DIR = .uic TRACEGEN_DIR = .tracegen +QMLCACHE_DIR = .qmlcache intel_icl { # ICL 14.0 has a bug that makes it not find #includes in dirs starting with . MOC_DIR = tmp/moc |