summaryrefslogtreecommitdiff
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Fix loading of QML pluginsv5.8.0-alpha1Simon Hausmann2016-08-291-1/+1
| | | | | | | | | | Since commit 709f6370884b110def2e4665df8fa7bbf5fae734 the plugin loader is strict about requiring the correct interface id, to avoid loading unrelated plugins in the loader thread (which they may not be prepared to do). Change-Id: If892bc1d3d1762ffd9dad9dd19deda84baba4159 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-083-5/+12
|\ | | | | | | Change-Id: I8a2d6875b68c99786f99ec0dc380f8725c6abd42
| * Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-082-5/+4
| |\ | | | | | | | | | Change-Id: I7ebcdc16a8b65103abfb9640c990eddbeccdef05
| | * Doc: Avoid auto-linking of WebSocket, WebSocketsKai Koehne2016-04-072-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Enable using the module in a statically built applicationv5.7.0-alpha1Andy Shaw2016-02-261-0/+8
| | | | | | | | | | | | | | | Change-Id: I6c905059f2e194c7209e01ce48e84ed571add847 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Add binary message support to QML WebSocket typeNobuaki Sukegawa2016-03-055-5/+42
|/ / | | | | | | | | Change-Id: I4472e899606d261420141e7b382717cbe12943c8 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Updated license headersAntti Kokko2016-01-206-84/+120
|/ | | | | | | | | | 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 plugins.qmltypesKai Koehne2015-10-152-4/+4
| | | | | | | 0610115192f4a1 changed the port type from uint16 to int. Change-Id: I800fe254648d026c8e29d93a2945bdf8380aa950 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update plugins.qmltypesNobuaki Sukegawa2015-10-131-2/+2
| | | | | | | | This follows the port type change in 0610115192f4a1e4d722330bf298ccd213ca3b5f. Change-Id: Icf24665b0e9a604e2919095fc737a1085f430175 Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* WebSocketServer: use int type for portLiang Qi2015-07-222-8/+14
| | | | | | | | | | | QML engine doesn't support quint16 as a QML type. Task-number: QTBUG-46790 Change-Id: I5b01dc06a3256dd41affc035fc507082e1935cc8 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Update plugins.qmltypes for QtWebSockets and Qt.WebSocketsLiang Qi2015-05-263-3/+101
| | | | | | Change-Id: I7cacbce1625015636e92b2fd5f2ade694a97a5c9 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix qmldir for qmlwebsockets_compatLiang Qi2015-05-221-1/+1
| | | | | | | | | 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>
* Update copyright headersJani Heikkinen2015-02-166-36/+36
| | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-171-0/+2
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ifee77abab352e92b52a2ddba16447107005e3253
| * Hardcode QtQml version import in .pro fileKai Koehne2014-12-051-0/+2
| | | | | | | | | | | | | | | | | | This allows the plugins.qmltypes file to be updated by just running make qmltypes Change-Id: I0872082645e9d4d8879e3a3479aea80494248894 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Rename QML import from "Qt.WebSockets" to "QtWebSockets"Sze Howe Koh2014-12-019-9/+22
|/ | | | | | | | | | | 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>
* Update the plugins.qmltypes meta data.Milian Wolff2014-10-141-0/+50
| | | | | | | | I forgot to do this when I introduced the QQmlWebSocketServer. Change-Id: I7fd7354cf42f633973e0da71d854594627e2fb97 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Improve the integration of QtWebsockets into general Qt docsv5.4.0-beta1Alex Blasche2014-09-282-0/+2
| | | | | | | | | | | | | 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-246-108/+60
| | | | | | | - Added LICENSE.LGPLv3, LICENSE.GPLv2 & LICENSE.LGPLv21 Change-Id: I0586e35a7aa99be1b5b3bda580b05897f451acbf Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-141-2/+2
|\ | | | | | | | | | | | | Conflicts: src/imports/qmlwebsockets/qqmlwebsocket.h Change-Id: Ib883a07eb1784743adca7a0c38fd156800354f4b
| * Use 0 instead of Q_NULLPTR in public headers.v5.3.25.3.2Sergio Martins2014-07-111-1/+1
| | | | | | | | | | | | | | | | Otherwise Q_NULLPTR appears in documentation, which is inconsistent. Change-Id: I0f4b07b25c6012d502938aa452e68c75d910f954 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Add initial support for a declarative WebSocketServer.Milian Wolff2014-07-027-10/+442
|/ | | | | | | | | | | | | | | | | | 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>
* Add missing classname for module in qmldir.v5.3.0Frederik Gladhorn2014-05-093-2/+3
| | | | | | | Task-number: QTBUG-38854 Change-Id: Iad6d49309010fd9ccb7e8fcb2c58962d811f018f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Use the proper protocol namesSze Howe Koh2014-04-092-2/+2
| | | | | | | | - "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>
* Adapt copyright headerKurt Pattyn2014-02-154-4/+4
| | | | | Change-Id: I9773492d3673d8aabdb4dd178be6af12eca7ba74 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Correct include pathKurt Pattyn2014-02-021-1/+1
| | | | | Change-Id: I7929337d16485a4ec9e95d1eb6037c84634b672f 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-233-13/+26
| | | | | 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-256-16/+275
| | | | | | 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-014-72/+160
| | | | | Change-Id: I789cd780697aedbca7a90a5991df00b2c7e9ec98 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* make use of the new Q_NULLPTR keyword & shorten if(ptr) conditionsSteven Ceuppens2013-10-111-1/+1
| | | | | Change-Id: I4a71909134032d10b398ede74c431964bce7d675 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Added core to QtKurt Pattyn2013-10-051-1/+1
| | | | | Change-Id: I122ff3f018ab1df7b93cf3ae817dbd91955e7cbe Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
* Changes to integrate the websocket module as a full Qt Add-On moduleSteven Ceuppens2013-09-287-0/+166
- 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