diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:02:50 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:02:50 +0200 |
commit | d387dd2066e79e4a39966331986c3775a0940e96 (patch) | |
tree | 829e5ee9b415bdc852bafe01955869b96397e45d /src/websockets | |
parent | 2baa571e0d95d3e9bf182dc035c8ff0970bb68ea (diff) | |
parent | cd80c041220df2875297622a0012933412730e9d (diff) | |
download | qtwebsockets-d387dd2066e79e4a39966331986c3775a0940e96.tar.gz |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ic4a2b48535dd9b22a950b84de4bfa2728a859902
Diffstat (limited to 'src/websockets')
-rw-r--r-- | src/websockets/doc/qtwebsockets.qdocconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/websockets/doc/qtwebsockets.qdocconf b/src/websockets/doc/qtwebsockets.qdocconf index 4504d30..ba77c82 100644 --- a/src/websockets/doc/qtwebsockets.qdocconf +++ b/src/websockets/doc/qtwebsockets.qdocconf @@ -4,7 +4,7 @@ project = QtWebSockets description = Qt WebSockets Reference Documentation version = $QT_VERSION -examplesinstallpath = qtwebsockets/websockets +examplesinstallpath = websockets qhp.projects = QtWebSockets |