diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-21 03:00:10 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-21 03:00:10 +0200 |
| commit | 7a99dffd7764326c0ec5fdb470192a0a3e5c229f (patch) | |
| tree | 204de2d08bf8391bec3c981deb5480b6887db8e0 /src/imports | |
| parent | 67c3c7e5f59fcc943b5e420af484faced995ebce (diff) | |
| parent | f39a9e10671c0ba71c656e19101a53670b689627 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Idb9dc88c742d8b407fabe72465024ebafb6886cb
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/sensors/plugins.qmltypes | 2 | ||||
| -rw-r--r-- | src/imports/sensors/qmlsensorglobal.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes index bcad4cc5..24e38ac5 100644 --- a/src/imports/sensors/plugins.qmltypes +++ b/src/imports/sensors/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 QtSensors 5.10' +// 'qmlplugindump -nonrelocatable QtSensors 5.11' Module { dependencies: ["QtQuick 2.8"] diff --git a/src/imports/sensors/qmlsensorglobal.cpp b/src/imports/sensors/qmlsensorglobal.cpp index ed72e39a..3d043565 100644 --- a/src/imports/sensors/qmlsensorglobal.cpp +++ b/src/imports/sensors/qmlsensorglobal.cpp @@ -54,8 +54,8 @@ QT_BEGIN_NAMESPACE This element cannot be directly created. It can only be accessed via a namespace import. \code - import QtSensors 5.0 - import QtSensors 5.0 as Sensors + import QtSensors 5.11 + import QtSensors 5.11 as Sensors ... Component.onCompleted: { var types = Sensors.QmlSensors.sensorTypes(); |