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
258d019d
Commit
258d019d
authored
11 years ago
by
Frederik Gladhorn
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I7215c289188462383799269aa9b736ae76db4d25
parents
e66955ac
29d9f1d8
Changes
47
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
examples/examples.pro
+1
-10
examples/examples.pro
examples/websockets/doc/echoclient.qdoc
+0
-0
examples/websockets/doc/echoclient.qdoc
examples/websockets/doc/echoserver.qdoc
+0
-0
examples/websockets/doc/echoserver.qdoc
examples/websockets/doc/examples.qdoc
+2
-11
examples/websockets/doc/examples.qdoc
examples/websockets/doc/qmlwebsocketclient.qdoc
+0
-0
examples/websockets/doc/qmlwebsocketclient.qdoc
examples/websockets/doc/simplechat.qdoc
+0
-0
examples/websockets/doc/simplechat.qdoc
examples/websockets/doc/sslechoclient.qdoc
+0
-0
examples/websockets/doc/sslechoclient.qdoc
examples/websockets/doc/sslechoserver.qdoc
+0
-0
examples/websockets/doc/sslechoserver.qdoc
examples/websockets/echoclient/echoclient.cpp
+0
-0
examples/websockets/echoclient/echoclient.cpp
examples/websockets/echoclient/echoclient.h
+0
-0
examples/websockets/echoclient/echoclient.h
examples/websockets/echoclient/echoclient.pro
+0
-0
examples/websockets/echoclient/echoclient.pro
examples/websockets/echoclient/main.cpp
+0
-0
examples/websockets/echoclient/main.cpp
examples/websockets/echoserver/echoclient.html
+0
-0
examples/websockets/echoserver/echoclient.html
examples/websockets/echoserver/echoserver.cpp
+0
-0
examples/websockets/echoserver/echoserver.cpp
examples/websockets/echoserver/echoserver.h
+0
-0
examples/websockets/echoserver/echoserver.h
examples/websockets/echoserver/echoserver.pro
+0
-0
examples/websockets/echoserver/echoserver.pro
examples/websockets/echoserver/main.cpp
+0
-0
examples/websockets/echoserver/main.cpp
examples/websockets/qmlwebsocketclient/data.qrc
+0
-0
examples/websockets/qmlwebsocketclient/data.qrc
examples/websockets/qmlwebsocketclient/main.cpp
+0
-0
examples/websockets/qmlwebsocketclient/main.cpp
examples/websockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
+0
-0
...ockets/qmlwebsocketclient/qml/qmlwebsocketclient/main.qml
with
3 additions
and
21 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