From 84c71207ae4a393237e209e2e754786959ba653d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 27 Mar 2018 13:33:16 +0200 Subject: [PATCH] Fix debug_and_release builds with CONFIG += qtquickcompiler MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For correct debug/ and release/ suffix substitution and thus avoid concurrent access to generated files, we have to declare the output directory variable used by qtquickcompiler.prf in qtdeclarative here and enable it for substitution. Change-Id: Id8483daffdf1b9990396c55f7bc0d08a2f65cafd Task-number: QTBUG-66675 Reviewed-by: Tor Arne Vestbø Reviewed-by: Oswald Buddenhagen --- mkspecs/features/exclusive_builds.prf | 4 ++-- 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