diff options
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.pri b/configure.pri index 754e9d7317..41c3f13ea1 100644 --- a/configure.pri +++ b/configure.pri @@ -5,7 +5,7 @@ QT_BUILD_TREE = $$shadowed($$PWD) # custom command line handling defineTest(qtConfCommandline_qmakeArgs) { - contains(1, QMAKE_[A-Z_]+ *[-+]?=.*) { + contains(1, QMAKE_[A-Z0-9_]+ *[-+]?=.*) { config.input.qmakeArgs += $$1 export(config.input.qmakeArgs) return(true) @@ -449,8 +449,8 @@ defineTest(reloadSpec) { eval($$l) include($$QMAKESPEC/qmake.conf) load(spec_post) - load(default_pre) CONFIG += $$_SAVED_CONFIG + load(default_pre) # ensure pristine environment for configuration. again. discard_from($$[QT_HOST_DATA/get]/mkspecs/qconfig.pri) |