summaryrefslogtreecommitdiff
path: root/src/imports/qmlwebsockets/qqmlwebsocket.cpp
Commit message (Collapse)AuthorAgeFilesLines
* QQmlWebSocket::setUrl(): let open() decided what to actually doEdward Welbourne2017-05-041-3/+1
| | | | | | | | | | | | | | | | After emitting urlChanged(), setUrl() did a manual open(url) if it had a web-socket to do it on, omitting various checks that open() imposes on actually calling open(url); as a result, it left the web socket in an inconsistent state if it wasn't yet active. This meant that setting active could trigger a second open() while the web-socket was already open(), which upset it. Replaced the hand-rolled call to open(url) with a call to open() so as to be consistent and avoid such problems. Task-number: QTBUG-58278 Change-Id: Iee84f2b0d973e7fd288a14018039a665658c0040 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Fixed WebSocket status docAleksey Lysenko2016-12-131-5/+5
| | | | | | Task-number: QTBUG-57523 Change-Id: I2c7f6c2467ba615d1bcbb9d659e27bb242373710 Reviewed-by: Martin Smith <martin.smith@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-081-4/+3
|\ | | | | | | Change-Id: I8a2d6875b68c99786f99ec0dc380f8725c6abd42
| * Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-081-4/+3
| |\ | | | | | | | | | Change-Id: I7ebcdc16a8b65103abfb9640c990eddbeccdef05
| | * Doc: Avoid auto-linking of WebSocket, WebSocketsKai Koehne2016-04-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the automatic linking of 'WebSocket' to the QML type, and 'WebSockets' to a section in the general documentation. Instead, make the linking explicit where it makes sense. This patch is inspired by 0228a5bd581ae6d672ce5f3 in qtwebengine. Change-Id: I80886360d5f7fdaa68a5e5f6fa982137c7187719 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| | * Doc: Add external-resources.qdocKai Koehne2016-04-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also sanitize some linking, e.g. by referencing to the paper by title, not by link. Change-Id: I95482994ca569001a23a3beb0e3cbe6739f4ed77 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | Add binary message support to QML WebSocket typeNobuaki Sukegawa2016-03-051-0/+24
|/ / | | | | | | | | Change-Id: I4472e899606d261420141e7b382717cbe12943c8 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-201-14/+20
|/ | | | | | | | | | From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new LGPL header instead of LGPL21 one (in those files which will be under LGPL v3) Change-Id: I8c17da1f7e2f0a620e3627fa7f8087f185545c8a Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-161-6/+6
| | | | | | | | | | 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>
* Rename QML import from "Qt.WebSockets" to "QtWebSockets"Sze Howe Koh2014-12-011-1/+1
| | | | | | | | | | | This is in line with all other modules (e.g. "QtWebEngine 1.x", "QtQuick 2.x", "QtWebKit 3.x", "QtSensors 5.x") The old name is retained for compatibility with code from Qt 5.3. This is achieved by having a dummy qmldir file in the old location. Change-Id: I66576abe5edb44c3338c47b2980f34574129af01 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Improve the integration of QtWebsockets into general Qt docsv5.4.0-beta1Alex Blasche2014-09-281-0/+1
| | | | | | | | | | | | | 1.) The websocket qml types page is now hooked into Qt's QML Type by Module page. 2.) Correct incorrectly documented import statement for Qt.WebSockets module in QML. 3.) Add missing \since tags (see QTBUG-36775). Change-Id: I1321db70215fcd16cfbd77dd71a459244241d8a3 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update license headers and add new license filesv5.4.0-alpha1Antti Kokko2014-08-241-18/+10
| | | | | | | - 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-021-6/+25
| | | | | | | | | | | | | | | | | | 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>
* Document WebSocket::sendTextMessage(string message)Richard Moe Gustavsen2014-05-231-0/+5
| | | | | Change-Id: I38c08520c37d84570c3c8df9d2416131defc5b40 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Adapt copyright headerKurt Pattyn2014-02-151-1/+1
| | | | | Change-Id: I9773492d3673d8aabdb4dd178be6af12eca7ba74 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Small fix to error textKurt Pattyn2014-01-201-1/+1
| | | | | Change-Id: Ie46b5ad5892e55a20ba00bdf659d2395c40f95c3 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Rename write methodsKurt Pattyn2014-01-201-1/+1
| | | | | | | | | 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>
* Fix typo (passive requires past participle)Frederik Gladhorn2014-01-171-1/+1
| | | | | Change-Id: I3792ccb9fa40042d0a5912a3723bfbf23b867f73 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Update documentationKurt Pattyn2014-01-131-4/+6
| | | | | Change-Id: I98cab390cbb0f19741d6fa4ae5b0ada8d19d1f5f Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Use new connect syntaxKurt Pattyn2014-01-131-3/+7
| | | | | Change-Id: Idd002ff72d27e5b549600704ae0e857bd021f5d1 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Link qml documentation and make it visible in creatorFrederik Gladhorn2014-01-111-0/+1
| | | | | Change-Id: I39cd6aab1eb7dd154bc41a211984396540b6979c Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add Qml documentationKurt Pattyn2013-12-271-1/+41
| | | | | Change-Id: I38bfb0d87614fee1d508567a014a41e4be8cf6c2 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add optimizationsKurt Pattyn2013-12-231-11/+17
| | | | | Change-Id: Icd293f832e2d7a6272d4953c1994065d16222375 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add extra documentationKurt Pattyn2013-12-221-0/+17
| | | | | Change-Id: I1a3c0571faeabf2d05bc144628d186e5ff039014 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Add QML websockets pluginKurt Pattyn2013-11-251-2/+160
| | | | | | Change-Id: I9454cf339f8af5515d3a91667d8c8ded3659d18b Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Add correct license headersKurt Pattyn2013-11-011-18/+40
| | | | | Change-Id: I789cd780697aedbca7a90a5991df00b2c7e9ec98 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Changes to integrate the websocket module as a full Qt Add-On moduleSteven Ceuppens2013-09-281-0/+35
- 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>
View Lorry Controller Status