whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Oswald Buddenhagen 2018-06-25 15:58:42 +02:00
parent 9050ce4ff5
commit 9fde782695
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mkspecs/features/qt_configure.prf
View File

@ -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): \