diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-15 19:47:57 +0200 |
| commit | 40a1f69e8663fb79560c26cfad5ead45b1b3ee5f (patch) | |
| tree | a8ceb093a098a38b29c0fe27e41af480ae10b876 /examples | |
| parent | 446afc10451d5097d7bd20b1b8d20325c4d54fa5 (diff) | |
| parent | 6b2071c697d4c48f0cd289b28b443ebffc3432e6 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure.json
mkspecs/macx-tvos-clang/qmake.conf
mkspecs/macx-watchos-clang/qmake.conf
Change-Id: Iaf32339ace59dff9ed344972472744c55d75025c
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/gui/gui.pro | 4 | ||||
| -rw-r--r-- | examples/network/network.pro | 4 | ||||
| -rw-r--r-- | examples/widgets/tools/tools.pro | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/examples/gui/gui.pro b/examples/gui/gui.pro index e4fec201d7..a4d960d3f5 100644 --- a/examples/gui/gui.pro +++ b/examples/gui/gui.pro @@ -1,10 +1,10 @@ requires(qtHaveModule(gui)) TEMPLATE = subdirs +QT_FOR_CONFIG += gui CONFIG += no_docs_target SUBDIRS += analogclock SUBDIRS += rasterwindow -qtConfig(opengl(es2)?) { +qtConfig(opengl): \ SUBDIRS += openglwindow -} diff --git a/examples/network/network.pro b/examples/network/network.pro index a6a6f3ef52..5ad5f1939f 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -1,6 +1,7 @@ requires(qtHaveModule(network)) TEMPLATE = subdirs +QT_FOR_CONFIG += network-private SUBDIRS = \ download \ downloadmanager @@ -18,8 +19,7 @@ qtHaveModule(widgets) { multicastreceiver \ multicastsender - load(qfeatures) - !contains(QT_DISABLED_FEATURES, bearermanagement) { + qtConfig(bearermanagement) { # no QProcess !vxworks:!qnx:!winrt:!integrity:!uikit: SUBDIRS += network-chat diff --git a/examples/widgets/tools/tools.pro b/examples/widgets/tools/tools.pro index f3cbd73d98..dd8401567b 100644 --- a/examples/widgets/tools/tools.pro +++ b/examples/widgets/tools/tools.pro @@ -16,8 +16,7 @@ SUBDIRS = \ contains(DEFINES, QT_NO_TRANSLATION): SUBDIRS -= i18n -load(qfeatures) -contains(QT_DISABLED_FEATURES, library) { +!qtConfig(library) { SUBDIRS -= \ echoplugin \ plugandpaint |