5 files changed, 12 insertions, 7 deletions
diff --git a/src/imports/qmlwebsockets/plugins.qmltypes b/src/imports/qmlwebsockets/plugins.qmltypes
index 2fb57cd..79e2f97 100644
--- a/src/imports/qmlwebsockets/plugins.qmltypes
+++ b/src/imports/qmlwebsockets/plugins.qmltypes
@@ -4,7 +4,7 @@ import QtQuick.tooling 1.2
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebSockets 1.1'
+// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebSockets 1.13'
 
 Module {
     dependencies: []
@@ -38,7 +38,7 @@ Module {
         }
         Signal {
             name: "statusChanged"
-            Parameter { name: "status"; type: "Status" }
+            Parameter { name: "status"; type: "QQmlWebSocket::Status" }
         }
         Signal {
             name: "activeChanged"
diff --git a/src/imports/qmlwebsockets/qmlwebsockets.pro b/src/imports/qmlwebsockets/qmlwebsockets.pro
index 7b6fc86..c058918 100644
--- a/src/imports/qmlwebsockets/qmlwebsockets.pro
+++ b/src/imports/qmlwebsockets/qmlwebsockets.pro
@@ -12,6 +12,6 @@ SOURCES +=  qmlwebsockets_plugin.cpp \
 
 OTHER_FILES += qmldir
 
-IMPORT_VERSION = 1.1
+IMPORT_VERSION = 1.$$QT_MINOR_VERSION
 
 load(qml_plugin)
diff --git a/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp b/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp
index 24fe34a..467e08c 100644
--- a/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp
+++ b/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp
@@ -55,6 +55,9 @@ void QtWebSocketsDeclarativeModule::registerTypes(const char *uri)
     qmlRegisterType<QQmlWebSocket>(uri, 1 /*major*/, 0 /*minor*/, "WebSocket");
     qmlRegisterType<QQmlWebSocket, 1>(uri, 1 /*major*/, 1 /*minor*/, "WebSocket");
     qmlRegisterType<QQmlWebSocketServer>(uri, 1 /*major*/, 0 /*minor*/, "WebSocketServer");
+
+    // Auto-increment the import to stay in sync with ALL future QtQuick minor versions
+    qmlRegisterModule(uri, 1, QT_VERSION_MINOR);
 }
 
 QT_END_NAMESPACE
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp
index 37a2fad..7f862e0 100644
--- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp
+++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp
@@ -87,31 +87,33 @@
 /*!
   \qmlsignal WebSocket::textMessageReceived(QString message)
   This signal is emitted when a text message is received.
+  \a message contains the bytes received.
   */
 
 /*!
   \qmlsignal WebSocket::binaryMessageReceived(QString message)
   \since 5.8
   This signal is emitted when a binary message is received.
+  \a message contains the bytes received.
   */
 
 /*!
   \qmlsignal WebSocket::statusChanged(Status status)
   This signal is emitted when the status of the WebSocket changes.
-  the \l [QML]{WebSocket::status}{status} argument provides the current status.
+  The \a status argument provides the current status.
 
   \sa {QtWebSockets::}{WebSocket::status}
   */
 
 /*!
   \qmlmethod void WebSocket::sendTextMessage(string message)
-  Sends \c message to the server.
+  Sends \a message to the server.
   */
 
 /*!
   \qmlmethod void WebSocket::sendBinaryMessage(ArrayBuffer message)
   \since 5.8
-  Sends \c message to the server.
+  Sends the parameter \a message to the server.
   */
 
 #include "qqmlwebsocket.h"
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.h b/src/imports/qmlwebsockets/qqmlwebsocket.h
index e1ffc72..7662607 100644
--- a/src/imports/qmlwebsockets/qqmlwebsocket.h
+++ b/src/imports/qmlwebsockets/qqmlwebsocket.h
@@ -88,7 +88,7 @@ public:
 Q_SIGNALS:
     void textMessageReceived(QString message);
     Q_REVISION(1) void binaryMessageReceived(QByteArray message);
-    void statusChanged(Status status);
+    void statusChanged(QQmlWebSocket::Status status);
     void activeChanged(bool isActive);
     void errorStringChanged(QString errorString);
     void urlChanged();