Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtWebSockets
Commits
a99beb2c
Commit
a99beb2c
authored
7 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I3ae5df71f201cfdb9a4c9e7d90a60d1f9792700a
parents
cd26439a
203da360
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
6.2
6.2.0
6.2.1
6.2.2
wip/cmake
wip/webassembly
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
No related merge requests found
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
src/websockets/doc/snippets/src_websockets_ssl_qwebsocket.cpp
+4
-4
...websockets/doc/snippets/src_websockets_ssl_qwebsocket.cpp
src/websockets/doc/src/external-resources.qdoc
+5
-5
src/websockets/doc/src/external-resources.qdoc
src/websockets/doc/src/index.qdoc
+4
-4
src/websockets/doc/src/index.qdoc
src/websockets/doc/src/overview.qdoc
+5
-5
src/websockets/doc/src/overview.qdoc
src/websockets/doc/src/qtwebsockets-module.qdoc
+4
-4
src/websockets/doc/src/qtwebsockets-module.qdoc
src/websockets/qwebsocket_p.cpp
+3
-0
src/websockets/qwebsocket_p.cpp
src/websockets/qwebsocketserver_p.cpp
+5
-0
src/websockets/qwebsocketserver_p.cpp
tests/auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
+24
-34
...auto/websockets/qwebsocketserver/tst_qwebsocketserver.cpp
with
54 additions
and
56 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets