diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:04:40 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-01 03:04:40 +0200 |
commit | d6ac9211695791d3b104ceb71a550bb229fe5f9d (patch) | |
tree | f1d8cc1f819b8bd69c8afd654a5ada54526beb27 | |
parent | 8fc219212b8b51665b4757b22a936422ea6f9fc7 (diff) | |
parent | a84f5f9d10b59606fabbe3448c8e619e6694565a (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ib7615aa15c40e423cf1d940bbf8f347b66d0472c
-rw-r--r-- | src/imports/scxmlstatemachine/plugins.qmltypes | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/scxmlstatemachine/plugins.qmltypes b/src/imports/scxmlstatemachine/plugins.qmltypes index f0b5a20..1b6c469 100644 --- a/src/imports/scxmlstatemachine/plugins.qmltypes +++ b/src/imports/scxmlstatemachine/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 QtScxml 5.13' +// 'qmlplugindump -nonrelocatable QtScxml 5.14' Module { dependencies: ["QtQuick 2.0"] |