AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make command line parsing error messages consistent

Browse Source 
... by adding some quoting and punctuation.

Change-Id: I553171a0c001edc195fcf2e85f0f70bf2cfdd728
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
Oswald Buddenhagen 2016-07-14 16:30:19 +02:00
parent 601019e3f4
commit 0c3f431769
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mkspecs/features/qt_configure.prf
View File

@ -63,7 +63,7 @@ defineTest(qtConfCommandline_void) {
opt = $${1} opt = $${1}
val = $${2} val = $${2}
!isEmpty(val) { !isEmpty(val) {
qtConfAddError("Command line option $$opt expects no argument ('$$val' given).") qtConfAddError("Command line option '$$opt' expects no argument ('$$val' given).")
return() return()
} }
@ -110,7 +110,7 @@ defineTest(qtConfValidateValue) {
return(true) return(true)
} }
qtConfAddError("Invalid value $$val supplied to command line option '$$opt'.") qtConfAddError("Invalid value '$$val' supplied to command line option '$$opt'.")
return(false) return(false)
} }
@ -120,7 +120,7 @@ defineTest(qtConfCommandline_string) {
isEmpty(val): val = $$qtConfGetNextCommandlineArg() isEmpty(val): val = $$qtConfGetNextCommandlineArg()
contains(val, "^-.*")|isEmpty(val) { contains(val, "^-.*")|isEmpty(val) {
qtConfAddError("No value supplied to command line option $$opt") qtConfAddError("No value supplied to command line option '$$opt'.")
return() return()
} }
@ -154,7 +154,7 @@ defineTest(qtConfCommandline_addString) {
isEmpty(val): val = $$qtConfGetNextCommandlineArg() isEmpty(val): val = $$qtConfGetNextCommandlineArg()
contains(val, "^-.*")|isEmpty(val) { contains(val, "^-.*")|isEmpty(val) {
qtConfAddError("No value supplied to command line option $$opt") qtConfAddError("No value supplied to command line option '$$opt'.")
return() return()
} }
@ -200,7 +200,7 @@ defineTest(qtConfParseCommandLine) {
opt = $$replace(c, "^--?([^-].*)", "\\1") opt = $$replace(c, "^--?([^-].*)", "\\1")
val = val =
} else { } else {
error("Invalid command line parameter $$c") error("Invalid command line parameter '$$c'.")
} }
type = $$eval(config.commandline.options.$${opt}) type = $$eval(config.commandline.options.$${opt})
@ -225,7 +225,7 @@ defineTest(qtConfParseCommandLine) {
} }
isEmpty(type): \ isEmpty(type): \
error("Unknown command line option $$c") error("Unknown command line option '$$c'.")
call = "qtConfCommandline_$${type}" call = "qtConfCommandline_$${type}"
!defined($$call, test): \ !defined($$call, test): \