summaryrefslogtreecommitdiff
path: root/src/webchannel/webchannel.pro
diff options
context:
space:
mode:
authorMilian Wolff <milian.wolff@kdab.com>2014-02-01 14:18:36 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-21 12:59:25 +0100
commit4d948685996df0e5e6c9242c12276d4d584bc974 (patch)
treef23f9fcbc8836b7cfd97a2579b0805454c578d16 /src/webchannel/webchannel.pro
parent2e6607507719a396c941a13e2429647901f60917 (diff)
downloadqtwebchannel-4d948685996df0e5e6c9242c12276d4d584bc974.tar.gz
Merge QWebChannelSocket and QWebSocketTransport.
The former was just the private implementation of the latter. This way, the code structure is more understandable to newcomers and follows existing best-practices. Change-Id: I07cf64370553f4c2de349b5f01e90b31112fee58 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/webchannel/webchannel.pro')
-rw-r--r--src/webchannel/webchannel.pro3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro
index f04e3eb..c6e6d69 100644
--- a/src/webchannel/webchannel.pro
+++ b/src/webchannel/webchannel.pro
@@ -18,14 +18,13 @@ PUBLIC_HEADERS += \
PRIVATE_HEADERS += \
qwebchannel_p.h \
qmetaobjectpublisher_p.h \
- qwebchannelsocket_p.h \
+ qwebsockettransport_p.h \
variantargument_p.h \
signalhandler_p.h
SOURCES += \
qwebchannel.cpp \
qmetaobjectpublisher.cpp \
- qwebchannelsocket.cpp \
qwebsockettransport.cpp
qtHaveModule(qml) {