AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: permit multiple repos to use the same directory names

Browse Source 
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>
This commit is contained in:
Oswald Buddenhagen 2018-05-31 20:35:00 +02:00
parent a151e89178
commit a15de936d0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkspecs/features/qt_configure.prf
View File

@ -1951,7 +1951,8 @@ for(ever) {
isEmpty(configsToProcess): \ isEmpty(configsToProcess): \
break() break()
currentConfig = config.$$take_first(configsToProcess) thisConfig = $$take_first(configsToProcess)
currentConfig = config.$$thisConfig
thisDir = $$eval($${currentConfig}.dir) thisDir = $$eval($${currentConfig}.dir)
jsonFile = $$thisDir/configure.json jsonFile = $$thisDir/configure.json
priFile = $$thisDir/configure.pri priFile = $$thisDir/configure.pri
@ -1982,7 +1983,7 @@ for(ever) {
subconfigs = subconfigs =
for(n, $${currentConfig}.subconfigs._KEYS_) { for(n, $${currentConfig}.subconfigs._KEYS_) {
subconfig = $$eval($${currentConfig}.subconfigs.$${n}) subconfig = $$eval($${currentConfig}.subconfigs.$${n})
name = $$basename(subconfig) name = $${thisConfig}_$$basename(subconfig)
ex = $$eval(config.$${name}.dir) ex = $$eval(config.$${name}.dir)
!isEmpty(ex): \ !isEmpty(ex): \
error("Basename clash between $$thisDir/$$subconfig and $${ex}.") error("Basename clash between $$thisDir/$$subconfig and $${ex}.")