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:
commit
02e5e46e46
@ -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)
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user