summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-3042-36/+584
|\ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/websockets/qwebsocket_p.cpp Change-Id: Ibcc1898263cc8bc80066370f045df6a217e46574
| * Bump versionOswald Buddenhagen2015-06-291-1/+1
| | | | | | | | Change-Id: Ie226303b4a1059c22fa5752adcb621fcc05a53e8
| * Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-261-0/+49
| |\ | | | | | | | | | Change-Id: Ieca9be8fcf6c0411442478babe3a47a681cbf63c
| | * 5.5.0 changelogv5.5.0-rc1v5.5.05.5.0Liang Qi2015-06-051-0/+49
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9541416b13519389e5a2061a8ef978046570286 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Doc: Added an overview page and updated the qdocconfVenugopal Shivashankar2015-06-244-6/+118
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41044 Change-Id: I074573e814de63e009744a11054365fb2f25bdb9 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Doc: Add documentation on how to test with Autobahn|TestsuiteLiang Qi2015-06-033-2/+79
| |/ | | | | | | | | | | Change-Id: Ia18acdc3c54e2bb48209406d2a6f9e156b67324c Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
| * QWebSocketServer: handle new connection after invalid oneLiang Qi2015-05-291-7/+9
| | | | | | | | | | | | | | | | | | | | Manually tested with sslechoserver and sslechoclient in examples, invalid connection from "telnet localhost 1234". Task-number: QTBUG-44866 Change-Id: I19c29c7c5f57eef4f9ae069e105fd1db346fb5c5 Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@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>
| * tests: enable cmake in auto testsLiang Qi2015-05-221-1/+1
| | | | | | | | | | Change-Id: Idbfbaa86675381110f35118baf16cac891976707 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Correct the default port of secure hand shake requestLiang Qi2015-05-221-1/+5
| | | | | | | | | | | | | | | | Task-number: QTBUG-46055 Change-Id: Iefdec32f778d39520802eabb25f4db37f80fdf76 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Luca Niccoli <lultimouomo@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Doc: Document the changes to the QML import statementSze Howe Koh2015-05-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | The changes happened in 759b6b12489b68fcbd755398ff9337acefb035a0 [ChangeLog][QML] The import statement has changed from "import Qt.WebSockets 1.0" to "import QtWebSockets 1.0". The old statement is still supported, but it cannot be mixed with the new statement within the same project. Change-Id: I95d75e4a87133c452d2ea43c42593415de882c9b Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix qmldir for qmlwebsockets_compatLiang Qi2015-05-2212-4/+202
| | | | | | | | | | | | | | | | | | 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>
| * tests: move all auto tests to websockets sub directoryLiang Qi2015-05-2220-14/+17
| | | | | | | | | | | | | | cmake is not included. Change-Id: I9ab6244d8b6b3752f26070b0b15ae70c0cab6d82 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix incorrectly encoded data tagSimon Hausmann2015-06-271-1/+1
| | | | | | | | | | | | | | | | | | Properly encode the provided sequence in UTF-8, so that the XML output of testlib is correctly encoded. Otherwise parsing the XML output in an automated manner breaks. Change-Id: Ibf0d5d6d067f4daeb7d2efd242d64b5f472d7b83 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Add missing check for socket connection in testFrederik Gladhorn2015-06-111-0/+1
| | | | | | | | | | | | | | | | | | In a5cb3b8ff10fcf1def8bde6f814582be1c19b83b I made the tst_openRequest less reliable because the socketConnectedSpy is no longer checked. Change-Id: Id721fa4aa203eeb85a5fce85a5270bc14cc37ab1 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Fix flaky test: QTRY_COMPARE instead of qWaitFrederik Gladhorn2015-06-101-15/+6
| | | | | | | | | | Change-Id: Iad643950d669addf90f68b2bf9be29c755f9c1d9 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Send and parse headers for the handshake requestLuca Niccoli2015-05-264-4/+34
| | | | | | | | | | | | Task-number: QTBUG-40842 Change-Id: I02787a0e55701966e564a312d51297f4160bd89a Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-05-117-8/+70
|\ \ | |/ | | | | | | | | | | Conflicts: src/websockets/qwebsocket_p.cpp Change-Id: Ia6434b282b4a0ee92e2b2a8664389f325bd0fcb0
| * Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1Liang Qi2015-04-153-0/+47
| |\ | | | | | | | | | Change-Id: I29f5a2acb7ba0313d9e2ac2c005a988d208b617e
| | * Fixed a crash when destroying the QWebSocketServerv5.4.25.4.2Kimmo Karvinen2015-04-083-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lifetime of incoming QTcpSocket/QSslSocket are managed by the QTcpServer/QSslServer and thus the QWebSocketPrivate should clear the pointer to the socket when the socket is destroyed. Added auto test for the crash. Task-number: QTBUG-45331 Change-Id: I6e30e7cdcca22aa810ccc1a1d4d7d77c7cb2c349 Reviewed-by: Steven Ceuppens <steven.ceuppens@icloud.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Fix copy constructorLuca Niccoli2015-04-091-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I2c27bda6523ff84d9ea9178f1e6728bf4defc511 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Do not decode the HTTP resource nameLuca Niccoli2015-04-092-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | The resource needs to be sent encoded in the HTTP request. Task-number: QTBUG-44889 Change-Id: I3c6c56f5fea1553f3b5751de7da0cfc76150f4b9 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Fix urls in client compliance testLuca Niccoli2015-04-091-2/+2
| | | | | | | | | | | | | | | Change-Id: I0dc9427934cc7523b524966d45820f96b6a4642d Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Always initialize m_handshakeStateLuca Niccoli2015-04-082-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The client-side constructor was leaving it uninitialized, which would sometimes lead to spurious error signals being emitted. Task-number: QTBUG-44893 Change-Id: I7a17f1a16d9a5fe4218beb6d92993c1889ad836b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Readme: Refer to code.qt.io, not gitoriousTobias Hunger2015-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | Gitorious was sold and will close down shop soon. Change-Id: Ic27da9a45a42f2dc7ba2badf3f3b10a6ec058e8d Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Add open(const QNetworkRequest &) and request()Luca Niccoli2015-04-085-19/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Request headers are not yet handled, only the QNetworkRequest::url() is taken into consideration. [ChangeLog][QWebSocket] Added open(const QNetworkRequest &) and request() Task-number: QTBUG-40842 Change-Id: Ia2e10f22c79b0a085afb9a2eb8437b7a73d4a045 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-03-1723-831/+162
|\ \ \ | |/ / | | | | | | Change-Id: I75fb372eec95215dab2f4807a842c2435ac7344e
| * | 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>
| * | Enable websocket tests on WindowsLuca Niccoli2015-03-131-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The listening socket must be opened on the loopback interface, otherwise the test client won't be able to connect. Also, name resolution can take a lot of time to fail, so we must wait longer when trying to connect to a non-existing host. Change-Id: I6d6744bc89e6e851cf49db5ae2c19aa652c0a8a4 Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Fix two gcc warningsv5.5.0-alpha1Allan Sandfeld Jensen2015-02-261-2/+2
| | | | | | | | | | | | | | | | | | Change-Id: I549eb67109eba2cfb766eec78377d63ecc34d3c8 Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com> Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| * | Corrected license files & licensing informationJani Heikkinen2015-02-254-795/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed LICENSE & LICENSE.GPLv2 files Added LGPL_EXCEPTION.txt file Added LGPLv3 licensing option in readme file Task-number: QTBUG-43611 Change-Id: I492e5f9546ccc99a3e020b433fc42f825b18a836 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
| * | Doc: Added introductory text about WebSocketVenugopal Shivashankar2015-02-252-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed an unnecessary \annotatedlist entry in the QML module page. Change-Id: I1af566d3cc784766b4df474e2471e0885ab5e471 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-255-9/+40
| |\ \ | | |/ | | | | | | Change-Id: I218b5069480f60b88390c8540f01c3dbbee485d0
| | * client ping should be maskedLiang Qi2015-02-241-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-42298 Change-Id: I4c01052823ce48b737d30ac2e0ef11836124bc4f Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Neil Williams Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
| | * Fix the build for WinRT/ARMLiang Qi2015-02-231-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-44491 Change-Id: Iec007ff83414d333d10609882b11ab4fd485345a Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
| | * 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-248-11/+75
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-208-11/+75
| | |\ \ | | | |/ | | | | | | | | Change-Id: I96657102802860c8490c162462324e661592d879
| | | * fix the port in Host field in handshake requestLiang Qi2015-02-202-2/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-39355 Change-Id: I06993193fe9618ace93552aed573a3eee5de18fa Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| | | * Fix keyword for OriginLiang Qi2015-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In RFC 6455(v13), the correct keyword is Origin. Task-number: QTBUG-44310 Change-Id: I009f079e01e213eb232b0dfc1a441305f3d9e588 Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| | | * 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: added qmake to dependenciesNico Vertriest2015-02-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib38445f8bf67e3bfe81f5d2d1a30f7b429f30ac5 Task-number: QTBUG-43810 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | | * Doc: add description and image for echoclient htmlLiang Qi2015-02-133-1/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: I7e2adaf19d15842f914be6f946f30d09b7b5532f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | | Bump versionOswald Buddenhagen2015-02-241-1/+1
|/ / / | | | | | | | | | Change-Id: Iba05221292a1be30f250f8f4b093a2d9b405013b
* | | Update copyright headersJani Heikkinen2015-02-1679-481/+473
|/ / | | | | | | | | | | | | | | | | | | 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 Gladhorn2015-02-133-22/+21
|\ \ | |/ | | | | Change-Id: Ie23422945b48b33a0608053c5f18700fd8133df5
| * Fix the translation in QWebSocketFrameLiang Qi2015-02-102-13/+16
| | | | | | | | | | | | Task-number: QTBUG-38740 Change-Id: If8df86990686af6811ad3bb21f93448ced946b6c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Use old-style SIGNAL and SLOT macros in tst_qwebsocket.cppDmitry Shachnev2015-01-261-9/+5
| | | | | | | | | | | | | | | | | | | | | | Without that, this test is failing on some architectures. Task-number: QTBUG-43804 Done-with: Helge Deller <deller@gmx.de> Change-Id: I7d275ca6d0baa70e504bbb4a31c65c2ed65d2118 Reviewed-by: Helge Deller <deller@gmx.de> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
View Lorry Controller Status