diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:44:07 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:44:07 +0200 |
commit | 2baa571e0d95d3e9bf182dc035c8ff0970bb68ea (patch) | |
tree | 174e872c084319e19cd0ebd74915048d99c18c84 /src/imports | |
parent | 40c0c43f59b97e5bee4a8994a499800e1f46b8d1 (diff) | |
parent | 00156d63eea2fb7681a8a00a3144392d6325e5cb (diff) | |
download | qtwebsockets-2baa571e0d95d3e9bf182dc035c8ff0970bb68ea.tar.gz |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I8a2d6875b68c99786f99ec0dc380f8725c6abd42
Diffstat (limited to 'src/imports')
-rw-r--r-- | src/imports/qmlwebsockets/qmlwebsockets_plugin.h | 8 | ||||
-rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocket.cpp | 7 | ||||
-rw-r--r-- | src/imports/qmlwebsockets/qqmlwebsocketserver.cpp | 2 |
3 files changed, 12 insertions, 5 deletions
diff --git a/src/imports/qmlwebsockets/qmlwebsockets_plugin.h b/src/imports/qmlwebsockets/qmlwebsockets_plugin.h index e49a315..318e0c7 100644 --- a/src/imports/qmlwebsockets/qmlwebsockets_plugin.h +++ b/src/imports/qmlwebsockets/qmlwebsockets_plugin.h @@ -42,6 +42,13 @@ #include <QQmlExtensionPlugin> +static void initResources() +{ +#ifdef QT_STATIC + Q_INIT_RESOURCE(qmake_QtWebSockets); +#endif +} + QT_BEGIN_NAMESPACE class QtWebSocketsDeclarativeModule : public QQmlExtensionPlugin @@ -50,6 +57,7 @@ class QtWebSocketsDeclarativeModule : public QQmlExtensionPlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") public: + QtWebSocketsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); } void registerTypes(const char *uri); }; diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp index 13b986e..9ff88d5 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp @@ -48,8 +48,7 @@ WebSockets is a web technology providing full-duplex communications channels over a single TCP connection. - The WebSocket protocol was standardized by the IETF as - \l {http://tools.ietf.org/html/rfc6455} {RFC 6455} in 2011. + The WebSocket protocol was standardized by the IETF as \l {RFC 6455} in 2011. */ /*! @@ -99,9 +98,9 @@ /*! \qmlsignal WebSocket::statusChanged(Status status) This signal is emitted when the status of the WebSocket changes. - the \l {WebSocket::status}{status} argument provides the current status. + the \l [QML]{WebSocket::status}{status} argument provides the current status. - \sa WebSocket::status + \sa {QtWebSockets::}{WebSocket::status} */ /*! diff --git a/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp b/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp index cee04d2..a0f7c78 100644 --- a/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp +++ b/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp @@ -96,7 +96,7 @@ QT_USE_NAMESPACE /*! \qmlsignal WebSocketServer::clientConnected(WebSocket webSocket) - This signal is emitted when a client connects to this server. + This signal is emitted when a client connects to this server. \a webSocket is the newly created \l [QML]{WebSocket}. */ QQmlWebSocketServer::QQmlWebSocketServer(QObject *parent) |