diff options
| author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2011-05-25 15:55:53 +1000 |
|---|---|---|
| committer | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2011-05-25 15:59:21 +1000 |
| commit | 0056cc0ced64c842d94cefb9e4d0d101f4106706 (patch) | |
| tree | 7755c173d6d8fc109faed18f54b93a9927663ae4 /mkspecs/features | |
| parent | b4b100fb8f42e2368196135b129af1906cffa6fa (diff) | |
Do not continue if syncqt fails.
If the user has set QTDIR to something other than the location of the
qtbase build directory, syncqt will fail.
This change prevents the build from continuing. Ideally, the system
should ignore the user-set QTDIR value or give an appropriate error.
Reviewed-by: Rohan McGovern
Diffstat (limited to 'mkspecs/features')
| -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) } |