summaryrefslogtreecommitdiffstats
path: root/tools/qmake/mkspecs/features
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-03-07 14:49:10 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-07 18:19:36 +0100
commit7795807dc6eb757f32971d12fe7c9514350b4636 (patch)
treed5037eedbfd8e7c92f9be82abb3b3e4e6df77bfe /tools/qmake/mkspecs/features
parent7e78765a0ced3ee5dd831d47925270037e39feb2 (diff)
Fix debug_and_release builds
This makes sure that gyp_run.pro follows the same behavior as core_module.pro and that ninja is run for each config, in the appropriate directory. A special .NOTPARALLEL make fake target is added to avoid running ninja for both configurations in parallel (this would cause build failures). This target will be ignored by nmake, but might cause issues if trying to build with jom. Change-Id: Ibaa5f6aa4972cb24c83cc7a63e496938a5c16a3f Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'tools/qmake/mkspecs/features')
-rw-r--r--tools/qmake/mkspecs/features/mac/default_post.prf2
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/qmake/mkspecs/features/mac/default_post.prf b/tools/qmake/mkspecs/features/mac/default_post.prf
deleted file mode 100644
index 2b9fed81b..000000000
--- a/tools/qmake/mkspecs/features/mac/default_post.prf
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG -= build_all
-load(default_post)