6 files changed, 9 insertions, 8 deletions
diff --git a/src/imports/qmlwebsockets/plugins.qmltypes b/src/imports/qmlwebsockets/plugins.qmltypes
index 4404a51..5b8d1f9 100644
--- a/src/imports/qmlwebsockets/plugins.qmltypes
+++ b/src/imports/qmlwebsockets/plugins.qmltypes
@@ -4,13 +4,13 @@ import QtQuick.tooling 1.1
 // It is used for QML tooling purposes only.
 //
 // This file was auto-generated by:
-// 'qmlplugindump -notrelocatable Qt.WebSockets 1.0'
+// 'qmlplugindump -notrelocatable QtWebSockets 1.0'
 
 Module {
     Component {
         name: "QQmlWebSocket"
         prototype: "QObject"
-        exports: ["Qt.WebSockets/WebSocket 1.0"]
+        exports: ["QtWebSockets/WebSocket 1.0"]
         exportMetaObjectRevisions: [0]
         Enum {
             name: "Status"
diff --git a/src/imports/qmlwebsockets/qmldir b/src/imports/qmlwebsockets/qmldir
index 3202976..130b79f 100644
--- a/src/imports/qmlwebsockets/qmldir
+++ b/src/imports/qmlwebsockets/qmldir
@@ -1,4 +1,4 @@
-module Qt.WebSockets
+module QtWebSockets
 plugin declarative_qmlwebsockets
 classname QtWebSocketsDeclarativeModule
 typeinfo plugins.qmltypes
diff --git a/src/imports/qmlwebsockets/qmlwebsockets.pro b/src/imports/qmlwebsockets/qmlwebsockets.pro
index 58c6df0..dea84a8 100644
--- a/src/imports/qmlwebsockets/qmlwebsockets.pro
+++ b/src/imports/qmlwebsockets/qmlwebsockets.pro
@@ -1,6 +1,6 @@
 QT = core websockets qml
 
-TARGETPATH = Qt/WebSockets
+TARGETPATH = QtWebSockets
 
 HEADERS +=  qmlwebsockets_plugin.h \
             qqmlwebsocket.h \
diff --git a/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp b/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp
index fea105e..684d711 100644
--- a/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp
+++ b/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp
@@ -42,9 +42,10 @@ QT_BEGIN_NAMESPACE
 
 void QtWebSocketsDeclarativeModule::registerTypes(const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("Qt.WebSockets"));
+    // ### Qt 6: Remove support for the "Qt.WebSockets" QML module.
+    Q_ASSERT(uri == QLatin1String("QtWebSockets") || uri == QLatin1String("Qt.WebSockets"));
 
-    // @uri Qt.WebSockets
+    // @uri QtWebSockets
     qmlRegisterType<QQmlWebSocket>(uri, 1 /*major*/, 0 /*minor*/, "WebSocket");
     qmlRegisterType<QQmlWebSocketServer>(uri, 1 /*major*/, 0 /*minor*/, "WebSocketServer");
 }
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.cpp b/src/imports/qmlwebsockets/qqmlwebsocket.cpp
index 08d39f6..568f8ce 100644
--- a/src/imports/qmlwebsockets/qqmlwebsocket.cpp
+++ b/src/imports/qmlwebsockets/qqmlwebsocket.cpp
@@ -36,7 +36,7 @@
     \instantiates QQmlWebSocket
     \since 5.3
 
-    \inqmlmodule Qt.WebSockets
+    \inqmlmodule QtWebSockets
     \ingroup websockets-qml
     \brief QML interface to QWebSocket.
 
diff --git a/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp b/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp
index 6425fe2..9c302ea 100644
--- a/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp
+++ b/src/imports/qmlwebsockets/qqmlwebsocketserver.cpp
@@ -41,7 +41,7 @@ QT_USE_NAMESPACE
     \instantiates QQmlWebSocketServer
     \since 5.3
 
-    \inqmlmodule Qt.WebSockets
+    \inqmlmodule QtWebSockets
     \ingroup websockets-qml
     \brief QML interface to QWebSocketServer.
 */