summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.11.2v5.11.25.11.2Antti Kokko2018-08-291-0/+24
| | | | | Change-Id: I3140de423145455cd3afb69872389db15136b14b Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch>
* Limit Close frame to 125 bytesMårten Nordheim2018-08-063-4/+40
| | | | | | | | | | | All control frames should be limited to 125 frames. https://tools.ietf.org/html/rfc6455#section-5.5 Task-number: QTBUG-62949 Change-Id: Id9b5a431faab6ff6edf7dc2e5c3525e999bc04ea Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | Change-Id: Ifc515ce21e3f009a69ae3f576ced2657ac8b7f29
* Migrate tst_handshakeresponse to QRegularExpressionSamuel Gaist2018-06-301-1/+2
| | | | | | | | | This patch updates the tst_handshakeresponse test to use QRegularExpression in place of QRegExp which is to be considered deprecated. Change-Id: I98febd0565351b644dd68b98d356764bee78d7c5 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
|\ | | | | | | Change-Id: I09c1d0718bcd175fe3f3c8a20c1f4ee5b3ee3990
| * Add changes file for Qt 5.11.1v5.11.15.11.1Antti Kokko2018-06-091-0/+24
|/ | | | | Change-Id: I8d6ca45f156b6f2cd7eecee24d198476fe502c73 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* Add binary compatibility file for 5.11 for QtWebSocketsMilla Pohjanheimo2018-06-051-0/+5472
| | | | | | | File for bic test added. Change-Id: I6b1a221f1bc2465f0bd1c323a534ecf22869a7da Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add changes file for Qt 5.9.6Antti Kokko2018-06-041-0/+24
| | | | | | | Change-Id: Idf0ed692cb1a98b25778df9385a6c86484f9245f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 3dc383a8078d7478a230ca7acac922b373bb9930) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Add changes file for Qt 5.9.5Antti Kokko2018-06-041-0/+24
| | | | | | | | Change-Id: I90fb395128f64338732547e7d57ce0961099f47e Reviewed-by: André Hartmann <aha_1980@gmx.de> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 6b10c6283eefde9a8122bf3ae6f0a675b4606bb7) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | Change-Id: Ibbb48f2268cdcaeb05c5c1d2d42bf2e3a3943b57
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
|\ | | | | | | Change-Id: I0dec736dc8634293348b561b6355e252d5e6b073
| * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Antti Kokko2018-04-251-0/+22
|/ | | | | Change-Id: I5ef6f49d5e220b4ad50590a553d9a5cd891aecc0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* QWebSocket: fix bytesWritten being emitted twiceMårten Nordheim2018-04-181-2/+0
| | | | | | | | Because it was connect-ed twice. Task-number: QTBUG-67778 Change-Id: Ia19d2471c148c615faceb7548566d819683c2193 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Doc: Add license section to overviewv5.11.0-beta4Kai Koehne2018-04-051-0/+9
| | | | | | Change-Id: I580d2170f76a501dd95c8377d3f480b65a983d53 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Remove incorrect license information from README.mdKai Koehne2018-04-051-3/+0
| | | | | | | | | | | No other Qt module has a README.md, therefore anything put here has a high risk of going stale. Rather use the official documentation for license information. Task-number: QTBUG-64135 Change-Id: I0b233ee9f648f514cedf3ea0b152518fff915d16 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Make QWebSocketServer work with Safariv5.11.0-beta3Morten Johan Sørvig2018-03-222-3/+4
| | | | | | | | | | | | | | | | | | | Sending an empty “Server” header during handshake will make Safari error out with “WebSocket connection [...] failed: Invalid UTF-8 sequence in header value” This is an open bug in WebKit: https://bugs.webkit.org/show_bug.cgi?id=139298 As far as I see, “Server” is not a required handshake header as specified in RFC 6455 section 4.2.2 (5), and we can omit it if the server name is not set. Change-Id: Icec142f867813c16e3e3baa1378582164242e049 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I249953f4865302c9fb8d3d9ae4aabb7e60c31a60
| * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | Change-Id: I4e7cb42c4188528fcf57af4971a018f7e0d7347a
* | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
|\ \ | | | | | | | | | Change-Id: I5fcffa595a653f2cdb22cf45c96f31f958808633
| * | Add changes file for Qt 5.10.1v5.10.15.10.1Antti Kokko2018-02-061-0/+26
| | | | | | | | | | | | | | | Change-Id: I721b5481e2b4d8fb5c7bf84e2cfafd30b52a963e Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-204-1/+5524
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic66a4cabbe0a2af1fa59ae33026a236437434a85
| * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-182-1/+26
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4a88ddf6722f4b29512fbec71f3d055591e625ba
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\ | | | | | | | | | | | | Change-Id: I394635e8722f98fb57b305e26264047feafc3b4f
| | | * Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-081-0/+25
| | |/ | | | | | | | | | | | | | | | Change-Id: Ic6f8ac83bd779f4ba0576c9f849f9d7afa77a412 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | | | | | Change-Id: Ide48dd1b6e21a6441473c7e408c7cf5513fd30db
| | * Fix apparently invalid auto-test (qmlwebsockets)Timur Pocheptsov2017-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | It makes sense to first start listening (server.listen = true) and then connect (socket.active = true). Task-number: QTBUG-59388 Change-Id: I4235dad87ee3a62ebf75cec39e5d9fa4b7ed7552 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+26
| | |\ | | | | | | | | | | | | Change-Id: Iea2ec6f528dfcbbedabfc6cac01293ace2d26835
| * | | Add binary compatibility file for QtWebSockets for 5.10Milla Pohjanheimo2018-01-091-0/+5472
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | File to test binary compatibility for 5.10 added Change-Id: Iade26098325ba00e45cc055c9ebf8ff8fe2cd67b Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | | | | | Change-Id: I4e8cb48a3626209222ddada7a7560150f6382074
| * | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+26
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: I1b001ff2a374ec53a9247adc2d91db12ef2a8923
| | * \ \ Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0Liang Qi2017-11-211-0/+26
| | |\ \ \ | |/ / / / | | | | _ | | | | Change-Id: I3ac04c00c6da760a0125970c55866055709a3371
| | * | Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-081-0/+26
| | |/ | | | | | | | | | | | | Change-Id: I84dc0e201d92f1ad86565155e25f28a9ef5c5a9b Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | Make HTTP header parsing RFC-compliantRobert Griebl2017-11-283-13/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All this home-grown parsing should be replaced with code from the qhttp* classes. This would result in a big refactoring though, so this commit at least tries to make the header parsing RFC compliant and not choke on perfectly legal "Header:Value" messages. Change-Id: I14303610dc7187b8d8595568fb221c18e4e0d515 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2012-61/+82
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: src/websockets/qwebsocket_p.cpp tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp Change-Id: I40922fab198a09a3fbba1b2f11b42f2d40e53720
| * | Add changes file for Qt 5.10.0Antti Kokko2017-11-141-0/+22
| | | | | | | | | | | | | | | Change-Id: Ie9ff1794bd623c46ae895d75a6016cd56dec9576 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
| * | Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-033-6/+6
| | | | | | | | | | | | | | | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-308-56/+54
| |\ \ | | |/ | | | | | | Change-Id: I3ae5df71f201cfdb9a4c9e7d90a60d1f9792700a
| | * Fix empty sslConfiguration in sslErrors slotAndré Klitzing2017-10-272-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If QWebSocket fires signal sslErrors the QSslConfiguration of QWebSocket is not updated. So client application cannot check it in implemented slot. Fix this by calling the update method like for encrypted signal. Sibling of QTBUG-40401. Change-Id: I18b39f6b6a0791ae67fc2bff5cf2c04a22b0ab85 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * Check count of spy to verify signalAndré Klitzing2017-10-271-31/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Looks like QVERIFY(spy.wait()) is a little bit flaky. We should check the count of the spy if it was successful instead of the return value of wait since wait will return false even if the signal was delivered before the call to wait(). Change-Id: I5f9031685dfa69b00155fa22602bab998843cb68 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * Fix handshakeReceived not being invoked in some situationMårten Nordheim2017-10-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the rare case where the handshake was received before the signal and slot was connected it would never invoke handshakeReceived and the server would keep waiting. Task-number: QTBUG-64026 Change-Id: I86d54031d2583b6a0cf2b5348889b5ef859b9aab Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | * Fix outdated FDL license headerKai Koehne2017-10-235-22/+22
| | | | | | | | | | | | | | | Change-Id: Ic41f3745e800ba54153b36f269017075297c2402 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Replace typedefs by QOverloadAndré Klitzing2017-10-304-14/+10
| | | | | | | | | | | | | | | | | | Change-Id: I509332fa23bcf2cf2e6c10b7edacb4157f025ff9 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | Use QStringLiteral to fix clazy-qstring-allocationsAndré Klitzing2017-10-301-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I59bcb929a37096e7c5a14d4003f26267bd0d752a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | test: fix tst_QWebSocket::tst_moveToThread()Liang Qi2017-10-261-2/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63707 Change-Id: Iaba78256f790bc422790a03fccb841e6e6482fc1 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-1110-37/+97
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: examples/websockets/simplechat/chatserver.cpp Change-Id: I98697cef4c05516b5b4122ad81c084546d57115f
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2Liang Qi2017-10-114-11/+54
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4af142703e469b56236b73335a93f6960534c0f1
| | * Replace iterator based loop by range-for-loopAndré Klitzing2017-10-101-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | Found by clazy and fixes "clazy-strict-iterators" warning. Change-Id: I8f50c92ac054d627499440d593faa43ed5b4ad4b Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | | | | | Change-Id: Ic2a08fd6c43078bf571e37234a52234827537394
| | * Add changes file for Qt 5.9.2v5.9.25.9.2Liang Qi2017-09-281-0/+18
| | | | | | | | | | | | | | | Change-Id: Ic2c1569e84296a4cc2c64e5861fac0a7e4176887 Reviewed-by: Liang Qi <liang.qi@qt.io>
| | * Change assert to null-checkMårten Nordheim2017-09-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Avoids a crash that would happen if readyRead was emitted after calling ::close on the websocket. Task-number: QTBUG-59179 Change-Id: I1e7bd19d99ee068b8699014fac9a72f839632c85 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
View Lorry Controller Status