diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-31 15:31:03 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-11 09:35:28 +0200 |
| commit | b071ea317c6afcb3ce7ca74d47fa0557455a9bb7 (patch) | |
| tree | d9c41f0c15ce802b600ed035db6dcc8bb912b5cf | |
| parent | 3322759b49973c1b8f6372c72eace3dc38de36e6 (diff) | |
move syncqt -check-includes handling to default_pre.prf
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>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | mkspecs/features/default_pre.prf | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -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 diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 6eb3a396e9..5ba2fdb551 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -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) |