diff options
author | Steven Ceuppens <steven.ceuppens@icloud.com> | 2013-09-27 14:27:27 +0200 |
---|---|---|
committer | Kurt Pattyn <pattyn.kurt@gmail.com> | 2013-09-28 21:17:48 +0200 |
commit | 6e1e387174d20fb62a804b6e27438bcc5ea59f28 (patch) | |
tree | 68d5c273ea682a244398ba8d3c7fbeb4a5f76b9b /.gitignore | |
parent | 315e4fa0764f8d7a568be2a8063cc33c9ec13518 (diff) | |
download | qtwebsockets-6e1e387174d20fb62a804b6e27438bcc5ea59f28.tar.gz |
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>
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 41 |
1 files changed, 24 insertions, 17 deletions
@@ -12,8 +12,6 @@ *.dylib *.obj Makefile* -moc_*.cpp -*.moc # Directories to ignore # --------------------- @@ -34,19 +32,28 @@ build-unittests-Qt_5_1_0_clang_64-Debug/unittests build-unittests-Qt_5_1_0_clang_64-Release/unittests examples/.coverity-submit -reports -doc/html -build-examples-Qt_5_1_0_clang_64_temporary-Debug -build-unittests-Qt_5_1_0_clang_64-Release -src/doc/html +# Qt specific .qmake.cache -examples/echoclient/echoclient -src/libQWebSockets.0.9.0.dylib -src/libQWebSockets.0.9.dylib -src/libQWebSockets.0.dylib -src/libQWebSockets.1.0.0.dylib -src/libQWebSockets.1.0.dylib -src/libQWebSockets.1.dylib -src/libQWebSockets.dylib -examples/echoserver/echoserver -tests/unittests +*.pro.user +*.pro.shared +moc_*.cpp +*.moc +*_resource.rc +ui_*.h +qrc_*.cpp + +*~ +*.pdb +*.exe +*.lib +*.res +*.exp +*.manifest +config.log +tmp +imports/* +include +tests/auto/cmake/build +lib/ +mkspecs/ +qml/ |