summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2019-03-26 13:32:10 +0100
committerJoerg Bornemann <joerg.bornemann@qt.io>2019-03-27 09:11:34 +0000
commit03ecdddb11ca71682d5d3b18bd4b74b9f9b2a3d6 (patch)
treed5d7e88054a42df2cc361c20f8c26f5a01355c1f /mkspecs/features
parente75e89f9dedcdd4b9fe1caa04a2d8c5e759ea068 (diff)
configure: Warn about redundant and contradictory options
Configure will print notes in the following situations: - redundant options, e.g. -gui -gui - contradictory options, e.g. -gui -no-gui Fixes: QTBUG-53499 Change-Id: I6cf023e7730907069cf971f5982a41453f611c3c Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/qt_configure.prf7
1 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index a9b1eef589..168a8e64f2 100644
--- a/mkspecs/features/qt_configure.prf
+++ b/mkspecs/features/qt_configure.prf
@@ -61,6 +61,13 @@ defineTest(qtConfCommandlineSetInput) {
val = $${2}
!isEmpty($${currentConfig}.commandline.options.$${arg}.name): \
arg = $$eval($${currentConfig}.commandline.options.$${arg}.name)
+ !isEmpty(config.input.$$arg) {
+ oldval = $$eval(config.input.$$arg)
+ equals(oldval, $$val): \
+ qtConfAddNote("Option '$$arg' with value '$$val' was specified twice")
+ else: \
+ qtConfAddNote("Overriding option '$$arg' with '$$val' (was: '$$oldval')")
+ }
config.input.$$arg = $$val
export(config.input.$$arg)