summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-04-17 11:25:38 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-04-18 19:09:07 +0200
commit7b034fec34f488b6d77e97776ad0604b69dbf623 (patch)
treec8b8085bb6a987cd3b1a4169a09bf2b1f696cf2c
parentcfbfb612338958b30f0abe2d00c919de693f10c9 (diff)
skip modules whose mandatory dependencies are missing
so that for example "-skip webkit" will also skip qtwebkit-examples. Task-number: QTBUG-30307 Change-Id: I730830781ea5dabdccab88d19e82165f30dca8fe Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
-rw-r--r--qt.pro8
1 files changed, 6 insertions, 2 deletions
diff --git a/qt.pro b/qt.pro
index 3baaf6a5..33a9469e 100644
--- a/qt.pro
+++ b/qt.pro
@@ -27,8 +27,12 @@ defineTest(addModule) {
export($${mod}.makefile)
}
- for(d, 2): \
- $${mod}.depends += $$moduleName($$d)
+ for(d, 2) {
+ dn = $$moduleName($$d)
+ !contains(SUBDIRS, $$dn): \
+ return(false)
+ $${mod}.depends += $$dn
+ }
for(d, 3) {
dn = $$moduleName($$d)
contains(SUBDIRS, $$dn): \