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.
This commit is contained in:
Qt Continuous Integration System 2011-05-25 16:03:24 +10:00
commit 02e5e46e46

View File

@ -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)
}