summaryrefslogtreecommitdiff
path: root/configure.pri
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-04-24 17:59:49 +0200
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-04-28 16:08:14 +0000
commit882243abaf9cea600246d71db00464d54775bfb2 (patch)
tree35f7e9aca2a848b67e236c311e2f51301f79da74 /configure.pri
parent3250581aeda0a01f80c305ca4d775633f4ad50e9 (diff)
downloadqtbase-882243abaf9cea600246d71db00464d54775bfb2.tar.gz
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>
Diffstat (limited to 'configure.pri')
-rw-r--r--configure.pri8
1 files changed, 7 insertions, 1 deletions
diff --git a/configure.pri b/configure.pri
index c422c73650..dc2764ce9d 100644
--- a/configure.pri
+++ b/configure.pri
@@ -155,7 +155,13 @@ defineReplace(qtConfFunc_licenseCheck) {
$$[QMAKE_SPEC] $$[QMAKE_XSPEC]", \
LicheckOutput): \
return(false)
- eval($$LicheckOutput)
+ logn()
+ for (o, LicheckOutput) {
+ contains(o, "\\w+=.*"): \
+ eval($$o)
+ else: \
+ logn($$o)
+ }
config.input.qt_edition = $$Edition
config.input.qt_licheck = $$Licheck
config.input.qt_release_date = $$ReleaseDate