diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-07 19:10:53 +0200 |
| commit | 096e37910d93f9c52976600e985c615ea36fe291 (patch) | |
| tree | 713d020f4a04f03d8ca6e111055e7eebe85953a8 /mkspecs | |
| parent | 88eda007a3b5046999dd0b287634765efcd8934d (diff) | |
| parent | a14a943f9ac3d1e85514d7fb6688c84e624ac850 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/corelib/kernel/qeventdispatcher_cf.mm
src/gui/kernel/qguiapplication_p.h
src/gui/kernel/qwindowsysteminterface.cpp
src/gui/kernel/qwindowsysteminterface.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qnswindowdelegate.mm
src/plugins/platforms/ios/qioseventdispatcher.mm
src/plugins/platforms/windows/qwindowsdrag.h
src/plugins/platforms/windows/qwindowsinternalmimedata.h
src/plugins/platforms/windows/qwindowsmime.cpp
src/plugins/platforms/winrt/qwinrtscreen.cpp
Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_parts.prf | 14 |
2 files changed, 5 insertions, 14 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index ba30dad2cc..695bbe04e9 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1978,7 +1978,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 @@ -2009,7 +2010,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}.") diff --git a/mkspecs/features/qt_parts.prf b/mkspecs/features/qt_parts.prf index 67e218ca73..4598031769 100644 --- a/mkspecs/features/qt_parts.prf +++ b/mkspecs/features/qt_parts.prf @@ -39,26 +39,16 @@ exists($$_PRO_FILE_PWD_/examples/examples.pro) { sub_examples.subdir = examples sub_examples.target = sub-examples contains(SUBDIRS, sub_src): sub_examples.depends = sub_src - examples_need_tools: sub_examples.depends += sub_tools + contains(SUBDIRS, sub_tools): sub_examples.depends += sub_tools !contains(QT_BUILD_PARTS, examples): sub_examples.CONFIG = no_default_target no_default_install SUBDIRS += sub_examples } -# Some modules still have these -exists($$_PRO_FILE_PWD_/demos/demos.pro) { - sub_demos.subdir = demos - sub_demos.target = sub-demos - contains(SUBDIRS, sub_src): sub_demos.depends = sub_src - examples_need_tools: sub_demos.depends += sub_tools - !contains(QT_BUILD_PARTS, examples): sub_demos.CONFIG = no_default_target no_default_install - SUBDIRS += sub_demos -} - exists($$_PRO_FILE_PWD_/tests/tests.pro) { sub_tests.subdir = tests sub_tests.target = sub-tests contains(SUBDIRS, sub_src): sub_tests.depends = sub_src # The tests may have a run-time only dependency on other parts - tests_need_tools: sub_tests.depends += sub_tools + contains(SUBDIRS, sub_tools): sub_tests.depends += sub_tools sub_tests.CONFIG = no_default_install !contains(QT_BUILD_PARTS, tests) { sub_tests.CONFIG += no_default_target |