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/standalone/main.cpp | |
| 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/standalone/main.cpp')
| -rw-r--r-- | examples/webchannel/standalone/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/webchannel/standalone/main.cpp b/examples/webchannel/standalone/main.cpp index 6f0db3a..201c4cd 100644 --- a/examples/webchannel/standalone/main.cpp +++ b/examples/webchannel/standalone/main.cpp @@ -42,8 +42,8 @@ #include <QtWebSockets/QWebSocketServer> -#include "websocketclientwrapper.h" -#include "websockettransport.h" +#include "../shared/websocketclientwrapper.h" +#include "../shared/websockettransport.h" #include "ui_dialog.h" |