From 2d8dd9a6c984d2245e93ec2fb38dc201d60aca4f Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 4 Apr 2012 14:02:10 +0200 Subject: do not route qtmodule-configtests invocation through syncqt there is completely no reason to do it. Change-Id: Ie186ef4c1bbd12c256acb2fe374d12ebe777d6c9 Reviewed-by: Joerg Bornemann --- mkspecs/features/default_pre.prf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mkspecs/features/default_pre.prf') diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index b7f31c4c21..3f6e7afea1 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -16,7 +16,7 @@ CONFIG = lex yacc warn_on debug exceptions $$CONFIG qtPrepareTool(QMAKE_SYNCQT, syncqt) isEmpty(MODULE_BASE_OUTDIR): MODULE_BASE_OUTDIR = $$OUT_PWD - MSG = $$quote($$QMAKE_SYNCQT -qtdir $$[QT_HOST_DATA/get] $$QTFWD -generator $$MAKEFILE_GENERATOR -outdir $$MODULE_BASE_OUTDIR $$_PRO_FILE_PWD_) + MSG = $$quote($$QMAKE_SYNCQT -qtdir $$[QT_HOST_DATA/get] $$QTFWD -outdir $$MODULE_BASE_OUTDIR $$_PRO_FILE_PWD_) !silent:message($$MSG) system($$MSG) { # success! Nothing to do @@ -24,6 +24,9 @@ CONFIG = lex yacc warn_on debug exceptions $$CONFIG error("Failed to run: $$MSG") } + # Do configure tests now. Fatal tests have a non zero return. + system("perl $$[QT_HOST_BINS/get]/qtmodule-configtests $$_PRO_FILE_PWD_ $$OUT_PWD $$[QT_HOST_PREFIX/get] $$MAKEFILE_GENERATOR")|error("Aborting.") + unset(QTFWD) } -- cgit v1.2.3