diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-09-26 12:06:10 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-09-28 19:52:58 +0200 |
| commit | f6175568bb32b87a3d6cd55382fa1c8e1a1de2b4 (patch) | |
| tree | 0c5bc96f39f7c7cbef8e9e7faa314b118f519904 /src/imports | |
| parent | 4301d626f8e6e2dabf3a71205eb632f001827a7f (diff) | |
| download | qtwebsockets-f6175568bb32b87a3d6cd55382fa1c8e1a1de2b4.tar.gz | |
Improve the integration of QtWebsockets into general Qt docsv5.4.0-beta1
1.) The websocket qml types page is now hooked into Qt's QML Type by Module
page.
2.) Correct incorrectly documented import statement for Qt.WebSockets
module in QML.
3.) Add missing \since tags (see QTBUG-36775).
Change-Id: I1321db70215fcd16cfbd77dd71a459244241d8a3
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocket.cpp | 1 | ||||
| -rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocketserver.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp index edd48c4..08d39f6 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp @@ -34,6 +34,7 @@ /*! \qmltype WebSocket \instantiates QQmlWebSocket + \since 5.3 \inqmlmodule Qt.WebSockets \ingroup websockets-qml diff --git a/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp b/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp index e5b2b0f..6425fe2 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp @@ -39,6 +39,7 @@ QT_USE_NAMESPACE /*! \qmltype WebSocketServer \instantiates QQmlWebSocketServer + \since 5.3 \inqmlmodule Qt.WebSockets \ingroup websockets-qml |