diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 16:03:24 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-25 16:03:24 +1000 |
| commit | 02e5e46e460f0bba1d586906e3135952e758b0a6 (patch) | |
| tree | d4318949cec45d7d9c3a2726cb19708d95f052c2 | |
| parent | 6430f82dfbe1517579a053b189732e433d087bd2 (diff) | |
| parent | 0056cc0ced64c842d94cefb9e4d0d101f4106706 (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Do not continue if syncqt fails.
| -rw-r--r-- | mkspecs/features/default_pre.prf | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index adcdbb73e9..d451d29f7c 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -26,7 +26,11 @@ exists($$_PRO_FILE_PWD_/sync.profile) { message("Running syncqt for $$PRO_BASENAME in $$OUT_PWD") qtPrepareTool(QMAKE_SYNCQT, syncqt) - system("$$QMAKE_SYNCQT $$QTFWD -outdir $$OUT_PWD $$_PRO_FILE_PWD_") + system("$$QMAKE_SYNCQT $$QTFWD -outdir $$OUT_PWD $$_PRO_FILE_PWD_") { + # success! Nothing to do + } else { + error("Failed to run: $$QMAKE_SYNCQT $$QTFWD -outdir $$OUT_PWD $$_PRO_FILE_PWD_") + } unset(QTFWD) unset(PRO_BASENAME) } |