Merge remote-tracking branch 'origin/release' into stable

Change-Id: I9de811ee1f43381b6ce27acd47a126a70fd10d46

diff --git a/src/imports/qmlwebsockets/qmldir b/src/imports/qmlwebsockets/qmldir
index 4ae1035..3202976 100644 (file)
--- a/src/imports/qmlwebsockets/qmldir
+++ b/src/imports/qmlwebsockets/qmldir
@@ -1,3 +1,4 @@
 module Qt.WebSockets
 plugin declarative_qmlwebsockets
+classname QtWebSocketsDeclarativeModule
 typeinfo plugins.qmltypes

diff --git a/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp b/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp
index a36aeac..9c7f2d6 100644 (file)
--- a/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp
+++ b/src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp
@@ -45,7 +45,7 @@
 
 QT_BEGIN_NAMESPACE
 
-void QmlWebSocket_plugin::registerTypes(const char *uri)
+void QtWebSocketsDeclarativeModule::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("Qt.WebSockets"));
 

diff --git a/src/imports/qmlwebsockets/qmlwebsockets_plugin.h b/src/imports/qmlwebsockets/qmlwebsockets_plugin.h
index 1cab587..9e64091 100644 (file)
--- a/src/imports/qmlwebsockets/qmlwebsockets_plugin.h
+++ b/src/imports/qmlwebsockets/qmlwebsockets_plugin.h
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QmlWebSocket_plugin : public QQmlExtensionPlugin
+class QtWebSocketsDeclarativeModule : public QQmlExtensionPlugin
 {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")