From 882243abaf9cea600246d71db00464d54775bfb2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 24 Apr 2017 17:59:49 +0200 Subject: 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 --- configure.pri | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'configure.pri') 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 -- cgit v1.2.3