5 files changed, 9 insertions, 18 deletions
diff --git a/src/imports/qmlwebsockets/qmlwebsockets.pro b/src/imports/qmlwebsockets/qmlwebsockets.pro
index fef47f4..fa631bd 100644
--- a/src/imports/qmlwebsockets/qmlwebsockets.pro
+++ b/src/imports/qmlwebsockets/qmlwebsockets.pro
@@ -1,4 +1,4 @@
-QT = core websockets qml qml-private core-private
+QT = websockets qml-private core-private
 
 TARGETPATH = QtWebSockets
 
@@ -12,8 +12,6 @@ SOURCES +=  qmlwebsockets_plugin.cpp \
 
 OTHER_FILES += qmldir
 
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
-
 IMPORT_VERSION = 1.0
 
 load(qml_plugin)
diff --git a/src/imports/qmlwebsockets/qmlwebsockets_plugin.h b/src/imports/qmlwebsockets/qmlwebsockets_plugin.h
index 749d830..0fc9435 100644
--- a/src/imports/qmlwebsockets/qmlwebsockets_plugin.h
+++ b/src/imports/qmlwebsockets/qmlwebsockets_plugin.h
@@ -42,13 +42,6 @@
 
 #include <QQmlExtensionPlugin>
 
-static void initResources()
-{
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtWebSockets);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 class QtWebSocketsDeclarativeModule : public QQmlExtensionPlugin
@@ -57,7 +50,7 @@ class QtWebSocketsDeclarativeModule : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    QtWebSocketsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
+    QtWebSocketsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
     void registerTypes(const char *uri);
 };
 
diff --git a/src/imports/qmlwebsockets/qqmlwebsocket.h b/src/imports/qmlwebsockets/qqmlwebsocket.h
index 8db435d..e1ffc72 100644
--- a/src/imports/qmlwebsockets/qqmlwebsocket.h
+++ b/src/imports/qmlwebsockets/qqmlwebsocket.h
@@ -62,7 +62,7 @@ class QQmlWebSocket : public QObject, public QQmlParserStatus
 public:
     explicit QQmlWebSocket(QObject *parent = 0);
     explicit QQmlWebSocket(QWebSocket *socket, QObject *parent = 0);
-    virtual ~QQmlWebSocket();
+    ~QQmlWebSocket() override;
 
     enum Status
     {
@@ -94,8 +94,8 @@ Q_SIGNALS:
     void urlChanged();
 
 public:
-    void classBegin() Q_DECL_OVERRIDE;
-    void componentComplete() Q_DECL_OVERRIDE;
+    void classBegin() override;
+    void componentComplete() override;
 
 private Q_SLOTS:
     void onError(QAbstractSocket::SocketError error);
diff --git a/src/imports/qmlwebsockets/qqmlwebsocketserver.h b/src/imports/qmlwebsockets/qqmlwebsocketserver.h
index 5de5b09..98dbfc4 100644
--- a/src/imports/qmlwebsockets/qqmlwebsocketserver.h
+++ b/src/imports/qmlwebsockets/qqmlwebsocketserver.h
@@ -63,10 +63,10 @@ class QQmlWebSocketServer : public QObject, public QQmlParserStatus
 
 public:
     explicit QQmlWebSocketServer(QObject *parent = Q_NULLPTR);
-    virtual ~QQmlWebSocketServer();
+    ~QQmlWebSocketServer() override;
 
-    void classBegin() Q_DECL_OVERRIDE;
-    void componentComplete() Q_DECL_OVERRIDE;
+    void classBegin() override;
+    void componentComplete() override;
 
     QUrl url() const;
 
diff --git a/src/imports/qmlwebsockets_compat/qmlwebsockets_compat.pro b/src/imports/qmlwebsockets_compat/qmlwebsockets_compat.pro
index a6610b6..fbdf01c 100644
--- a/src/imports/qmlwebsockets_compat/qmlwebsockets_compat.pro
+++ b/src/imports/qmlwebsockets_compat/qmlwebsockets_compat.pro
@@ -1,6 +1,6 @@
 ### Qt 6: Remove support for the old "Qt.WebSockets" QML module.
 
-QT = core websockets qml
+QT = websockets qml
 
 TARGETPATH = Qt/WebSockets