Skip to content
GitLab
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
b797778d
"README.md" did not exist on "aa7acf474f58c0c33666386493f867aead8a853e"
Commit
b797778d
authored
10 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I96657102802860c8490c162462324e661592d879
parents
a834ce58
85a8ea10
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
examples/websockets/doc/echoserver.qdoc
+8
-1
examples/websockets/doc/echoserver.qdoc
examples/websockets/doc/images/echoclient-html-example.png
+0
-0
examples/websockets/doc/images/echoclient-html-example.png
examples/websockets/echoclient/echoclient.cpp
+9
-4
examples/websockets/echoclient/echoclient.cpp
examples/websockets/echoclient/echoclient.h
+2
-1
examples/websockets/echoclient/echoclient.h
examples/websockets/echoclient/main.cpp
+14
-1
examples/websockets/echoclient/main.cpp
src/websockets/doc/qtwebsockets.qdocconf
+5
-1
src/websockets/doc/qtwebsockets.qdocconf
src/websockets/qwebsockethandshakerequest.cpp
+15
-3
src/websockets/qwebsockethandshakerequest.cpp
tests/auto/handshakerequest/tst_handshakerequest.cpp
+22
-0
tests/auto/handshakerequest/tst_handshakerequest.cpp
with
75 additions
and
11 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