diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-29 20:24:40 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-30 16:26:08 +0200 |
| commit | c55e385f1f70f11d3ffd0f8372ccb8e7405018c5 (patch) | |
| tree | a04c2e84b43830ecf9c8817f830055bfcf64cc0d /src/imports/qmlwebsockets/plugins.qmltypes | |
| parent | a3e0fe474c20eb526af9668c5cc97cf7055c77fa (diff) | |
| parent | 086f3722777ee61f3c019ca064d4a844cf0f6fe4 (diff) | |
| download | qtwebsockets-c55e385f1f70f11d3ffd0f8372ccb8e7405018c5.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
.qmake.conf
src/websockets/qwebsocket_p.cpp
Change-Id: Ibcc1898263cc8bc80066370f045df6a217e46574
Diffstat (limited to 'src/imports/qmlwebsockets/plugins.qmltypes')
| -rw-r--r-- | src/imports/qmlwebsockets/plugins.qmltypes | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/imports/qmlwebsockets/plugins.qmltypes b/src/imports/qmlwebsockets/plugins.qmltypes index 5b8d1f9..5df4b5c 100644 --- a/src/imports/qmlwebsockets/plugins.qmltypes +++ b/src/imports/qmlwebsockets/plugins.qmltypes @@ -1,4 +1,4 @@ -import QtQuick.tooling 1.1 +import QtQuick.tooling 1.2 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. @@ -7,6 +7,7 @@ import QtQuick.tooling 1.1 // 'qmlplugindump -notrelocatable QtWebSockets 1.0' Module { + dependencies: [] Component { name: "QQmlWebSocket" prototype: "QObject" @@ -51,7 +52,7 @@ Module { Component { name: "QQmlWebSocketServer" prototype: "QObject" - exports: ["Qt.WebSockets/WebSocketServer 1.0"] + exports: ["QtWebSockets/WebSocketServer 1.0"] exportMetaObjectRevisions: [0] Property { name: "url"; type: "QUrl"; isReadonly: true } Property { name: "host"; type: "string" } |