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/chatserver-cpp/main.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/chatserver-cpp/main.cpp')
-rw-r--r-- | examples/webchannel/chatserver-cpp/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/webchannel/chatserver-cpp/main.cpp b/examples/webchannel/chatserver-cpp/main.cpp index ea27e87..9e025ac 100644 --- a/examples/webchannel/chatserver-cpp/main.cpp +++ b/examples/webchannel/chatserver-cpp/main.cpp @@ -48,14 +48,14 @@ ** ****************************************************************************/ -#include "qwebchannel.h" #include "chatserver.h" #include "../shared/websocketclientwrapper.h" #include "../shared/websockettransport.h" -#include <QtWebSockets/QWebSocketServer> #include <QCoreApplication> +#include <QWebChannel> +#include <QWebSocketServer> int main(int argc, char** argv) { |