Skip to content

Commit

Permalink
configure: permit digits in variable assignments on the cmdline
Browse files Browse the repository at this point in the history
Change-Id: I21e4f93b119d28fe30cb2436c76a03b67c78fe7a
Reviewed-by: Rainer Keller <[email protected]>
Reviewed-by: Maurice Kalinowski <[email protected]>
  • Loading branch information
ossilator committed Jun 27, 2018
1 parent 9050ce4 commit 9fde782
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions mkspecs/features/qt_configure.prf
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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): \
Expand Down

0 comments on commit 9fde782

Please sign in to comment.