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
d1994f08
Commit
d1994f08
authored
6 years ago
by
Qt Forward Merge Bot
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I297fa8021bd7520851d139c16b97671d41156919
parents
c36e520c
247373d6
No related merge requests found
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
qtwebsockets.pro
+1
-0
qtwebsockets.pro
src/imports/qmlwebsockets/dependencies.json
+2
-0
src/imports/qmlwebsockets/dependencies.json
src/imports/qmlwebsockets/plugins.qmltypes
+1
-1
src/imports/qmlwebsockets/plugins.qmltypes
src/imports/qmlwebsockets/qmlwebsockets.pro
+1
-1
src/imports/qmlwebsockets/qmlwebsockets.pro
src/websockets/qwebsocket_p.h
+7
-0
src/websockets/qwebsocket_p.h
src/websockets/qwebsocket_wasm_p.cpp
+87
-137
src/websockets/qwebsocket_wasm_p.cpp
with
99 additions
and
139 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