diff options
author | Alex Blasche <alexander.blasche@qt.io> | 2017-03-16 10:54:06 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-16 10:29:32 +0000 |
commit | dd78067d7cc5a6f3489de9eea74c9d639ec5b7e9 (patch) | |
tree | 44a7b2292c509a95d9781ff03bc9164ff968f17d /src | |
parent | 5863c695ee8eef2976026dea876e37b8978d0c7a (diff) | |
download | qtsensors-dd78067d7cc5a6f3489de9eea74c9d639ec5b7e9.tar.gz |
Fix QML Sensor API registrations for 5.9
The 5.7 registration is not needed and the comment was wrong as 5.9 is
the first API version with truly new QML API.
Change-Id: I87f1dc040df4eda1784420a7a9bf37a520dfd6f5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/sensors/plugins.qmltypes | 8 | ||||
-rw-r--r-- | src/imports/sensors/sensors.cpp | 7 |
2 files changed, 4 insertions, 11 deletions
diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes index 8d00157..2972b94 100644 --- a/src/imports/sensors/plugins.qmltypes +++ b/src/imports/sensors/plugins.qmltypes @@ -49,12 +49,8 @@ Module { Component { name: "QmlAltimeter" prototype: "QmlSensor" - exports: [ - "QtSensors/Altimeter 5.1", - "QtSensors/Altimeter 5.2", - "QtSensors/Altimeter 5.7" - ] - exportMetaObjectRevisions: [0, 0, 0] + exports: ["QtSensors/Altimeter 5.1", "QtSensors/Altimeter 5.2"] + exportMetaObjectRevisions: [0, 0] } Component { name: "QmlAltimeterReading" diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index fa8c8e2..28f85d3 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -224,11 +224,8 @@ public: qmlRegisterType <QmlSensorGesture >(package, major, minor, "SensorGesture"); - minor = 7; - qmlRegisterType <QmlAltimeter >(package, major, minor, "Altimeter"); - // Register the 5.9 interfaces - // No API changes, just reintroduce existing interfaces from 5.2 - // Implicitly registers 5.3 - 5.7 too + // Register the new 5.9 interfaces + // Implicitly registers 5.3 - 5.8 too minor = 9; qmlRegisterType <QmlLidSensor >(package, major, minor, "LidSensor"); qmlRegisterUncreatableType<QmlLidReading >(package, major, minor, "LidReading", QLatin1String("Cannot create LidReading")); |