diff options
author | Milian Wolff <milian.wolff@kdab.com> | 2014-07-03 14:57:03 +0200 |
---|---|---|
committer | Milian Wolff <milian.wolff@kdab.com> | 2014-07-04 20:19:27 +0200 |
commit | 20937e9192c52630b9b47765b58493ada64fcf65 (patch) | |
tree | ad21560ea9eec538fab10abe7b6f70bc2c9d3c17 /src/webchannel/webchannel.pro | |
parent | 856dc072acb649be03e02ac64c81015d3f2675c2 (diff) | |
download | qtwebchannel-20937e9192c52630b9b47765b58493ada64fcf65.tar.gz |
Only depend optionally on QtWebSockets, and only use it in the example.
The utility QWebChannelAbstractTransport implementation based on the
QtWebSocket has no big value. Instead, it would pull in the QtWebSocket
link-time dependency into QtWebKit/QtWebEngine, which is not desired.
Considering that the WebSocket usecase is minor, and only few people
will ever use it, we agreed that having the code in the example alone
is enough.
Change-Id: Ica038329a1d684f33e805fc296e9dff71b1446ba
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Diffstat (limited to 'src/webchannel/webchannel.pro')
-rw-r--r-- | src/webchannel/webchannel.pro | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/webchannel/webchannel.pro b/src/webchannel/webchannel.pro index a50beaa..086deeb 100644 --- a/src/webchannel/webchannel.pro +++ b/src/webchannel/webchannel.pro @@ -1,5 +1,5 @@ TARGET = QtWebChannel -QT = core network websockets +QT = core network CONFIG += warn_on strict_flags load(qt_module) @@ -12,8 +12,7 @@ OTHER_FILES = \ PUBLIC_HEADERS += \ qwebchannel.h \ - qwebchannelabstracttransport.h \ - qwebchannelwebsockettransport.h + qwebchannelabstracttransport.h PRIVATE_HEADERS += \ qwebchannel_p.h \ @@ -24,8 +23,7 @@ PRIVATE_HEADERS += \ SOURCES += \ qwebchannel.cpp \ qmetaobjectpublisher.cpp \ - qwebchannelabstracttransport.cpp \ - qwebchannelwebsockettransport.cpp + qwebchannelabstracttransport.cpp qtHaveModule(qml) { QT += qml |