diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:24:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-30 16:26:08 +0200 |
| commit | c55e385f1f70f11d3ffd0f8372ccb8e7405018c5 (patch) | |
| tree | a04c2e84b43830ecf9c8817f830055bfcf64cc0d /tests/auto/auto.pro | |
| parent | a3e0fe474c20eb526af9668c5cc97cf7055c77fa (diff) | |
| parent | 086f3722777ee61f3c019ca064d4a844cf0f6fe4 (diff) | |
| download | qtwebsockets-c55e385f1f70f11d3ffd0f8372ccb8e7405018c5.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
src/websockets/qwebsocket_p.cpp
Change-Id: Ibcc1898263cc8bc80066370f045df6a217e46574
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 4698cd0..d96c4a5 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,16 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = \ - qwebsocketcorsauthenticator +SUBDIRS += cmake websockets -contains(QT_CONFIG, private_tests): SUBDIRS += \ - websocketprotocol \ - dataprocessor \ - websocketframe \ - handshakerequest \ - handshakeresponse \ - qdefaultmaskgenerator - -SUBDIRS += \ - qwebsocket \ - qwebsocketserver +qtHaveModule(quick) { + SUBDIRS += qml +} |