diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:17:32 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:17:32 +0200 |
| commit | e50edc952ce15f3c11f4cdfad74ec984043cb080 (patch) | |
| tree | 060893ceb61fa700053b61db8f0d8ebed462e1c3 /examples/webchannel/webchannel.pro | |
| parent | a7c39b36c157e08fdbca6edc97950cd08d682024 (diff) | |
| parent | 86d77a900852691267f556fbde98406a12ee4310 (diff) | |
| download | qtwebchannel-e50edc952ce15f3c11f4cdfad74ec984043cb080.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
examples/webchannel/webchannel.pro
Change-Id: Ia768202d177a24ae90358b5d88621a5fa88f9002
Diffstat (limited to 'examples/webchannel/webchannel.pro')
| -rw-r--r-- | examples/webchannel/webchannel.pro | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/examples/webchannel/webchannel.pro b/examples/webchannel/webchannel.pro index ed1e21b..7d3db8d 100644 --- a/examples/webchannel/webchannel.pro +++ b/examples/webchannel/webchannel.pro @@ -1,7 +1,12 @@ TEMPLATE = subdirs - -qtHaveModule(widgets):qtHaveModule(websockets) { - SUBDIRS += standalone +qtHaveModule(websockets) { + SUBDIRS += chatserver-cpp \ + chatclient-qml + qtHaveModule(widgets) { + SUBDIRS += standalone + } } -SUBDIRS += nodejs qwclient +SUBDIRS += nodejs \ + qwclient \ + chatclient-html |