diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-02 03:01:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-02 03:01:10 +0100 |
| commit | 78abaa8e48f2d73b033f0aad570b34ea56dd81e2 (patch) | |
| tree | 548d2d22a9a98d34d9dad75208c447ad3df80fde | |
| parent | 3b219b8f354b68af2dafaf66305cc1affbc7fadd (diff) | |
| parent | 0964522a491ba3e96742594fec1eeef3a41e00ac (diff) | |
| download | qtwebsockets-78abaa8e48f2d73b033f0aad570b34ea56dd81e2.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I518af074d5a02b4ea129adfadaa4ec8aa8753112
| -rw-r--r-- | src/imports/qmlwebsockets/plugins.qmltypes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/qmlwebsockets/plugins.qmltypes b/src/imports/qmlwebsockets/plugins.qmltypes index 79e2f97..f1a5a2e 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 -dependencies dependencies.json QtWebSockets 1.13' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebSockets 1.14' Module { dependencies: [] |