summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | | | |\ | | | |/ / | | | | | | | | | | Change-Id: Ib3b749527e242cbfc2611467c6ecd39cef865662
| | | | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1deff924d0a900e1897b1d3ebce0268934d06648 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | |/ | | | | | | | | | | | | Change-Id: I313933cbbcad77f26a0246942f161e9fe209c9cc
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: I4f5a70c7439b27db2b02907e460b5804d5c6e104 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-110-0/+0
| |\ \ \ |/ / / / | | _ / | | / | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1c65346e0625bb1653fa02ed87fd7999608f5482
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: I8d070d15c9c87e68354fa2bd848b465dc86ad8cc
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-292-3/+23
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-292-3/+23
| |\ \ \ |/ / / / | | _ / | | / Change-Id: I2a1987a687fafb73b3b8368db93bcca7a91bb5d0
| * | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| | |\ \ | |/ / / | | | | | | | | Change-Id: Ia2981c012a8c44e0c0fbf68fadbba0f8ae3cc141
| | * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.05.13.0Antti Kokko2019-05-031-0/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibb29ce573f4757b7a44e15467345cbefc6ef3f90 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
| * | | Doc: Complete parameter description several methodsNico Vertriest2019-06-181-3/+5
| |/ / | | | | | | | | | | | | Change-Id: Ib9f98683faf2b3a4041371c80a31de1f0902261d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Investigate tst_handshakeTimeout test flakinessMårten Nordheim2019-06-271-11/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove "localhost" in favor of "127.0.0.1" to avoid any name resolution. And wait 5 seconds for all websockets to timeout together, while printing how many have not timed-out in case of failure. Credits to Mårten Nordheim for coding this. With this patch, I can not reproduce the flakiness any longer. Lets see if this is also the case in our CI. Fixes: QTBUG-76572 Change-Id: Ibdbafbd7786c87138bdc84ebc690177211f23f5b 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>
* | | Fix deprecation warnings in QWebSocketHandshakeResponse::getHandshakeResponse()Friedemann Kleint2019-05-271-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings: websockethandshakeresponse.cpp:151:46: warning: ‘QSet<T> QList<T>::toSet() const [with T = QString]’ is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations] qwebsockethandshakeresponse.cpp:151:84: warning: ‘QSet<T> QList<T>::toSet() const [with T = QString]’ is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations] qwebsockethandshakeresponse.cpp:151:94: warning: ‘QList<T> QSet<T>::toList() const [with T = QString]’ is deprecated: Use values() instead. [-Wdeprecated-declarations] qwebsockethandshakeresponse.cpp:155:47: warning: ‘QSet<T> QList<T>::toSet() const [with T = QString]’ is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations] qwebsockethandshakeresponse.cpp:155:86: warning: ‘QSet<T> QList<T>::toSet() const [with T = QString]’ is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations] qwebsockethandshakeresponse.cpp:155:96: warning: ‘QList<T> QSet<T>::toList() const [with T = QString]’ is deprecated: Use values() instead. [-Wdeprecated-declarations] qwebsockethandshakeresponse.cpp:157:46: warning: ‘QSet<T> QList<T>::toSet() const [with T = QWebSocketProtocol::Version]’ is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations] qwebsockethandshakeresponse.cpp:157:82: warning: ‘QSet<T> QList<T>::toSet() const [with T = QWebSocketProtocol::Version]’ is deprecated: Use QSet<T>(list.begin(), list.end()) instead. [-Wdeprecated-declarations] qwebsockethandshakeresponse.cpp:157:92: warning: ‘QList<T> QSet<T>::toList() const [with T = QWebSocketProtocol::Version]’ is deprecated: Use values() instead. [-Wdeprecated-declarations] by replacing them with a helper function to created a list intersection. Change-Id: Iee37632517760133ceebae4eda394170293f25c3 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Fix compilation error when configured without SSLDimitrios Apostolou2019-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTcpSocket definition is apparently indirectly included when compiling with SSL support enabled, but without it the compiler outputs error. Change-Id: I5f4d8978ef04442443e934ee28e949a49a9f5b18 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | tst_QWebSocketServer: Fix deprecation warnings about ↵Friedemann Kleint2019-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | QSslSocket::supportedCiphers() Replace by QSslConfiguration::supportedCiphers(). Change-Id: Ia5ce3e399272127304ea7e93ba32627df5864381 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | websocket server: add timeout to abort incomplete handshakesHeiko Voigt2019-04-297-19/+253
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A websocket connection can involve two types of handshakes. First an optional SSL handshake and second the websocket handshake itself. Either one can get stalled/stuck if the other side does not answer. To be robust by default and for easy mitigation by users of websockets let's introduce a handshake timeout. We introduce a default timeout of 10 seconds which can be customized by the newly introduced setHandshakeTimeout() method. One major location where connections got stuck was when the connection queue was filled with connections waiting for the SSL handshake. Only connections that have finished this handshake can be processed anyway so we now add them to the queue once they are fully ready to start the websocket handshake. Task-number: QTBUG-63312 Task-number: QTBUG-57026 Change-Id: Ia286221f1d8da1000e98973496280fde16ed811d Reviewed-by: Alf Crüger <a.crueger@baxi-innotech.de> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-231-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: I5e10d7cc767a3b534f09d5340efe033f5dc700a6
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta4Qt Forward Merge Bot2019-04-201-0/+20
| |\ \ | | |/ | | | | | | Change-Id: I119bd29e542d2536a0dfab51b8f04a175266d644
| | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I3094f6feb8e1e87a4c5d18fa57d2b2e92c788389
| | | * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-021-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + dd00a38e0d65a73d7fa4df4c2fd196252d40d5ff Bump version Change-Id: I823312826c31c43f33a6b1e4e5de110275ba7337 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-135-9/+12
|\ \ \ | |/ / | | | | | | Change-Id: I43320389826b0f0deac412bf37df9232f2e68a33
| * | Automatically register the latest import versionv5.13.0-beta3Kai Koehne2019-04-125-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follows what was done in d28c9f6a for Qt Quick Controls 2. The latest import version (e.g. 1.14 in Qt 5.14) will automatically be registered whenever the Qt version is bumped. This avoids needing to wait until a new type is added (or a new revision is added to an existing type) before being able to use the newest Qt Quick version. Change-Id: I3a2232d5f7418ec99441a71fb70d88835dc61a61 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-020-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: I83162a176f4ffbaee8107f7d4506ac9aa50342d6
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-03-270-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I1e21542211694b1f707e7a20a5a9595369aef6e5
| | * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: I8ff0f5b9ac8250885cd1bb61a293922ddb362f41
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-261-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: Ib031ab06b01cf84c77fc3200f74cb4fd5ee57178
| * | 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>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-192-1/+21
|\ \ \ | |/ / | | | | | | Change-Id: Ic2ff163b19d51fae2c9f2f53c5c046912ab2bc62
| * | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-181-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-73739 Change-Id: Ia7aad40aa100b168b9cf2aae511473ce88820a41 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
| |\ \ | | |/ | | | | | | Change-Id: I65d27b01ef17c7e479bef0bc55ff4bb25e0451d5
| | * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Ieab7b2a7ecca2c3d79424f1fabeca3cdb2277def
| | | * Add changes file for Qt 5.12.2v5.12.25.12.2Antti Kokko2019-02-211-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + 58dc09497d2fb580cf5e356bef91b0dc61ae81b7 Bump version Change-Id: I8cd4146b887e1d63501ce73cb9508d887d126d01 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-122-0/+8
|\ \ \ | |/ / | | | | | | Change-Id: I8c230768cbb0727da162e504cf18bcc05a43c3dd
| * | wasm: fix validity statev5.13.0-beta1Lorn Potter2019-03-112-0/+8
| | | | | | | | | | | | | | | | | | | | | Fixes:QTBUG-73689 Change-Id: I5993eb38a8fc45a06a8ced46f71034e4b87ec67b Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: I304450125d7cbfc184f5c07c3593582b7f3260fe
* | | Don't use internal members of QObjectLars Knoll2019-02-111-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | And compile again after those got changed in qtbase. Fixes: QTBUG-73728 Change-Id: Ibcd6af650ed1ceb4f9218a49e9a3c2ca466018bb Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-052-0/+5622
|\ \ \ | |/ / | | | | | | Change-Id: I4b7551269b390ee22b37720f170374913054981d
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-022-0/+5622
| |\ \ |/ / / | | _ | | Change-Id: Icdb66902e1f336023c5cad2bb59e61bac474ea3d
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-012-0/+5622
| |\ | | | | | | | | | Change-Id: I88194f5247b1b8adc79056a2c2cba19adb90ca8a
| | * Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-151-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + bac5a37663249edb9a9746687a7128c013af0309 Bump version + 395c1f1aed90f740f079d8f980c93f459b44733a Add changes file for Qt 5.11.3 + 5ee35abc39fe35ecf51faac01938ba7ca94e9fb8 tst_qwebsocketserver: force TLS 1.2 for the PSK test + 1ceac50cf3bf42b5e852a0fd94688601ab68013d Add binary comaptibility file for QtWebSockets for Qt 5.12 + 16bfc98a03186cef5aafa79709b086faa0d4f9f2 wasm: set and update socket state + e567b9d8c8447f8d2bd35ab3184b956e95380222 Bump version Change-Id: I241cae2ac1517f37de7f825db74b98594bf8904e Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-084-2/+26
| | |\ | | | | | | | | | | | | Change-Id: I7618d577bf71922ae6d41de1cdbc63116f6aa457
| | * | Add binary comaptibility file for QtWebSockets for Qt 5.12Milla Pohjanheimo2018-12-181-0/+5602
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Binary compatibility file added. Change-Id: I3a7c598cc47fb243325881c089857ec8955dd67c Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9e8b5acb29983285786fd10b5769d703e53078fd
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
| | |/ | |/| | | | | | | Change-Id: I9302caa26ac5e6d36e54518be0b7c08382e39899
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-100-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icc838b713efe15ffa38dc1fc0ad90c37e9fa7c6c
| * | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | | | | | Change-Id: I11f9366390daf44b79ce8d812a2fb1146b219dc9
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-052-1/+5
|\ \ \ | |/ / | | | | | | Change-Id: Ia08fda4945ea3fd0b7b13f6f65963c7b4fa31468
View Lorry Controller Status