diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-09 03:03:08 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 14:21:03 +0200 |
| commit | 8a6a24176f68db6cbc10bf66d852e99493607fe1 (patch) | |
| tree | 3ab4be7e03d1e97026e0baeea93d0cd2f7eafbec /src/imports/sensors/plugins.qmltypes | |
| parent | ff2b9bd23ccd52f9e02fbc24ef66c863f0dc9250 (diff) | |
| parent | 7d00c195c984750b2ec65eb9267ba689178ea584 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/imports/sensors/plugins.qmltypes')
| -rw-r--r-- | src/imports/sensors/plugins.qmltypes | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes index 80e1df36..b78e63c6 100644 --- a/src/imports/sensors/plugins.qmltypes +++ b/src/imports/sensors/plugins.qmltypes @@ -129,6 +129,20 @@ Module { Property { name: "calibrationLevel"; type: "double"; isReadonly: true } } Component { + name: "QmlDistanceReading" + prototype: "QmlSensorReading" + exports: ["QtSensors/DistanceReading 5.4"] + isCreatable: false + exportMetaObjectRevisions: [0] + Property { name: "distance"; type: "double"; isReadonly: true } + } + Component { + name: "QmlDistanceSensor" + prototype: "QmlSensor" + exports: ["QtSensors/DistanceSensor 5.4"] + exportMetaObjectRevisions: [0] + } + Component { name: "QmlGyroscope" prototype: "QmlSensor" exports: [ @@ -173,6 +187,21 @@ Module { exportMetaObjectRevisions: [0, 0] } Component { + name: "QmlHumidityReading" + prototype: "QmlSensorReading" + exports: ["QtSensors/HumidityReading 5.9"] + isCreatable: false + exportMetaObjectRevisions: [0] + Property { name: "relativeHumidity"; type: "double"; isReadonly: true } + Property { name: "absoluteHumidity"; type: "double"; isReadonly: true } + } + Component { + name: "QmlHumiditySensor" + prototype: "QmlSensor" + exports: ["QtSensors/HumiditySensor 5.9"] + exportMetaObjectRevisions: [0] + } + Component { name: "QmlIRProximitySensor" prototype: "QmlSensor" exports: [ |