summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-152-0/+59
|\ \ \ | |/ / | | | | | | Change-Id: I3cabad501b7ddfaa50b258c5e6822456aca822ef
| * | 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.12' into devQt Forward Merge Bot2018-12-040-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: I8fede16504f86533ec3f3842ecd7b7549624507f
| * | | | 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.12' into devQt Forward Merge Bot2018-11-170-0/+0
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I128f08249b5a20de2635134d51bc29698352cef6
| * | | 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
* | | tst_qwebsocketserver: force TLS 1.2 for the PSK testMårten Nordheim2018-11-051-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>
* | | Bump versionOswald Buddenhagen2018-10-111-1/+1
| | | | | | | | | | | | Change-Id: Icd6a3dd08c3cc0b142c946862bdfda5b54b9deaf
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-026-139/+99
|\ \ \ | |/ / | | | | | | Change-Id: I297fa8021bd7520851d139c16b97671d41156919
| * | 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>
* | | Use fully-qualified QQmlWebSocket::StatusAndré Klitzing2018-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Found by clazy Change-Id: I0d5acebcc1ced28fe4a2f659a1017a33d2e47f79 Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-09-223-0/+245
|\ \ \ | |/ / | | | | | | Change-Id: Ie28fec3c7ddd160b29529841db55a79ae7bc53df
| * | 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.12' into devQt Forward Merge Bot2018-09-151-0/+24
|\ \ \ | |/ / | | | | | | Change-Id: Id8bf8d50ae0cbef1af20b307f13feb33798c0001
| * | 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
View Lorry Controller Status