summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* CMake: Regenerate projects after mergewip/cmakeAlexandru Croitor2020-03-2313-39/+18
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-2322-226/+6313
|\
| * Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-201-2/+2
| * Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-191-2/+2
| * 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
| | |\
| | | * Stabilize tst_QWebSocketServer::tst_handshakeTimeoutv5.15.0-beta2Mårten Nordheim2020-03-101-1/+6
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-171-2/+2
| |/ /
| * | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-03-101-2/+2
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-03-072-8/+6
| |\ \ | | |/
| | * Use Qt::SplitBehavior in preference to QString::SplitBehaviorEdward Welbourne2020-03-022-8/+6
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-294-10/+11
| |\ \ | | |/
| | * Revert "QWebSocket - do not use deprecated member-function"Allan Sandfeld Jensen2020-02-271-1/+1
| | * WebSocketServer: Add Q_(UN)LIKELYAndre Hartmann2020-02-261-6/+6
| | * Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-251-1/+1
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-251-2/+3
| | |\
| | | * Doc: fix missing closing commentAndre Hartmann2020-02-241-0/+1
| | | * Doc: fix links to autobahn testsuiteAndre Hartmann2020-02-241-2/+2
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-161-2/+2
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-161-2/+2
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-151-2/+2
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-141-2/+2
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-131-2/+2
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-110-0/+0
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
| | |\ \ | | | |/
| | | * Bump versionAlexandru Croitor2020-02-021-1/+1
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-041-2/+2
| * | | 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
| | |\ \ \ | | | |/ /
| | | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
| | | |\ \ | | | | |/
| | | | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | | | |\
| | | | | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-211-0/+20
| | | | |/
| * | | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-021-2/+2
| |/ / /
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-02-011-1/+1
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-311-2/+2
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-301-2/+2
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-301-1/+1
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-291-2/+2
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-291-2/+2
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-284-6/+6
| |\ \ \ | | |/ /
| | * | Change QMap to QMultiMapMårten Nordheim2020-01-234-6/+6
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-271-2/+2
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-211-2/+2
| * | | Update dependencies on 'dev' in qt/qtwebsocketsQt Submodule Update Bot2020-01-211-2/+2
| * | | 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
| | |\ \ \ | | | |/ /
| | | * | Stop forcing deprecated ssl protocol versionMårten Nordheim2020-01-172-2/+0
| | | * | QWebSocket - do not use deprecated member-functionTimur Pocheptsov2020-01-151-1/+1
| * | | | Use the new functions/signals introduced in QSslSocketLars Schmertmann2020-01-218-0/+122
| |/ / /
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-311-0/+6021
| |\ \ \ | | |/ /