diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-14 12:40:46 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-14 12:40:46 +0200 |
| commit | b474a43e9b87f6e34f54cee5e4ac6842cc182fff (patch) | |
| tree | 387cc91f9d0c2d4bbeb70683071c006815f3bdfb | |
| parent | 8b9836d0e00736b5a16f650667218612940e106b (diff) | |
| parent | 6419556a2bebe81244198e84696aa6eeebdf463d (diff) | |
| download | qtwebsockets-b474a43e9b87f6e34f54cee5e4ac6842cc182fff.tar.gz | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I9de811ee1f43381b6ce27acd47a126a70fd10d46
| -rw-r--r-- | src/imports/qmlwebsockets/qmldir | 1 | ||||
| -rw-r--r-- | src/imports/qmlwebsockets/qmlwebsockets_plugin.cpp | 2 | ||||
| -rw-r--r-- | 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") |