From dd78067d7cc5a6f3489de9eea74c9d639ec5b7e9 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 16 Mar 2017 10:54:06 +0100 Subject: 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 --- src/imports/sensors/plugins.qmltypes | 8 ++------ src/imports/sensors/sensors.cpp | 7 ++----- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes index 8d001572..2972b94d 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 fa8c8e29..28f85d37 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -224,11 +224,8 @@ public: qmlRegisterType (package, major, minor, "SensorGesture"); - minor = 7; - qmlRegisterType (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 (package, major, minor, "LidSensor"); qmlRegisterUncreatableType(package, major, minor, "LidReading", QLatin1String("Cannot create LidReading")); -- cgit v1.2.3