diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-18 08:33:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-18 08:33:26 +0200 |
| commit | f04c2c40fd7ee91e5cbff2ca4df0fdc30dfbbcd5 (patch) | |
| tree | 4e96d097987deb8d4d1a963e911dcbd1641a8502 /src/plugins/qmltooling | |
| parent | 0da811cdfebdae1d96c99fe681e6a776e73d2f7f (diff) | |
| parent | e76ed6a2655894bd671ee7397a15f2e57cfc8d33 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/qml/jsruntime/qv4variantobject.cpp
src/qml/types/qquickworkerscript.cpp
src/quick/scenegraph/util/qsgdefaultpainternode_p.h
tools/qmljs/qmljs.cpp
Change-Id: I876242714ec8c046238d8fd673a5ace2455b2b59
Diffstat (limited to 'src/plugins/qmltooling')
| -rw-r--r-- | src/plugins/qmltooling/qmltooling.pro | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro index 7682e7b075..907fbe9273 100644 --- a/src/plugins/qmltooling/qmltooling.pro +++ b/src/plugins/qmltooling/qmltooling.pro @@ -1,32 +1,35 @@ TEMPLATE = subdirs +QT_FOR_CONFIG += qml -!no_network { - # Utilities - SUBDIRS += \ - packetprotocol +# Utilities +SUBDIRS += \ + packetprotocol + +# Connectors +SUBDIRS += \ + qmldbg_native \ + qmldbg_server - # Connectors +qtConfig(qml-network) { SUBDIRS += \ - qmldbg_native \ - qmldbg_server \ qmldbg_local \ qmldbg_tcp +} - # Services - SUBDIRS += \ - qmldbg_debugger \ - qmldbg_profiler +# Services +SUBDIRS += \ + qmldbg_debugger \ + qmldbg_profiler - qmldbg_server.depends = packetprotocol - qmldbg_native.depends = packetprotocol - qmldbg_debugger.depends = packetprotocol - qmldbg_profiler.depends = packetprotocol +qmldbg_server.depends = packetprotocol +qmldbg_native.depends = packetprotocol +qmldbg_debugger.depends = packetprotocol +qmldbg_profiler.depends = packetprotocol - qtHaveModule(quick) { - SUBDIRS += \ - qmldbg_inspector \ - qmldbg_quickprofiler - qmldbg_inspector.depends = packetprotocol - qmldbg_quickprofiler.depends = packetprotocol - } +qtHaveModule(quick) { + SUBDIRS += \ + qmldbg_inspector \ + qmldbg_quickprofiler + qmldbg_inspector.depends = packetprotocol + qmldbg_quickprofiler.depends = packetprotocol } |