diff options
| author | Milian Wolff <milian.wolff@kdab.com> | 2014-01-31 17:39:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-06 23:55:11 +0100 |
| commit | 6547d3305a872163158510cae5b8fc61efb8bca0 (patch) | |
| tree | 8a51312a8c598207c53e1027169c52f0d214d06b /src/webchannel/webchannel.pro | |
| parent | 6b3569c2cb761afe4eba626067b7c686eda866e6 (diff) | |
| download | qtwebchannel-6547d3305a872163158510cae5b8fc61efb8bca0.tar.gz | |
Port code to QtWebSockets.
This removes the custom WebSocket server implementation and replaces
it by a dependency on the QtWebSockets module.
Sadly, the QtWebSocket module does not yet support custom protocols.
Also, there is quite some boiler plate code required, something which
I want to simplify upstream in the QtWebSockets module later.
Change-Id: I8066418fb1857d23b8593c443bc9a98ded917a99
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Diffstat (limited to 'src/webchannel/webchannel.pro')
| -rw-r--r-- | src/webchannel/webchannel.pro | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro index 279eb37..f04e3eb 100644 --- a/src/webchannel/webchannel.pro +++ b/src/webchannel/webchannel.pro @@ -1,5 +1,5 @@ TARGET = QtWebChannel -QT = core network +QT = core network websockets CONFIG += warn_on strict_flags load(qt_module) @@ -18,7 +18,6 @@ PUBLIC_HEADERS += \ PRIVATE_HEADERS += \ qwebchannel_p.h \ qmetaobjectpublisher_p.h \ - qwebsocketserver_p.h \ qwebchannelsocket_p.h \ variantargument_p.h \ signalhandler_p.h @@ -26,7 +25,6 @@ PRIVATE_HEADERS += \ SOURCES += \ qwebchannel.cpp \ qmetaobjectpublisher.cpp \ - qwebsocketserver.cpp \ qwebchannelsocket.cpp \ qwebsockettransport.cpp |