diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-06-25 15:58:42 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-06-27 17:22:02 +0000 |
| commit | 9fde78269526925a764e45370ffcae509e5db8e9 (patch) | |
| tree | 89214356e443cf761a3764763fea127dc538cd03 /mkspecs | |
| parent | 9050ce4ff569de97dbcdc837044d0cc3f7e01e6f (diff) | |
configure: permit digits in variable assignments on the cmdline
Change-Id: I21e4f93b119d28fe30cb2436c76a03b67c78fe7a
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 1211129283..c4ddda5b1f 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -158,7 +158,7 @@ defineTest(qtConfCommandline_optionalString) { nextok = $${3} isEmpty(val) { $$nextok: val = $$qtConfPeekNextCommandlineArg() - contains(val, "^-.*|[A-Z_]+=.*")|isEmpty(val): \ + contains(val, "^-.*|[A-Z0-9_]+=.*")|isEmpty(val): \ val = "yes" else: \ val = $$qtConfGetNextCommandlineArg() @@ -233,9 +233,9 @@ defineTest(qtConfParseCommandLine) { $$didCustomCall: \ next() - contains(c, "([A-Z_]+)=(.*)") { - opt = $$replace(c, "^([A-Z_]+)=(.*)", "\\1") - val = $$replace(c, "^([A-Z_]+)=(.*)", "\\2") + contains(c, "([A-Z0-9_]+)=(.*)") { + opt = $$replace(c, "^([A-Z0-9_]+)=(.*)", "\\1") + val = $$replace(c, "^([A-Z0-9_]+)=(.*)", "\\2") for (cc, allConfigs) { var = $$eval($${cc}.commandline.assignments.$${opt}) !isEmpty(var): \ |