From 7b034fec34f488b6d77e97776ad0604b69dbf623 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 17 Apr 2013 11:25:38 +0200 Subject: 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 Reviewed-by: Mitch Curtis --- qt.pro | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'qt.pro') 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): \ -- cgit v1.2.3