From 274882a58ca1a5935e64278a957b25175db34c86 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 6 Jun 2019 10:50:07 +0200 Subject: De-duplicate elements of QMAKE_DIR_REPLACE[_SANE] Elements that appear in QMAKE_DIR_REPLACE_SANE must appear in QMAKE_DIR_REPLACE to be considered due to the algorithm used in exclusive_builds_post.prf. Change-Id: Ibce7e6c988b3e8a141075890a2f547eb34090b3a Reviewed-by: Kai Koehne --- mkspecs/features/exclusive_builds.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/features/exclusive_builds.prf') diff --git a/mkspecs/features/exclusive_builds.prf b/mkspecs/features/exclusive_builds.prf index 1ff9a04d42..b4788e1c2f 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 QMLCACHE_DIR LRELEASE_DIR QMAKE_DIR_REPLACE_SANE += QGLTF_DIR TRACEGEN_DIR QMLCACHE_DIR LRELEASE_DIR +QMAKE_DIR_REPLACE = OBJECTS_DIR MOC_DIR RCC_DIR PRECOMPILED_DIR DESTDIR $$QMAKE_DIR_REPLACE_SANE -- cgit v1.2.3 From 29fa59d24417d017205bdb00d215e372154ce573 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 6 Jun 2019 15:07:57 +0200 Subject: Fix parallel lex/yacc invocation for debug_and_release builds [ChangeLog][qmake] Introduced the variables LEX_DIR and YACC_DIR which determine the location of lex/yacc output. Fixed parallel execution of lex/yacc for debug_and_release builds. Fixes: QTBUG-65730 Change-Id: I68c8260a95609e11bb5205a91aff2c098ed7009c Reviewed-by: Kai Koehne Reviewed-by: Edward Welbourne --- mkspecs/features/exclusive_builds.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/features/exclusive_builds.prf') diff --git a/mkspecs/features/exclusive_builds.prf b/mkspecs/features/exclusive_builds.prf index b4788e1c2f..b28e74146a 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_SANE += QGLTF_DIR TRACEGEN_DIR QMLCACHE_DIR LRELEASE_DIR +QMAKE_DIR_REPLACE_SANE += QGLTF_DIR TRACEGEN_DIR QMLCACHE_DIR LRELEASE_DIR LEX_DIR YACC_DIR QMAKE_DIR_REPLACE = OBJECTS_DIR MOC_DIR RCC_DIR PRECOMPILED_DIR DESTDIR $$QMAKE_DIR_REPLACE_SANE -- cgit v1.2.3