summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake: Regenerate projects after mergewip/cmakeAlexandru Croitor2020-03-2313-39/+18
| | | | | | Change-Id: I3cdf755e3aae933016b9719ce4c61f53e554ea48 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-2322-226/+6313
|\ | | | | | | | | | | | | Conflicts: dependencies.yaml Change-Id: I1608720522e974c7107f00599a9fb70f17865189
| * Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-201-2/+2
| | | | | | | | | | Change-Id: I62f1a9ffdf5a54e1a89291714bfd7ca7cc0a86db Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-191-2/+2
| | | | | | | | | | Change-Id: Ic8e16f462502d87f12a527977ea278c042e89658 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-03-181-1/+6
| |\
| | * Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-181-1/+6
| | |\ | | | | | | | | | | | | Change-Id: I2214c13d1dab22dece20b536454833672faa6296
| | | * Stabilize tst_QWebSocketServer::tst_handshakeTimeoutv5.15.0-beta2Mårten Nordheim2020-03-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was a bit flaky which seems to have been due to the short timeout. Increase the timeout a considerable amount, it doesn't matter much to the runtime anyway: the test still takes around 5 seconds to finish. Fixes: QTBUG-82559 Change-Id: Ie14ea204de1cc7ac2951144099d5be88adebef04 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-171-2/+2
| |/ / | | | | | | | | | | | | Change-Id: I1c3b51d459c8832919cc0bee42c4f453391c0a1d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-101-2/+2
| | | | | | | | | | | | | | | Change-Id: I04b1a767b9a9cdf4d21ec5ecce4318fffca580c4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-072-8/+6
| |\ \ | | |/ | | | | | | Change-Id: Ib31d3b50e4498cdfc55b68ebc5993750b5ee7ce1
| | * Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-022-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: If65be10a7c86e7b4173fd31f1d277c63c6accb0a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-294-10/+11
| |\ \ | | |/ | | | | | | Change-Id: Ib6762714c19354c7adbf0c032d2f9995f576114f
| | * Revert "QWebSocket - do not use deprecated member-function"Allan Sandfeld Jensen2020-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 938ad6373415fa8b0767a987c37ce51ec546859f. Reason for revert: Was undeprecated and replacement removed Change-Id: I79d6e931d72ec518a43fe058e1067b3754f6cf05 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * WebSocketServer: Add Q_(UN)LIKELYAndre Hartmann2020-02-261-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | ... to optimize code that is used for error handling. Change-Id: I62fe11d34d32c6784e960505fccbf529a3265d23 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-251-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-82253 Change-Id: I90199c05f683df18dffe796227fc8e4c0ef9f72d Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-251-2/+3
| | |\ | | | | | | | | | | | | Change-Id: I69ac9d8a828ba664e38b1f5abdfd0830f55c134e
| | | * Doc: fix missing closing commentAndre Hartmann2020-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I2e1f4893b1b4c1270630101c390b937611e5d5e2 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | | * Doc: fix links to autobahn testsuiteAndre Hartmann2020-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-69425 Change-Id: I28e03da927c7a9b1cbfb91a0aca32866c2e653ea Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-161-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib5b668a6ad69becabfe95d1eb3930bf374fe6e92 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-161-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I8d01958d4a8cc2eda41a1c3889f0f335ec23000b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-151-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I4722735ca7ce6d9322be4d1ce509da2e664cc883 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-141-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: If11715112a2365b7986d6c219658fbd488abffb3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-131-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I831464ed4d37a66f61cf967218ba8947299dc64c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-110-0/+0
| |\ \ \ | | |/ / | | | | | | | | Change-Id: If380706605e79377abefd2e781c75507574503c9
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2bae5688cc62bffed1cfccc45e7129cf00a769f8
| | | * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ibcb0063877543a2cb09ded212e0940fb45280c71
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-041-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I932dc9104073c9eb594958c4c3eea7fe2b8ec3dd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-02-041-0/+20
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-041-0/+20
| | |\ \ \ | | | |/ / | | | | | | | | | | Change-Id: I65137dddfee833672092ac1550e612a156a33ae6
| | | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
| | | |\ \ | | | | |/ | | | | | | | | | | Change-Id: Iff98ea3277da7e35af6567680d0b84755e30e1af
| | | | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: I84594b23a2703886e96e73758c26f4cecc1370d0
| | | | | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-211-0/+20
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 3aab83b37baf03daa2aa97a708831d1f7dce8de0 Remove extra deleteLater (already done in onSocketDisconnected) + 59ad9ecf70fef2032dea01330d276c1fac20b724 Add binary compatibility file for qtwebsockets 5.14 branch + 737a86f30a78add874b4bff310d4f84f49cc9b50 Bump version Change-Id: I8d784ef67017de93eab7967dac304d14bf1fada3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-021-2/+2
| |/ / / | | | | | | | | | | | | | | | | Change-Id: Ib93d340d0489da78b9d58bca3f86bfdf86de2fdd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: If0a1a28070b158e5a52c114007ff4746f4339382 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-311-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: If320a0b4709ee1a87612469280d7dc393ff77d9d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-301-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I95b32cffa79a1b667d8665ab39ac16f4263be760 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia98db6dc41f095b3c45f23f9a49e4b6ee89df5c4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-291-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I9eb0887f8a5dd69a8bcb4d128edba10da426bb4f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-291-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Icb863cd7f0da888811d38be944c06d186f56d1cf Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-284-6/+6
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I7434fcdb376d1227fff3ebe28f614736e7efb395
| | * | Change QMap to QMultiMapMårten Nordheim2020-01-234-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Because insertMulti is deprecated Change-Id: I3965ea7159b2516b35c45072115eba1ab621b89a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-271-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I445fbf06d9354c90e6949e26b0b7c3ab73c94a96 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia9563fa9bf6845928589dd58433b99560c51e609 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-211-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I7b2d1eab57c1241cb99714a276e6f3de3400dfb0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-01-213-3/+1
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-213-3/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | Change-Id: I5e23a3547605ef561af0f749e49cc99fffe7437f
| | | * | Stop forcing deprecated ssl protocol versionMårten Nordheim2020-01-172-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I422a2498bb940f801484d3f2e6e5d59edd637514 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| | | * | QWebSocket - do not use deprecated member-functionTimur Pocheptsov2020-01-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 'socketError' instead. Task-number: QTBUG-80369 Change-Id: I30527721677be0fc0f71ca33b08f608472bc8b71 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * | | | Use the new functions/signals introduced in QSslSocketLars Schmertmann2020-01-218-0/+122
| |/ / / | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-68419 Change-Id: Icdc41079cb946d4316cc0ec2ae40522e6de52725 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-311-0/+6021
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Iadc78fcc7fa79f17c9ae0acf0ce74291491766b4
View Lorry Controller Status