diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-06-07 17:10:56 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-06-07 17:10:57 +0200 |
| commit | fc5da399c3145621c5945d53dde7b37fa463c6e9 (patch) | |
| tree | 8deec4c78b5add097ba7f2b1e371f27e3ae759c5 /mkspecs | |
| parent | 225dcf355a95f272aaa7ac236c7274e254dca41c (diff) | |
| parent | a14a943f9ac3d1e85514d7fb6688c84e624ac850 (diff) | |
Merge 5.11 into 5.11.1
Change-Id: I28f48e980a9e23ddde5251608dd9d1d83df65392
Diffstat (limited to 'mkspecs')
| -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}.") |