From 2408166f5a235575af7e55de4a2ff75a5921ce81 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 9 Feb 2017 20:55:01 +0100 Subject: [PATCH] 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 --- mkspecs/features/qt_configure.prf | 3 +++ 1 file changed, 3 insertions(+) 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 }