diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-05-31 20:35:00 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-06-01 10:36:59 +0000 |
| commit | a15de936d0a061781d9e26cedf559438a9e73ae4 (patch) | |
| tree | 14c1ca09d2cf5ee537160d0834a58fd01bf94af3 /mkspecs/features/qt_configure.prf | |
| parent | a151e891787b91a5ed3eae08f0e027cced446c90 (diff) | |
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 <michal.klocek@qt.io>
Diffstat (limited to 'mkspecs/features/qt_configure.prf')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 5 |
1 files 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}.") |