diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-01-11 12:46:36 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-01-17 12:40:23 (GMT) |
commit | c8fb3f90cf3834a723ae76de95831995459ec94e (patch) | |
tree | ecab25c257c5326e2cb0864203d2e6f19010a05b | |
parent | a05ece41b9adbbe2f5aebd305e84e29693a39bcf (diff) | |
download | Qt-c8fb3f90cf3834a723ae76de95831995459ec94e.zip Qt-c8fb3f90cf3834a723ae76de95831995459ec94e.tar.gz Qt-c8fb3f90cf3834a723ae76de95831995459ec94e.tar.bz2 |
don't ignore return code from syncqt
Task-number: QTBUG-16176
Reviewed-by: mariusSO
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | tools/configure/configureapp.cpp | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -4524,9 +4524,9 @@ 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 + "$outpath/bin/syncqt" $SYNCQT_OPTS || exit 1 elif [ "$CFG_DEV" = "yes" ] || [ ! -d $relpath/include ] || [ -d $relpath/.git ]; then - QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS + QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS || exit 1 fi fi diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index d2be581..8fa03ab 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3578,7 +3578,11 @@ void Configure::generateHeaders() QStringList env; env += QString("QTDIR=" + sourcePath); env += QString("PATH=" + buildPath + "/bin/;" + qgetenv("PATH")); - Environment::execute(args, env, QStringList()); + int retc = Environment::execute(args, env, QStringList()); + if (retc) { + cout << "syncqt failed, return code " << retc << endl << endl; + dictionary["DONE"] = "error"; + } } } |