diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:03:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:03:09 +0200 |
| commit | 0964522a491ba3e96742594fec1eeef3a41e00ac (patch) | |
| tree | d9c7c69dc12c3b3a851c4a178bffc3777b4f066c | |
| parent | ccd820c0d215db1de3b0b018cfc329da5ac718e2 (diff) | |
| parent | 89909902357725824d20a9daed069952a1891714 (diff) | |
| download | qtwebsockets-0964522a491ba3e96742594fec1eeef3a41e00ac.tar.gz | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I56626d23b09e833c162cacac6386c712d67236ec
| -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: [] |