diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-14 16:40:23 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-07-22 10:27:21 +0000 |
| commit | 09110cdbea5368d92d1432d68b01a5ad8343302c (patch) | |
| tree | 046cffb5a7e6a397956480e608cbe8311baf0b2d /mkspecs | |
| parent | 0c3f431769973adf5c0d48001c2c830e245a669c (diff) | |
don't error() out on user errors
use the proper error reporting mechanism instead.
Change-Id: I3afb0086e5cd672d3c0f441c429682850202024f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 55b985f587..82103125d2 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -200,7 +200,8 @@ defineTest(qtConfParseCommandLine) { opt = $$replace(c, "^--?([^-].*)", "\\1") val = } else { - error("Invalid command line parameter '$$c'.") + qtConfAddError("Invalid command line parameter '$$c'.") + return() } type = $$eval(config.commandline.options.$${opt}) @@ -224,8 +225,10 @@ defineTest(qtConfParseCommandLine) { next() } - isEmpty(type): \ - error("Unknown command line option '$$c'.") + isEmpty(type) { + qtConfAddError("Unknown command line option '$$c'.") + return() + } call = "qtConfCommandline_$${type}" !defined($$call, test): \ |