unbotch licheck output processing
instead of calling eval() on the entire output, loop over it line by line, because: - the first line is a message, not a variable assignment - eval() can process only one statement at a time Task-number: QTBUG-60255 Change-Id: Idca652910c8f2c852372d486c51c8554bc708dcf Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
3250581aed
commit
882243abaf
@ -155,7 +155,13 @@ defineReplace(qtConfFunc_licenseCheck) {
|
|||||||
$$[QMAKE_SPEC] $$[QMAKE_XSPEC]", \
|
$$[QMAKE_SPEC] $$[QMAKE_XSPEC]", \
|
||||||
LicheckOutput): \
|
LicheckOutput): \
|
||||||
return(false)
|
return(false)
|
||||||
eval($$LicheckOutput)
|
logn()
|
||||||
|
for (o, LicheckOutput) {
|
||||||
|
contains(o, "\\w+=.*"): \
|
||||||
|
eval($$o)
|
||||||
|
else: \
|
||||||
|
logn($$o)
|
||||||
|
}
|
||||||
config.input.qt_edition = $$Edition
|
config.input.qt_edition = $$Edition
|
||||||
config.input.qt_licheck = $$Licheck
|
config.input.qt_licheck = $$Licheck
|
||||||
config.input.qt_release_date = $$ReleaseDate
|
config.input.qt_release_date = $$ReleaseDate
|
||||||
|
Loading…
Reference in New Issue
Block a user