summaryrefslogtreecommitdiff
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-2438-21/+15
|\ \ | |/ | | | | Change-Id: I7215c289188462383799269aa9b736ae76db4d25
| * Move examples into 'websockets' folderKai Koehne2014-03-1938-10/+13
| | | | | | | | | | | | | | | | | | In the packaging process the content of all 'examples' folders are copied together into one folder ... so modules are supposed to have their submodule name as a sub-folder of 'examples'. Change-Id: I9981b914e8268c932ca5a3d1c9fa73f8db0b6a5b Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Doc: Move and edit examples pageTopi Reinio2014-03-141-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | Changed the example page type to a group to have a standardized table of examples. Also, a filename 'examples.html' is too collision-prone when Qt docs are output to a single directory. Also, moved the examples.qdoc file into /doc subdirectory to avoid it from being copied to QT_INSTALL_EXAMPLES when packaging the examples. Change-Id: I87251e0fde127bdef3024907b6472b50039f0357 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* | Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-139-10/+40
|\ \ | |/ | | | | Change-Id: I0ee590f834200c488498315e66acf7cd046d43ad
| * Add warning to example regarding ignoring ssl errorsKurt Pattyn2014-03-121-0/+5
| | | | | | | | | | Change-Id: I3d615a774f4071a085b0f233bef2eac76aefbefb Reviewed-by: Richard J. Moore <rich@kde.org>
| * Fix for self-signed certificatesKurt Pattyn2014-03-122-4/+17
| | | | | | | | | | Change-Id: I529976e6fc8813d273290e97e86405f51c3efa57 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Doc: Review documentation Qt WebSocketsNico Vertriest2014-03-117-6/+18
| | | | | | | | | | | | | | Task-number: QTBUG-37149 Change-Id: Ia8fe7b11140d31bc231a17bfcc16887f3af0dbce Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Cleanup header fileKurt Pattyn2014-03-121-2/+0
|/ | | | | Change-Id: I6dade8485daec571e6b1bb844e3320ce3cb00fdb Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove superfluous setProtocol callKurt Pattyn2014-02-161-1/+0
| | | | | Change-Id: I14f16bbe0a68602265a28d71464727b671be5099 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Catch SSL errors in exampleKurt Pattyn2014-02-162-0/+9
| | | | | Change-Id: Ib9a399789878030361d9bdddd8dbfbb1832cf756 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Mark html page as being utf-8Kurt Pattyn2014-02-161-0/+2
| | | | | | | | FireFox complained when opening the page without proper indication of the encoding. Change-Id: I4f0891699c72d46bcf0cd488e2ecaf095514fabc Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Adapt copyright headerKurt Pattyn2014-02-1517-17/+17
| | | | | Change-Id: I9773492d3673d8aabdb4dd178be6af12eca7ba74 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Remove checks on return value of sendXXX methodsKurt Pattyn2014-02-133-10/+5
| | | | | Change-Id: If70aa381e377b832f0b44af97e19abf98f3941eb Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Simplify simple chat exampleJędrzej Nowacki2014-02-112-4/+0
| | | | | Change-Id: Ia4e6973e6531017129ae39c89851fbbf3ade76c4 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Simplify echoclient exampleJędrzej Nowacki2014-02-113-7/+0
| | | | | Change-Id: I773665754089c1f4548712df280289c77d45eba9 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Re-enable QML componentKurt Pattyn2014-02-111-1/+1
| | | | | | | Change-Id: I84948cf414585af841f3e669ddaf18b7a10fb22f Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Replace delete loop with qDeleteAllKurt Pattyn2014-02-053-12/+3
| | | | | | Change-Id: If63acc08307c0a411072a2a37ac52661e7e02594 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Remove superfluous Q_REQUIRED_RESULTKurt Pattyn2014-02-042-4/+2
| | | | | | Change-Id: Ie4e01a82082c45918b55e8588c7322dd359ba8c1 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Comment out QML componentKurt Pattyn2014-02-041-1/+1
| | | | | | | | Commented out QWebSocket QML component because there is still discussion regarding its API. Change-Id: I9a0699e19186f7e9761517fd127ac8a5263c745f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add cleanup to examplesKurt Pattyn2014-02-034-0/+20
| | | | | Change-Id: I28b9007a6d35575b11a608645930fa2ed71e7c7c Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Rename ProcessMessage to ProcessTextMessageKurt Pattyn2014-02-012-5/+5
| | | | | | | | | Renamed to ProcessTextMessage to be consistent with ProcessBinaryMessage and with the method names in the SslEchoServer example. Change-Id: Iaaa732221597a08fca079e8df4df941d673d16a6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Rename processMessage to processTextMessageKurt Pattyn2014-01-212-5/+5
| | | | | | | | Renamed processMessage to be more inline with processBinaryMessage. Change-Id: Ib0c8b9a4999756105f894d7ca5df88452495a66b Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Rename SecureMode to SslModeKurt Pattyn2014-01-203-3/+3
| | | | | | | | Renamed SecureMode to SslMode to be more inline with QSslSocket. Change-Id: Id2f0c5ebc1e06fcd7b0ce5059e88520e5f0e6fe5 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Rename write methodsKurt Pattyn2014-01-205-7/+7
| | | | | | | | | Renamed the write methods to sendTextMessage and sendBinaryMessage respectively. This makes the code more readable. Change-Id: Ie49abf07a37f54c84bd01c5c788d2e42b28bcfdd Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use QStringLiteral where appropriateKurt Pattyn2014-01-206-6/+8
| | | | | Change-Id: I608b555428aceafd7761a882cd4bd1fdb50d19b3 Reviewed-by: Richard J. Moore <rich@kde.org>
* Consume return value of write functionKurt Pattyn2014-01-205-7/+14
| | | | | Change-Id: Ia5d950f539f87f2f81e111f26e77960be456017e Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use new connect syntaxKurt Pattyn2014-01-207-23/+26
| | | | | Change-Id: I0b48c6cba12902d910c4f586fa105a13d084a437 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Limit line length to 100 chars per lineKurt Pattyn2014-01-205-5/+10
| | | | | Change-Id: I2a91033c9882ca54c6fcf26d9eb5a3c91f9e0f7d Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Rename enumerations to comply with Qt styleKurt Pattyn2014-01-183-3/+3
| | | | | Change-Id: Id72fe27cec606e7f02b8e9ac1d0d763890e86a95 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add extra documentationKurt Pattyn2013-12-227-0/+356
| | | | | Change-Id: I1a3c0571faeabf2d05bc144628d186e5ff039014 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Fix SSL examplesKurt Pattyn2013-12-221-2/+6
| | | | | | | Only include ssl examples when ssl is enabled in Qt Change-Id: I1ab8ec068980c0b6b9f19b47d05ae8fee3d17e79 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Cleanup code to comply with Qt styleKurt Pattyn2013-12-106-14/+24
| | | | | | | | | | | | | | - Correct placement of curly braces - Remove commented-out code - Remove superfluous qDebug statements - Add missing QT_BEGIN_NAMESPACE declarations - Add move semantics - Add cleanup handling to QWebSocketServerPrivate - Add error handling to handshake response, QWebSocketServerPrivate, QWebSocketServer, dataprocessor Change-Id: I0690dc2c444fd6fc0db974d1459bf41bd8c31d40 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add QML websockets pluginKurt Pattyn2013-11-252-8/+39
| | | | | | Change-Id: I9454cf339f8af5515d3a91667d8c8ded3659d18b Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Change open method so that a web socket can be reopenedKurt Pattyn2013-11-182-1/+4
| | | | | Change-Id: I1c7059a8e581ce5179c00f187b03f59fbed63ba6 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add NON_SECURE_MODE parameter to QWebSocketServer constructorKurt Pattyn2013-11-071-1/+1
| | | | | Change-Id: I9e2e892b67490061f08d03b87a8dc3de288a09e5 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Change url to localhostKurt Pattyn2013-11-061-2/+1
| | | | | Change-Id: I6a33add4244d78e703f1d0c8ae39d42017383b26 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add sslEchoClient and sslEchoServer examplesKurt Pattyn2013-11-0618-14/+638
| | | | | | | Add license headers Change-Id: Ied74cb3db6ceed6c3f361e4afac860a7a3fb7676 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add html client for echo server exampleKurt Pattyn2013-11-062-0/+104
| | | | | Change-Id: I1d6c47c9fc5e68f8eabf92db5a91e645319572fb Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add chat server exampleKurt Pattyn2013-11-066-1/+345
| | | | | Change-Id: Iec7e9be0d2e397737ab12b898ac31bca200f05c1 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Sanitize .pro filesKurt Pattyn2013-11-022-4/+0
| | | | | | | | Remove c++11 config flag if not necessary Remove mac specific compiler settings Change-Id: If3cb4c5396f6dd5679a9fc8cf8f8a81c34ad6f4c Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use QT namespace and forward declarationsKurt Pattyn2013-11-024-2/+8
| | | | | Change-Id: I67a0ee96f2e21ed441bb10f55c6bf8180245846b Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add correct license headersKurt Pattyn2013-11-018-36/+320
| | | | | Change-Id: I789cd780697aedbca7a90a5991df00b2c7e9ec98 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Include qml example on when quick is availableKurt Pattyn2013-11-011-2/+2
| | | | | Change-Id: I35956c27253819ddacbb2abd403b06f97e57bd31 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add functionality to ignore ssl errorsKurt Pattyn2013-11-011-1/+1
| | | | | Change-Id: I81248b9af104c0b3d37c9cfcef250a102f4b1d32 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* make use of the new Q_NULLPTR keyword & shorten if(ptr) conditionsSteven Ceuppens2013-10-113-6/+6
| | | | | Change-Id: I4a71909134032d10b398ede74c431964bce7d675 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Changes to integrate the websocket module as a full Qt Add-On moduleSteven Ceuppens2013-09-287-9/+95
| | | | | | | | | | | | | | | | | | | | | - 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>
* Added -Wextra compiler checkKurt Pattyn2013-08-302-6/+10
|
* Replaced tabs by spacesKurt Pattyn2013-08-256-60/+60
|
* Renamed qwebsocket.pri to qwebsockets.priKurt Pattyn2013-08-252-2/+2
|
* Cleaned up the project filesKurt Pattyn2013-08-252-2/+4
|