diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:38:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:38:57 +0200 |
| commit | ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b (patch) | |
| tree | 3379cee43d6acae95312e51e6cd05c3c4198a95e /examples/webchannel/shared/websocketclientwrapper.cpp | |
| parent | 749951c19cbb7d301bed20f24d16dd4e713485c2 (diff) | |
| parent | d84318e98aa3cbac11b4f95b3581e95aab96a34a (diff) | |
| download | qtwebchannel-ba755c28ea0cd35cfa9d8c77ef7f2c61437ad25b.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2v5.10.0-beta1
Change-Id: I54f0bcd46ffb496156e46d723275cdd29601e45c
Diffstat (limited to 'examples/webchannel/shared/websocketclientwrapper.cpp')
| -rw-r--r-- | examples/webchannel/shared/websocketclientwrapper.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/examples/webchannel/shared/websocketclientwrapper.cpp b/examples/webchannel/shared/websocketclientwrapper.cpp index 3743bdd..16be85e 100644 --- a/examples/webchannel/shared/websocketclientwrapper.cpp +++ b/examples/webchannel/shared/websocketclientwrapper.cpp @@ -51,7 +51,7 @@ #include "websocketclientwrapper.h" #include "websockettransport.h" -#include <QtWebSockets/QWebSocketServer> +#include <QWebSocketServer> /*! \brief Wraps connected QWebSockets clients in WebSocketTransport objects. @@ -61,8 +61,6 @@ published objects. */ -QT_BEGIN_NAMESPACE - /*! Construct the client wrapper with the given parent. @@ -84,5 +82,3 @@ void WebSocketClientWrapper::handleNewConnection() { emit clientConnected(new WebSocketTransport(m_server->nextPendingConnection())); } - -QT_END_NAMESPACE |