diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:02:33 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:02:33 +0200 |
commit | 272ff9e83e030e7f8595da1b4850d3883165acfd (patch) | |
tree | 01e8b0cb120d6aaa8832b40dbaffed96cd0a4c02 | |
parent | 8e17df527b78d413046515bf488725922452dd71 (diff) | |
parent | 1f6c72df8b33741dc798042dd8c2e75f3af46232 (diff) | |
download | qtwebchannel-272ff9e83e030e7f8595da1b4850d3883165acfd.tar.gz |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I99db0266ee090a9f25768a10342ebf8adce2a570
-rw-r--r-- | src/imports/webchannel/plugins.qmltypes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/webchannel/plugins.qmltypes b/src/imports/webchannel/plugins.qmltypes index 76cf5e4..278e787 100644 --- a/src/imports/webchannel/plugins.qmltypes +++ b/src/imports/webchannel/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 QtWebChannel 1.13' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtWebChannel 1.14' Module { dependencies: [] |