diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-09 20:55:01 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-22 07:46:45 +0000 |
| commit | 2408166f5a235575af7e55de4a2ff75a5921ce81 (patch) | |
| tree | 529bfda9fd2dd624fd4335909e8d4924666aa1b8 /mkspecs/features | |
| parent | 0f16ac3d642e44e594f4d0fec5d271dbbfc8fe1a (diff) | |
clash-check configure sub-config names
we derive the keys from the last fragment of the parent directory, which
is potentially not globally unique.
Change-Id: I57cf13394984e6e3d902c0f1bb495bd3920bfc75
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index e157904145..a6cbc25d6c 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1827,6 +1827,9 @@ for(ever) { for(n, $${currentConfig}.subconfigs._KEYS_) { subconfig = $$eval($${currentConfig}.subconfigs.$${n}) name = $$basename(subconfig) + ex = $$eval(config.$${name}.dir) + !isEmpty(ex): \ + error("Basename clash between $$thisDir/$$subconfig and $${ex}.") config.$${name}.dir = $$thisDir/$$subconfig subconfigs += $$name } |