From a15de936d0a061781d9e26cedf559438a9e73ae4 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 31 May 2018 20:35:00 +0200 Subject: [PATCH] configure: permit multiple repos to use the same directory names otherwise, names like "core" are too likely to clash. note that the directories (which contain configure files) still need to have unique names within one repository. that's unlikely to be a problem. Task-number: QTBUG-68385 Change-Id: I01c60479a6a45494ba60e798ceada231d8870556 Reviewed-by: Michal Klocek --- mkspecs/features/qt_configure.prf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 6e29eaa2b7..1211129283 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1951,7 +1951,8 @@ for(ever) { isEmpty(configsToProcess): \ break() - currentConfig = config.$$take_first(configsToProcess) + thisConfig = $$take_first(configsToProcess) + currentConfig = config.$$thisConfig thisDir = $$eval($${currentConfig}.dir) jsonFile = $$thisDir/configure.json priFile = $$thisDir/configure.pri @@ -1982,7 +1983,7 @@ for(ever) { subconfigs = for(n, $${currentConfig}.subconfigs._KEYS_) { subconfig = $$eval($${currentConfig}.subconfigs.$${n}) - name = $$basename(subconfig) + name = $${thisConfig}_$$basename(subconfig) ex = $$eval(config.$${name}.dir) !isEmpty(ex): \ error("Basename clash between $$thisDir/$$subconfig and $${ex}.")