From 6419556a2bebe81244198e84696aa6eeebdf463d Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 8 May 2014 18:38:22 +0200 Subject: Add missing classname for module in qmldir. Task-number: QTBUG-38854 Change-Id: Iad6d49309010fd9ccb7e8fcb2c58962d811f018f Reviewed-by: Oswald Buddenhagen Reviewed-by: Simon Hausmann --- src/imports/qmlwebsockets/qmldir | 1 + src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp | 2 +- src/imports/qmlwebsockets/qmlwebsockets_plugin.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/imports/qmlwebsockets/qmldir b/src/imports/qmlwebsockets/qmldir index 4ae1035..3202976 100644 --- 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 --- 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 --- 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") -- cgit v1.2.1