diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-02 03:00:53 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-02 03:00:53 +0200 |
| commit | d1994f088f011a390f1c7b9a6ee09dac7606fbc6 (patch) | |
| tree | c940c3aeee2c72dc1d11c25350fc1354797cb711 /src/imports | |
| parent | c36e520c8404b8b37141619101862ab71b343200 (diff) | |
| parent | 247373d6501bab94ce1ea0048e390bd910963db9 (diff) | |
| download | qtwebsockets-d1994f088f011a390f1c7b9a6ee09dac7606fbc6.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I297fa8021bd7520851d139c16b97671d41156919
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/qmlwebsockets/dependencies.json | 2 | ||||
| -rw-r--r-- | src/imports/qmlwebsockets/plugins.qmltypes | 2 | ||||
| -rw-r--r-- | src/imports/qmlwebsockets/qmlwebsockets.pro | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/qmlwebsockets/dependencies.json b/src/imports/qmlwebsockets/dependencies.json new file mode 100644 index 0000000..0d4f101 --- /dev/null +++ b/src/imports/qmlwebsockets/dependencies.json @@ -0,0 +1,2 @@ +[ +] diff --git a/src/imports/qmlwebsockets/plugins.qmltypes b/src/imports/qmlwebsockets/plugins.qmltypes index cbbb628..2fb57cd 100644 --- a/src/imports/qmlwebsockets/plugins.qmltypes +++ b/src/imports/qmlwebsockets/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtWebSockets 1.1' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebSockets 1.1' Module { dependencies: [] diff --git a/src/imports/qmlwebsockets/qmlwebsockets.pro b/src/imports/qmlwebsockets/qmlwebsockets.pro index fa631bd..7b6fc86 100644 --- a/src/imports/qmlwebsockets/qmlwebsockets.pro +++ b/src/imports/qmlwebsockets/qmlwebsockets.pro @@ -12,6 +12,6 @@ SOURCES += qmlwebsockets_plugin.cpp \ OTHER_FILES += qmldir -IMPORT_VERSION = 1.0 +IMPORT_VERSION = 1.1 load(qml_plugin) |