summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.13.2v5.13.25.13.25.13Antti Kokko2019-10-181-0/+20
| | | | | | | | | + 465c6c3914455e8ed20f938e5d4a35e6decb446c Add changes file for Qt 5.12.5 + 1deee2a4965fd7dc8a44c6d769519c4cbb11da4f Binary compatibility file against Qt5.13.0 for QtWebSockets + 24a9e0f961d84af037999771948d3d3d9c683a6c wasm: make sendBinaryMessage work in threaded mode Change-Id: I8a1c4a4cf79b9096c7cc735b936ca64e225faaff Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | Change-Id: I80b008b3cc1cf483656096bade145f05917defb5
* wasm: make sendBinaryMessage work in threaded modeMorten Johan Sørvig2019-09-131-4/+12
| | | | | | | | | | | | | | | | | | | | | This fixes two issues in sendBinaryMessage(), one observed, and one theoretical: 1) WebSocket send() does not accept data views backed by SharedArrayBuffer, which is the case for heap memory views when threading is enabled. 2) We have no way of observing for how long send() will retain the memory view passed to it. This means we don’t know when the QByteArray can be safely freed. Both can be solved by copying the payload data to a separate ArrayBuffer, whose lifetime can be managed by WebSocket. Fixes: QTBUG-78078 Change-Id: I73209080db66f38b971f2c8a727b43402357b1a9 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-091-0/+20
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| |\ |/ / | | | | Change-Id: Ibaec93eb5919dd6cc1f34e98ad20c57b9998bc23
| * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-081-0/+20
| |\
| | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | |\ | |/ / | | | | | | Change-Id: Ie2f07797983e53d0a998e1b0f76a8efd951408f7
| | * 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>
* | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
|\ \
| * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| |\ \ |/ / / | | | | | | Change-Id: Id47478b5f9ef4a342771d6e718fd5cd7272f5166
| * | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-07-301-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 69f3b6ed8b5036ff2dff9ea1ba232252c8f7d73a Bump version + 9db762ad97338567a614177564f68fee780fefce Add changes file for Qt 5.12.4 + 34c8622dbaafaa67c15a221a6c90390419c28063 Doc: Complete parameter description several methods + 44750221a97f0ad5da51ca51e2f14b701197c306 Bump version + dcf08a4c702f90cc092629078de48a0ad0d68562 Bump version + 9fcd04fc3ca878de0db92f1175bc3cb4ff1e6420 Doc: Replace example file lists with links to code.qt.io Change-Id: Ib6157dc6112e10ffea0e72b320a0402a250905d6 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Binary compatibility file against Qt5.13.0 for QtWebSocketsMilla Pohjanheimo2019-08-261-0/+5977
|/ / | | | | | | | | | | | | BC file added. Change-Id: Ibc33a9a55c8dc378938046cb3c45c1464864e348 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-111-0/+20
|\ \
| * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-111-0/+20
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3970191eef4be34b82487a6761999d79cccd0c20
| | * 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
* | | 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>
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: I8d070d15c9c87e68354fa2bd848b465dc86ad8cc
* | 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>
* | 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>
* | 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.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
* | 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>
* | 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>
* | 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>
* | 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
| * | 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>
* | | Set the protocol type so that PAC scripts handle ws/wss correctlyAndy Shaw2018-12-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | On macOS it will only allow proxies in a PAC script to use http/https protocols, so this enables them to work by automatically setting these as the type instead. Change-Id: I66589057d40d135229cbae4986ef0819287ea69a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | Remove unneeded CRLF ending from status lineAleksey Lysenko2018-12-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | No need to keep the CRLF ending of status line. Task-number: QTBUG-67424 Change-Id: I7f94c7bedf40412b338c56cfe59751f6a9e78f0a Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
View Lorry Controller Status