Changes to integrate the websocket module as a full Qt Add-On module
authorSteven Ceuppens <steven.ceuppens@icloud.com>
Fri, 27 Sep 2013 12:27:27 +0000 (14:27 +0200)
committerKurt Pattyn <pattyn.kurt@gmail.com>
Sat, 28 Sep 2013 19:17:48 +0000 (21:17 +0200)
commit6e1e387174d20fb62a804b6e27438bcc5ea59f28
tree68d5c273ea682a244398ba8d3c7fbeb4a5f76b9b
parent315e4fa0764f8d7a568be2a8063cc33c9ec13518
Changes to integrate the websocket module as a full Qt Add-On module

- Changed project files to use Qt structure
- Moved existing sources into subdirectory, to make room for moduels
- Created a "import/qmlwebsocket" module skeleton (works, but needs to be extended)
- Modified examples to not use "include(.pri)", but use "QT += websocket"
- Added qml example skeleton (works, but no useful functionality yet)

Project can be build with:

$ qmake
$ make
$ make install

Module can be used in other projects with

QT += websockets

Change-Id: I2123026958b264670dbf8a978dee76edf5855806
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
45 files changed:
.gitignore
.qmake.conf [new file with mode: 0644]
examples/echoclient/echoclient.pro
examples/echoserver/echoserver.pro
examples/examples.pro
examples/qmlwebsocketclient/data.qrc [new file with mode: 0644]
examples/qmlwebsocketclient/main.cpp [new file with mode: 0644]
examples/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml [new file with mode: 0644]
examples/qmlwebsocketclient/qmlwebsocketclient.pro [new file with mode: 0644]
qwebsockets.pro [deleted file]
src/imports/imports.pro [new file with mode: 0644]
src/imports/qmlwebsockets/qmldir [new file with mode: 0644]
src/imports/qmlwebsockets/qmlwebsockets.pro [new file with mode: 0644]
src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp [new file with mode: 0644]
src/imports/qmlwebsockets/qmlwebsockets_plugin.h [new file with mode: 0644]
src/imports/qmlwebsockets/qqmlwebsocket.cpp [new file with mode: 0644]
src/imports/qmlwebsockets/qqmlwebsocket.h [new file with mode: 0644]
src/qwebsockets.pro [deleted file]
src/src.pro
src/websockets/dataprocessor_p.cpp [moved from src/dataprocessor_p.cpp with 100% similarity]
src/websockets/dataprocessor_p.h [moved from src/dataprocessor_p.h with 100% similarity]
src/websockets/doc/qwebsockets.qdoc [moved from src/doc/qwebsockets.qdoc with 100% similarity]
src/websockets/doc/qwebsockets.qdocconfig [moved from src/doc/qwebsockets.qdocconfig with 100% similarity]
src/websockets/handshakerequest_p.cpp [moved from src/handshakerequest_p.cpp with 100% similarity]
src/websockets/handshakerequest_p.h [moved from src/handshakerequest_p.h with 100% similarity]
src/websockets/handshakeresponse_p.cpp [moved from src/handshakeresponse_p.cpp with 100% similarity]
src/websockets/handshakeresponse_p.h [moved from src/handshakeresponse_p.h with 100% similarity]
src/websockets/qcorsauthenticator.cpp [moved from src/qcorsauthenticator.cpp with 100% similarity]
src/websockets/qcorsauthenticator.h [moved from src/qcorsauthenticator.h with 100% similarity]
src/websockets/qcorsauthenticator_p.h [moved from src/qcorsauthenticator_p.h with 100% similarity]
src/websockets/qwebsocket.cpp [moved from src/qwebsocket.cpp with 100% similarity]
src/websockets/qwebsocket.h [moved from src/qwebsocket.h with 100% similarity]
src/websockets/qwebsocket_p.cpp [moved from src/qwebsocket_p.cpp with 100% similarity]
src/websockets/qwebsocket_p.h [moved from src/qwebsocket_p.h with 100% similarity]
src/websockets/qwebsocketprotocol.cpp [moved from src/qwebsocketprotocol.cpp with 100% similarity]
src/websockets/qwebsocketprotocol.h [moved from src/qwebsocketprotocol.h with 100% similarity]
src/websockets/qwebsocketserver.cpp [moved from src/qwebsocketserver.cpp with 100% similarity]
src/websockets/qwebsocketserver.h [moved from src/qwebsocketserver.h with 100% similarity]
src/websockets/qwebsocketserver_p.cpp [moved from src/qwebsocketserver_p.cpp with 100% similarity]
src/websockets/qwebsocketserver_p.h [moved from src/qwebsocketserver_p.h with 100% similarity]
src/websockets/qwebsocketsglobal.h [moved from src/qwebsocketsglobal.h with 100% similarity]
src/websockets/websockets.pro [moved from src/qwebsockets.pri with 59% similarity]
sync.profile
tests/tests.pro
websockets.pro [new file with mode: 0644]