diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-08 19:09:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-13 14:27:07 +0000 |
| commit | a42c9cfc285a7b71b971a8aa000ca8d5216592ba (patch) | |
| tree | c1574c7f4743d37153067eac87922f56fb00a54b | |
| parent | fc57a6587b75a56b5f2f041c94a7ae656eba54b9 (diff) | |
generalize references to exclusive builds
exclusive_builds_post.prf (via default_post.prf) processes
debug_and_release into BUILDS, so .prfs which can rely on being
executed later (because they are loaded via CONFIG) can rely on BUILDS
and related variables.
Change-Id: I5677079ad5145bf493af17b4b60347208572fd21
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| -rw-r--r-- | mkspecs/features/file_copies.prf | 3 | ||||
| -rw-r--r-- | mkspecs/features/qt_docs_targets.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/resources.prf | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/mkspecs/features/file_copies.prf b/mkspecs/features/file_copies.prf index 6df294212c..4ebf41c78f 100644 --- a/mkspecs/features/file_copies.prf +++ b/mkspecs/features/file_copies.prf @@ -1,8 +1,7 @@ isEmpty(COPIES): return() contains(TEMPLATE, .*subdirs): error("COPIES does not work with TEMPLATE=subdirs") -build_pass:build_all: \ - debug_and_release:debug { +build_pass:build_all:!isEqual(BUILD_PASS, $$first(BUILDS)) { # Avoid that multiple build passes race with each other. # This will fail to copy anything if the user explicitly invokes # only the non-primary build. This is unfixable, as at qmake time diff --git a/mkspecs/features/qt_docs_targets.prf b/mkspecs/features/qt_docs_targets.prf index 1f9e2b0b47..9e96432462 100644 --- a/mkspecs/features/qt_docs_targets.prf +++ b/mkspecs/features/qt_docs_targets.prf @@ -30,7 +30,7 @@ contains(TEMPLATE, subdirs) { for(inst, DOC_TARGETS): \ prepareRecursiveTarget($$inst) } else { - debug_and_release:!build_pass { + !isEmpty(BUILDS):!build_pass { sub = $$first(BUILDS) for(inst, DOC_TARGETS) { $${inst}.CONFIG = recursive diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf index 1f04c8b0d7..bc548ced05 100644 --- a/mkspecs/features/resources.prf +++ b/mkspecs/features/resources.prf @@ -35,7 +35,7 @@ for(resource, RESOURCES) { resource_file = $$RCC_DIR/qmake_$${resource}.qrc - !debug_and_release|build_pass { + isEmpty(BUILDS)|build_pass { # Collection of files, generate qrc file prefix = $$eval($${resource}.prefix) isEmpty(prefix): \ |