move syncqt -check-includes handling to default_pre.prf
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Fri, 31 Aug 2012 13:31:03 +0000 (15:31 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 11 Sep 2012 07:35:28 +0000 (09:35 +0200)
this is where the syncqt calls for all modules happen

Change-Id: I544e5fa6950c2babe56d78f5543d2c3262016687
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
configure
mkspecs/features/default_pre.prf

index 625f6e7..876dd07 100755 (executable)
--- a/configure
+++ b/configure
@@ -3541,7 +3541,6 @@ fi
 # symlink includes
 if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then
     SYNCQT_OPTS=
-    [ "$CFG_DEV" = "yes" ] && SYNCQT_OPTS="$SYNCQT_OPTS -check-includes"
     if [ "$OPT_SHADOW" = "yes" ]; then
         "$outpath/bin/syncqt" $SYNCQT_OPTS "$relpath" || exit 1
     elif [ "$CFG_DEV" = "yes" ] || [ ! -d $relpath/include ] || [ -d $relpath/.git ]; then
index 6eb3a39..5ba2fdb 100644 (file)
@@ -18,6 +18,8 @@ CONFIG = lex yacc warn_on debug exceptions depend_includepath $$CONFIG
     }
 
     qtPrepareTool(QMAKE_SYNCQT, syncqt)
+    contains(QT_CONFIG, private_tests): \   # -developer-build
+        QMAKE_SYNCQT += -check-includes
     isEmpty(MODULE_BASE_OUTDIR): MODULE_BASE_OUTDIR = $$OUT_PWD
     MSG = $$quote($$QMAKE_SYNCQT -qtdir $$[QT_HOST_DATA/get] -outdir $$MODULE_BASE_OUTDIR $$_PRO_FILE_PWD_)
     !silent:message($$MSG)