summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-231-0/+20
| | | | | | | + dcf08a4c702f90cc092629078de48a0ad0d68562 Bump version Change-Id: Ia81f727e8ee826590cd33fbb3ad2086e6e7ca2da Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | Change-Id: I9b5b43a7646d121ceacbd7006841f8bc4cb9f5ca
* Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
|\
| * 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
* 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>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: I8ff0f5b9ac8250885cd1bb61a293922ddb362f41
* 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.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>
* | | Bump versionKari Oikarinen2019-01-141-1/+1
| |/ |/| | | | | Change-Id: I9302caa26ac5e6d36e54518be0b7c08382e39899
* | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: I11f9366390daf44b79ce8d812a2fb1146b219dc9
* | wasm: set and update socket stateLorn Potter2019-01-042-1/+5
| | | | | | | | | | | | | | Fixes: QTBUG-72664 Change-Id: I8bd90f8676835d8f7bec135ad3e6c6b3e9cd9d9a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
|\ \ | |/ |/| | | Change-Id: I4cc9f4060fc3a53a5c5c9f69b125d4f6934c5cf7
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| |\ | | | | | | | | | Change-Id: I377ab8f61334725c83d6cb7c1864c76783b937d8
| | * Add changes file for Qt 5.11.3v5.11.35.11.3Antti Kokko2018-11-191-0/+20
| | | | | | | | | | | | | | | | | | | | | + bac5a37663249edb9a9746687a7128c013af0309 Bump version Change-Id: I40deedc5fe639c54017861bae3486539bcc9f347 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+39
|\ \ \ | | | | | | | | | | | | Change-Id: I920794250097af8eaccce302baa8891d9e02120d
| * | | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.05.12.0Antti Kokko2018-11-071-0/+39
| | | | | | | | | | | | | | | | | | | | Change-Id: I10d98d83feda0373b45c7c0911de0c2ec6ff80d4 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-241-0/+5
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I8cd45ab778b95b7d444b06940fd7b4ddc83a599b
| * | | tst_qwebsocketserver: force TLS 1.2 for the PSK testMårten Nordheim2018-11-231-0/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | When using TLS 1.3 the psk callback is called on the start of a connection. Force TLS 1.2 to avoid this. Task-number: QTBUG-71560 Change-Id: I97df3a9d2f100d10b4a1d2e8d0e4696688ec66ac Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> (cherry picked from commit 7022a1f7e8f703815022bc7d0956da54f9f7a3c1)
* | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
|\ \ \ | |/ / | | / | |/ |/| | | | | Conflicts: .qmake.conf Change-Id: I257bd86335c6c9cf183001a924cd3e43183eff87
| * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | Change-Id: I35491428fa5d53c4fd49fb66f064b75f12224810
* | wasm: refactor and convert from EM_ASMv5.12.0-beta4v5.12.0-beta3v5.12.0-beta2v5.12.0-beta1Lorn Potter2018-10-012-137/+94
| | | | | | | | | | | | | | | | | | | | This also has the benefit that binary data is no longer accessed via a global. Change-Id: I2db744696fe88ca03f55897016d9d38e302f820b Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Update plugins.qmltypesKai Koehne2018-09-273-2/+4
| | | | | | | | | | | | | | | | | | | | | | Add an empty dependencies.json to avoid the implicit QtQuick dependency. Task-number: QTBUG-70264 Change-Id: I67b0f8cee04d3cd255c9df3c9bc7caf79ffdf9a9 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Require Qt Network for Qt Web SocketsEskil Abrahamsen Blomfeldt2018-09-261-0/+1
| | | | | | | | | | Change-Id: I56b84616d1f1e1af8aa884393a10cd72b0ceafae Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
* | Add support for WebSockets on Qt for WASMLorn Potter2018-09-203-0/+245
| | | | | | | | | | | | | | | | | | Implement the QWebSocket API using HTML WebSocket. Change-Id: I2284f8606d512943d2abc2a96fc48effcc45a786 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|\ \ | |/ | | | | Change-Id: I9f000ddcdf71376dc40245875e97708c72e3387c
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: I12836aa3a50f3fdfabe4bf7ef163905d993fff12
| | * 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>
* | Fix implicit conversion warningJesus Fernandez2018-08-203-3/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | Marks the old functions as deprecated and adds new safe versions.The new functions give access to the native descriptor safely. It also fixes the original functions in Qt 6. warning: implicit conversion loses integer precision: 'qintptr' (aka 'long long') to 'int' Change-Id: I59177905af0181912d2e7824ce68265cb8ee03d9 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>
* | Remove redundant options and a stray defineJesus Fernandez2018-08-1720-31/+20
| | | | | | | | | | Change-Id: Ic7ce11f1631197e6ee019b66c0d7ec56590c5ab5 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Refactor manual testJesus Fernandez2018-08-161-89/+47
| | | | | | | | | | | | | | | | | | | | Rewrite a manual test to be data-driven, rather than clumsily recursive. Modernise and tidy the code in the process. Change-Id: I11919adf1bceaec831b8573bd1194fb2ab15297d Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Use nullptr instead of 0Jesus Fernandez2018-08-141-1/+1
| | | | | | | | | | | | Change-Id: Ia3610779a2006d9027a1c4427a968e13cfc28cbe Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Remove unnecesary default labelJesus Fernandez2018-08-141-2/+0
| | | | | | | | | | | | Change-Id: I994b34614b2e2ee95fed145e7f5dcd873ff7c3f4 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Fix conversion warningsJesus Fernandez2018-08-143-10/+14
| | | | | | | | | | | | Change-Id: I087b72412db19f34b8e890ddc6a3a0fcdd434141 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Use QObjectPrivate::q_ptr instead of shadowing itJesus Fernandez2018-08-146-37/+25
| | | | | | | | | | | | | | | | | | | | Some private classes had a q_ptr pointer shadowing the QObjectPrivate::q_ptr pointer. Q_Q casts the QObjectPrivate::q_ptr pointer to match the public class so there is no need to store a different pointer. Change-Id: I8f5c4323b1dcf45a9796c0dd9f522bdbc63add18 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Use nullptr instead of 0Jesus Fernandez2018-08-103-3/+3
| | | | | | | | | | | | Change-Id: Ibad1bbb351d14ab0de140875d2969b7da483eb21 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Use override keywordJesus Fernandez2018-08-1013-20/+20
| | | | | | | | | | Change-Id: I120dcb26eb451930d02e452cc47262eda44cc77c Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Fix C-style castJesus Fernandez2018-08-101-3/+3
| | | | | | | | | | | | Change-Id: I9e2b2ff177aa921f7f86319de4a229c1a8a4c410 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-08-073-4/+40
|\ \ | |/ | | | | Change-Id: Iffe66da51d3b7b38d04ca3c185b3b003b157f886
| * 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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6f3af93c4159b2e3160af8e8ad8bab628c1d7124
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: Ifc515ce21e3f009a69ae3f576ced2657ac8b7f29
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-031-1/+2
|\ \ | |/ | | | | Change-Id: Ieb9c874a99c519c7871dda3c437e6f3a66ba440c
| * 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>
View Lorry Controller Status