TianZD/linuxdeployqt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Properly check exit code of excludelist.sh in qmake

Browse Source 
qmake is really making this overly complicated.

We should rather try to use this syntax, which is only available in
Qt 5.6 and higher, apparently:
https://doc.qt.io/qt-5/qmake-function-reference.html#system-replace
This commit is contained in:
TheAssassin
2018-04-12 02:55:14 +02:00
parent ba3495b855
commit 65ceffeffd
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/linuxdeployqt/linuxdeployqt.pro
+9 -1
View File
@@ -39,9 +39,17 @@ contains(DEFINES, EXCLUDELIST.*) {
message("EXCLUDELIST specified, to use the most recent exclude list, please run qmake without EXCLUDELIST definition and with internet.") message("EXCLUDELIST specified, to use the most recent exclude list, please run qmake without EXCLUDELIST definition and with internet.")
} else { } else {
message("Creating exclude list.") message("Creating exclude list.")
# check whether command _would_ run successfully
EXCLUDELIST_GENERATION_WORKS = FALSE
system($$_PRO_FILE_PWD_/../excludelist.sh): EXCLUDELIST_GENERATION_WORKS = TRUE
isEqual(EXCLUDELIST_GENERATION_WORKS, FALSE) {
error("Generating excludelist failed")
}
EXCLUDELIST = $$system($$_PRO_FILE_PWD_/../excludelist.sh) EXCLUDELIST = $$system($$_PRO_FILE_PWD_/../excludelist.sh)
isEmpty(EXCLUDELIST) { isEmpty(EXCLUDELIST) {
error("You must have internet to update EXCLUDELIST or define it in qmake.") error("Generated excludelist is empty")
} }
DEFINES += EXCLUDELIST=\""$$EXCLUDELIST"\" DEFINES += EXCLUDELIST=\""$$EXCLUDELIST"\"
} }