aboutsummaryrefslogtreecommitdiffstats
path: root/examples/websockets
Commit message (Collapse)AuthorAgeFilesLines
* Stop forcing deprecated ssl protocol versionMårten Nordheim2020-01-171-1/+0
| | | | | Change-Id: I422a2498bb940f801484d3f2e6e5d59edd637514 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Remove usages of deprecated QLatin1LiteralSona Kurazyan2019-06-251-1/+1
| | | | | | | | Task-number: QTBUG-76491 Change-Id: I201455eb4a7868728334403b61d5e41529478677 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Doc: Remove \l from reference to example source fileNico Vertriest2019-03-251-1/+1
| | | | | | | | Replace with \c since it is no longer possible to put hard links to example source files Change-Id: Iaf35f88a37b3c74455550316b83c26bc28769d3c Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Remove redundant options and a stray defineJesus Fernandez2018-08-176-10/+6
| | | | | Change-Id: Ic7ce11f1631197e6ee019b66c0d7ec56590c5ab5 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Use override keywordJesus Fernandez2018-08-102-2/+2
| | | | | Change-Id: I120dcb26eb451930d02e452cc47262eda44cc77c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Replace typedefs by QOverloadAndré Klitzing2017-10-301-2/+1
| | | | | | Change-Id: I509332fa23bcf2cf2e6c10b7edacb4157f025ff9 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-114-22/+40
|\ | | | | | | | | | | | | Conflicts: examples/websockets/simplechat/chatserver.cpp Change-Id: I98697cef4c05516b5b4122ad81c084546d57115f
| * Revamp WebSocket's simple-chat examplev5.10.0-beta1Mårten Nordheim2017-09-284-23/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | - Replace Q_* macros with their 'modern' substitutes - Replace a usage of qDebug with QTextStream - Print a little piece of text whenever a client connects - Add a textbox to the html page to set the host to connect to - Enable/disable disconnect and send button based on connection Task-number: QTBUG-60656 Change-Id: Ieec571c3964f94cd464912054acda3208c02c898 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-267-7/+7
|/ | | | | Change-Id: I0988a4119b5bd790d286c16b5647d97d4d95aef0 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Make sure we find the ssl feature from QtNetworkv5.8.0-beta1Lars Knoll2016-09-141-0/+1
| | | | | | | | Required to be able to continue to compile this module with the modularized configure Change-Id: I9c929a1ab8e856922bacb92ca17c8e1588fa591b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Eradicate Q_FOREACH and Java-style loops and mark the module as Q_FOREACH-freeMarc Mutz2016-09-071-2/+1
| | | | | | Change-Id: I200f72423f13b54c636e995b120a70968b0e0758 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Clean up QT_CONFIG usageLars Knoll2016-08-191-1/+1
| | | | | | | Use the newer qtConfig() method instead. Change-Id: I197dbe01edaf8696ee06d30400bd18e53cf69c94 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-247-3/+24
|\ | | | | | | Change-Id: Ic4a2b48535dd9b22a950b84de4bfa2728a859902
| * Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-197-3/+24
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I80cd189fc82481fdc2241db6d2a7d95537c340a6
| | * add example installsOswald Buddenhagen2016-05-067-3/+24
| | | | | | | | | | | | | | | Change-Id: I49d9fda43374776685d2ab1fa653287447d34028 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | No need to manually call the default constructorFrank Meerkoetter2016-04-074-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | Cleaning up the examples a little. There is no need to explicitly call the default constructor for these members. Change-Id: I7a931ea78f6db1bc1c70f7c49bc85f51e8666d47 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Remove dead codeFrank Meerkoetter2016-04-071-1/+0
|/ / | | | | | | | | Change-Id: I528533bffe34e0df66b4a5b7aad98d54e3ce718c Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* / Updated license headersAntti Kokko2016-01-2027-470/+929
|/ | | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I0166fb7434185f9d151631a51124945150cdd633 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Fix qmldir for qmlwebsockets_compatLiang Qi2015-05-222-2/+2
| | | | | | | | | It is not supported to have both "import Qt.WebSockets 1.0" and "import QtWebSockets 1.0" in the same project. Task-number: QTBUG-46205 Change-Id: I71b824b091f4491b8ab5e1eae8290a51159b03e2 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-173-2/+10
|\ | | | | | | Change-Id: I3dec06c8b49480a8225ef3487c4c76a4fa05b01c
| * Examples: fix certificate files for shadow build in sslechoserverLiang Qi2015-03-093-2/+10
| | | | | | | | | | | | Change-Id: I2e5c35586c3cdc153abf9a70ee1ed6bba7894ecb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-253-6/+32
|\| | | | | | | Change-Id: I218b5069480f60b88390c8540f01c3dbbee485d0
| * Example: echoserver should not close when it got a new connectionLiang Qi2015-02-201-1/+0
| | | | | | | | | | | | | | Otherwise it's just a onetime server. Change-Id: Ida516614e72cac1635062a04a6f1f9e1c56753da Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| * Examples: add options for port and debug outputs in echoserverLiang Qi2015-02-203-5/+32
| | | | | | | | | | | | | | Change-Id: Iadba1c5cb7cd4454b01a98339c2225483b08e180 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5Frederik Gladhorn2015-02-245-7/+33
|\|
| * Examples: add an option for debug outputs in echoclientLiang Qi2015-02-173-6/+25
| | | | | | | | | | Change-Id: I9bec2324b666c00212135ef6c9d5a69594cda050 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Doc: add description and image for echoclient htmlLiang Qi2015-02-132-1/+8
| | | | | | | | | | Change-Id: I7e2adaf19d15842f914be6f946f30d09b7b5532f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Update copyright headersJani Heikkinen2015-02-1627-169/+169
|/ | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I8467410bfad44e8d3fe6bd5724c61bb0c07c91f9 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-2427-493/+277
| | | | | | | - Added LICENSE.LGPLv3, LICENSE.GPLv2 & LICENSE.LGPLv21 Change-Id: I0586e35a7aa99be1b5b3bda580b05897f451acbf Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Add initial support for a declarative WebSocketServer.Milian Wolff2014-07-026-1/+216
| | | | | | | | | | | | | | | | | | It comes with basic support for setting up a non-secure server listening on an arbitrary host and port. The name can be set, and whether the server should be listening or accept connections. The error string is also available via a property. When a client connects, a clientConnected(QQmlWebSocket*) signal is emitted. To showcase the usage and functionality, a new qmlwebsocketserver example is added which behaves similar to qmlwebsocketclient. It simply sends messages from a WebSocket to a local WebSocketServer which in turn sends a simple response. Change-Id: Ib6318155ed08cbeea47d820b709764d2e36dcc45 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-04-118-31/+31
|\ | | | | | | Change-Id: Iff68a7da2065b64579032f1be8eaf5fb097d58bb
| * Use the proper protocol namesSze Howe Koh2014-04-098-31/+31
| | | | | | | | | | | | | | | | - "WebSocket" is one word, with uppercase 'W' and 'S'. - "HTTP"/"HTTPS" is fully uppercase Change-Id: Ice3a50c94394433c97f7347291af5cda69b234ce Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-241-2/+0
|/ | | | Change-Id: I7215c289188462383799269aa9b736ae76db4d25
* Move examples into 'websockets' folderKai Koehne2014-03-1937-0/+2105
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 12:56:30 +0000