diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 03:00:41 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-11 03:00:41 +0100 |
| commit | 1024f57dbc07e6141a23791bd547e30a7cb06469 (patch) | |
| tree | 75cab134334bf05a13ba19abcf897bd0997018a3 /src | |
| parent | 80bc1ba061dd0ac2138085176fed3af8b8027f46 (diff) | |
| parent | 35b13ece98cedd6525e24d0bcd98825a7f4e32b3 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ib7962e4b610df0423d5ca2d8c302f350d4b7ffdd
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/sensors/plugins.qmltypes | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes index 24e38ac5..fc97257d 100644 --- a/src/imports/sensors/plugins.qmltypes +++ b/src/imports/sensors/plugins.qmltypes @@ -4,10 +4,10 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtSensors 5.11' +// 'qmlplugindump -nonrelocatable QtSensors 5.12' Module { - dependencies: ["QtQuick 2.8"] + dependencies: ["QtQuick 2.12"] Component { name: "QmlAccelerometer" prototype: "QmlSensor" |