From 0a274451536078366d2b43b91f9566dc748521e7 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 26 Feb 2014 09:54:49 +0100 Subject: Update QML plug-in interfaces for Qt 5.3 release Change-Id: If01a988c151ec696c8d02ca7c470d7e97a593b40 Reviewed-by: Lorn Potter --- src/imports/sensors/plugins.qmltypes | 273 +++++++++++++++++++++++++---------- src/imports/sensors/sensors.cpp | 7 +- 2 files changed, 201 insertions(+), 79 deletions(-) diff --git a/src/imports/sensors/plugins.qmltypes b/src/imports/sensors/plugins.qmltypes index f461372..0790533 100644 --- a/src/imports/sensors/plugins.qmltypes +++ b/src/imports/sensors/plugins.qmltypes @@ -3,7 +3,8 @@ import QtQuick.tooling 1.1 // This file describes the plugin-supplied types contained in the library. // It is used for QML tooling purposes only. // -// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtSensors 5.1'. +// This file was auto-generated by: +// 'qmlplugindump -notrelocatable QtSensors 5.3' Module { Component { @@ -11,9 +12,10 @@ Module { prototype: "QmlSensor" exports: [ "QtSensors/Accelerometer 5.0", - "QtSensors/Accelerometer 5.1" + "QtSensors/Accelerometer 5.1", + "QtSensors/Accelerometer 5.2" ] - exportMetaObjectRevisions: [0, 1] + exportMetaObjectRevisions: [0, 1, 1] Enum { name: "AccelerationMode" values: { @@ -34,9 +36,11 @@ Module { prototype: "QmlSensorReading" exports: [ "QtSensors/AccelerometerReading 5.0", - "QtSensors/AccelerometerReading 5.1" + "QtSensors/AccelerometerReading 5.1", + "QtSensors/AccelerometerReading 5.2" ] - exportMetaObjectRevisions: [0, 0] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "x"; type: "double"; isReadonly: true } Property { name: "y"; type: "double"; isReadonly: true } Property { name: "z"; type: "double"; isReadonly: true } @@ -44,14 +48,22 @@ Module { Component { name: "QmlAltimeter" prototype: "QmlSensor" - exports: ["QtSensors/Altimeter 5.1"] - exportMetaObjectRevisions: [0] + exports: [ + "QtSensors/Altimeter 5.1", + "QtSensors/Altimeter 5.2", + "QtSensors/Altimeter 5.3" + ] + exportMetaObjectRevisions: [0, 0, 0] } Component { name: "QmlAltimeterReading" prototype: "QmlSensorReading" - exports: ["QtSensors/AltimeterReading 5.1"] - exportMetaObjectRevisions: [0] + exports: [ + "QtSensors/AltimeterReading 5.1", + "QtSensors/AltimeterReading 5.2" + ] + isCreatable: false + exportMetaObjectRevisions: [0, 0] Property { name: "altitude"; type: "double"; isReadonly: true } } Component { @@ -59,64 +71,86 @@ Module { prototype: "QmlSensor" exports: [ "QtSensors/AmbientLightSensor 5.0", - "QtSensors/AmbientLightSensor 5.1" + "QtSensors/AmbientLightSensor 5.1", + "QtSensors/AmbientLightSensor 5.2" ] - exportMetaObjectRevisions: [0, 0] + exportMetaObjectRevisions: [0, 0, 0] } Component { name: "QmlAmbientLightSensorReading" prototype: "QmlSensorReading" exports: [ "QtSensors/AmbientLightReading 5.0", - "QtSensors/AmbientLightReading 5.1" + "QtSensors/AmbientLightReading 5.1", + "QtSensors/AmbientLightReading 5.2" ] - exportMetaObjectRevisions: [0, 0] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "lightLevel"; type: "QAmbientLightReading::LightLevel"; isReadonly: true } } Component { name: "QmlAmbientTemperatureReading" prototype: "QmlSensorReading" - exports: ["QtSensors/AmbientTemperatureReading 5.1"] - exportMetaObjectRevisions: [0] + exports: [ + "QtSensors/AmbientTemperatureReading 5.1", + "QtSensors/AmbientTemperatureReading 5.2" + ] + isCreatable: false + exportMetaObjectRevisions: [0, 0] Property { name: "temperature"; type: "double"; isReadonly: true } } Component { name: "QmlAmbientTemperatureSensor" prototype: "QmlSensor" - exports: ["QtSensors/AmbientTemperatureSensor 5.1"] - exportMetaObjectRevisions: [0] + exports: [ + "QtSensors/AmbientTemperatureSensor 5.1", + "QtSensors/AmbientTemperatureSensor 5.2" + ] + exportMetaObjectRevisions: [0, 0] } Component { name: "QmlCompass" prototype: "QmlSensor" - exports: ["QtSensors/Compass 5.0", "QtSensors/Compass 5.1"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtSensors/Compass 5.0", + "QtSensors/Compass 5.1", + "QtSensors/Compass 5.2" + ] + exportMetaObjectRevisions: [0, 0, 0] } Component { name: "QmlCompassReading" prototype: "QmlSensorReading" exports: [ "QtSensors/CompassReading 5.0", - "QtSensors/CompassReading 5.1" + "QtSensors/CompassReading 5.1", + "QtSensors/CompassReading 5.2" ] - exportMetaObjectRevisions: [0, 0] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "azimuth"; type: "double"; isReadonly: true } Property { name: "calibrationLevel"; type: "double"; isReadonly: true } } Component { name: "QmlGyroscope" prototype: "QmlSensor" - exports: ["QtSensors/Gyroscope 5.0", "QtSensors/Gyroscope 5.1"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtSensors/Gyroscope 5.0", + "QtSensors/Gyroscope 5.1", + "QtSensors/Gyroscope 5.2" + ] + exportMetaObjectRevisions: [0, 0, 0] } Component { name: "QmlGyroscopeReading" prototype: "QmlSensorReading" exports: [ "QtSensors/GyroscopeReading 5.0", - "QtSensors/GyroscopeReading 5.1" + "QtSensors/GyroscopeReading 5.1", + "QtSensors/GyroscopeReading 5.2" ] - exportMetaObjectRevisions: [0, 0] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "x"; type: "double"; isReadonly: true } Property { name: "y"; type: "double"; isReadonly: true } Property { name: "z"; type: "double"; isReadonly: true } @@ -124,40 +158,54 @@ Module { Component { name: "QmlHolsterReading" prototype: "QmlSensorReading" - exports: ["QtSensors/HolsterReading 5.1"] - exportMetaObjectRevisions: [0] + exports: [ + "QtSensors/HolsterReading 5.1", + "QtSensors/HolsterReading 5.2" + ] + isCreatable: false + exportMetaObjectRevisions: [0, 0] Property { name: "holstered"; type: "bool"; isReadonly: true } } Component { name: "QmlHolsterSensor" prototype: "QmlSensor" - exports: ["QtSensors/HolsterSensor 5.1"] - exportMetaObjectRevisions: [0] + exports: [ + "QtSensors/HolsterSensor 5.1", + "QtSensors/HolsterSensor 5.2" + ] + exportMetaObjectRevisions: [0, 0] } Component { name: "QmlIRProximitySensor" prototype: "QmlSensor" exports: [ "QtSensors/IRProximitySensor 5.0", - "QtSensors/IRProximitySensor 5.1" + "QtSensors/IRProximitySensor 5.1", + "QtSensors/IRProximitySensor 5.2" ] - exportMetaObjectRevisions: [0, 0] + exportMetaObjectRevisions: [0, 0, 0] } Component { name: "QmlIRProximitySensorReading" prototype: "QmlSensorReading" exports: [ "QtSensors/IRProximityReading 5.0", - "QtSensors/IRProximityReading 5.1" + "QtSensors/IRProximityReading 5.1", + "QtSensors/IRProximityReading 5.2" ] - exportMetaObjectRevisions: [0, 0] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "reflectance"; type: "double"; isReadonly: true } } Component { name: "QmlLightSensor" prototype: "QmlSensor" - exports: ["QtSensors/LightSensor 5.0", "QtSensors/LightSensor 5.1"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtSensors/LightSensor 5.0", + "QtSensors/LightSensor 5.1", + "QtSensors/LightSensor 5.2" + ] + exportMetaObjectRevisions: [0, 0, 0] Property { name: "fieldOfView"; type: "double"; isReadonly: true } Signal { name: "fieldOfViewChanged" @@ -167,15 +215,24 @@ Module { Component { name: "QmlLightSensorReading" prototype: "QmlSensorReading" - exports: ["QtSensors/LightReading 5.0", "QtSensors/LightReading 5.1"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtSensors/LightReading 5.0", + "QtSensors/LightReading 5.1", + "QtSensors/LightReading 5.2" + ] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "illuminance"; type: "double"; isReadonly: true } } Component { name: "QmlMagnetometer" prototype: "QmlSensor" - exports: ["QtSensors/Magnetometer 5.0", "QtSensors/Magnetometer 5.1"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtSensors/Magnetometer 5.0", + "QtSensors/Magnetometer 5.1", + "QtSensors/Magnetometer 5.2" + ] + exportMetaObjectRevisions: [0, 0, 0] Property { name: "returnGeoValues"; type: "bool" } Signal { name: "returnGeoValuesChanged" @@ -187,9 +244,11 @@ Module { prototype: "QmlSensorReading" exports: [ "QtSensors/MagnetometerReading 5.0", - "QtSensors/MagnetometerReading 5.1" + "QtSensors/MagnetometerReading 5.1", + "QtSensors/MagnetometerReading 5.2" ] - exportMetaObjectRevisions: [0, 0] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "x"; type: "double"; isReadonly: true } Property { name: "y"; type: "double"; isReadonly: true } Property { name: "z"; type: "double"; isReadonly: true } @@ -200,50 +259,65 @@ Module { prototype: "QmlSensor" exports: [ "QtSensors/OrientationSensor 5.0", - "QtSensors/OrientationSensor 5.1" + "QtSensors/OrientationSensor 5.1", + "QtSensors/OrientationSensor 5.2" ] - exportMetaObjectRevisions: [0, 0] + exportMetaObjectRevisions: [0, 0, 0] } Component { name: "QmlOrientationSensorReading" prototype: "QmlSensorReading" exports: [ "QtSensors/OrientationReading 5.0", - "QtSensors/OrientationReading 5.1" + "QtSensors/OrientationReading 5.1", + "QtSensors/OrientationReading 5.2" ] - exportMetaObjectRevisions: [0, 0] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "orientation"; type: "QOrientationReading::Orientation"; isReadonly: true } } Component { name: "QmlPressureReading" prototype: "QmlSensorReading" - exports: ["QtSensors/PressureReading 5.1"] - exportMetaObjectRevisions: [0] + exports: [ + "QtSensors/PressureReading 5.1", + "QtSensors/PressureReading 5.2" + ] + isCreatable: false + exportMetaObjectRevisions: [0, 1] Property { name: "pressure"; type: "double"; isReadonly: true } + Property { name: "temperature"; revision: 1; type: "double"; isReadonly: true } + Signal { name: "temperatureChanged"; revision: 1 } } Component { name: "QmlPressureSensor" prototype: "QmlSensor" - exports: ["QtSensors/PressureSensor 5.1"] - exportMetaObjectRevisions: [0] + exports: [ + "QtSensors/PressureSensor 5.1", + "QtSensors/PressureSensor 5.2" + ] + exportMetaObjectRevisions: [0, 0] } Component { name: "QmlProximitySensor" prototype: "QmlSensor" exports: [ "QtSensors/ProximitySensor 5.0", - "QtSensors/ProximitySensor 5.1" + "QtSensors/ProximitySensor 5.1", + "QtSensors/ProximitySensor 5.2" ] - exportMetaObjectRevisions: [0, 0] + exportMetaObjectRevisions: [0, 0, 0] } Component { name: "QmlProximitySensorReading" prototype: "QmlSensorReading" exports: [ "QtSensors/ProximityReading 5.0", - "QtSensors/ProximityReading 5.1" + "QtSensors/ProximityReading 5.1", + "QtSensors/ProximityReading 5.2" ] - exportMetaObjectRevisions: [0, 0] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "near"; type: "bool"; isReadonly: true } } Component { @@ -251,9 +325,10 @@ Module { prototype: "QmlSensor" exports: [ "QtSensors/RotationSensor 5.0", - "QtSensors/RotationSensor 5.1" + "QtSensors/RotationSensor 5.1", + "QtSensors/RotationSensor 5.2" ] - exportMetaObjectRevisions: [0, 0] + exportMetaObjectRevisions: [0, 0, 0] Property { name: "hasZ"; type: "bool"; isReadonly: true } Signal { name: "hasZChanged" @@ -265,9 +340,11 @@ Module { prototype: "QmlSensorReading" exports: [ "QtSensors/RotationReading 5.0", - "QtSensors/RotationReading 5.1" + "QtSensors/RotationReading 5.1", + "QtSensors/RotationReading 5.2" ] - exportMetaObjectRevisions: [0, 0] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "x"; type: "double"; isReadonly: true } Property { name: "y"; type: "double"; isReadonly: true } Property { name: "z"; type: "double"; isReadonly: true } @@ -275,8 +352,13 @@ Module { Component { name: "QmlSensor" prototype: "QObject" - exports: ["QtSensors/Sensor 5.0", "QtSensors/Sensor 5.1"] - exportMetaObjectRevisions: [0, 1] + exports: [ + "QtSensors/Sensor 5.0", + "QtSensors/Sensor 5.1", + "QtSensors/Sensor 5.2" + ] + isCreatable: false + exportMetaObjectRevisions: [0, 1, 1] Enum { name: "AxesOrientationMode" values: { @@ -348,9 +430,10 @@ Module { prototype: "QObject" exports: [ "QtSensors/SensorGesture 5.0", - "QtSensors/SensorGesture 5.1" + "QtSensors/SensorGesture 5.1", + "QtSensors/SensorGesture 5.2" ] - exportMetaObjectRevisions: [0, 0] + exportMetaObjectRevisions: [0, 0, 0] Property { name: "availableGestures"; type: "QStringList"; isReadonly: true } Property { name: "gestures"; type: "QStringList" } Property { name: "validGestures"; type: "QStringList"; isReadonly: true } @@ -364,8 +447,14 @@ Module { Component { name: "QmlSensorGlobal" prototype: "QObject" - exports: ["QtSensors/QmlSensors 5.0", "QtSensors/QmlSensors 5.1"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtSensors/QmlSensors 5.0", + "QtSensors/QmlSensors 5.1", + "QtSensors/QmlSensors 5.2" + ] + isCreatable: false + isSingleton: true + exportMetaObjectRevisions: [0, 0, 0] Signal { name: "availableSensorsChanged" } Method { name: "sensorTypes"; type: "QStringList" } Method { @@ -382,8 +471,13 @@ Module { Component { name: "QmlSensorOutputRange" prototype: "QObject" - exports: ["QtSensors/OutputRange 5.0", "QtSensors/OutputRange 5.1"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtSensors/OutputRange 5.0", + "QtSensors/OutputRange 5.1", + "QtSensors/OutputRange 5.2" + ] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "minimum"; type: "double"; isReadonly: true } Property { name: "maximum"; type: "double"; isReadonly: true } Property { name: "accuracy"; type: "double"; isReadonly: true } @@ -391,8 +485,13 @@ Module { Component { name: "QmlSensorRange" prototype: "QObject" - exports: ["QtSensors/Range 5.0", "QtSensors/Range 5.1"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtSensors/Range 5.0", + "QtSensors/Range 5.1", + "QtSensors/Range 5.2" + ] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "minimum"; type: "int"; isReadonly: true } Property { name: "maximum"; type: "int"; isReadonly: true } } @@ -401,16 +500,22 @@ Module { prototype: "QObject" exports: [ "QtSensors/SensorReading 5.0", - "QtSensors/SensorReading 5.1" + "QtSensors/SensorReading 5.1", + "QtSensors/SensorReading 5.2" ] - exportMetaObjectRevisions: [0, 0] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "timestamp"; type: "qulonglong"; isReadonly: true } } Component { name: "QmlTapSensor" prototype: "QmlSensor" - exports: ["QtSensors/TapSensor 5.0", "QtSensors/TapSensor 5.1"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtSensors/TapSensor 5.0", + "QtSensors/TapSensor 5.1", + "QtSensors/TapSensor 5.2" + ] + exportMetaObjectRevisions: [0, 0, 0] Property { name: "returnDoubleTapEvents"; type: "bool" } Signal { name: "returnDoubleTapEventsChanged" @@ -420,8 +525,13 @@ Module { Component { name: "QmlTapSensorReading" prototype: "QmlSensorReading" - exports: ["QtSensors/TapReading 5.0", "QtSensors/TapReading 5.1"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtSensors/TapReading 5.0", + "QtSensors/TapReading 5.1", + "QtSensors/TapReading 5.2" + ] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "tapDirection"; type: "QTapReading::TapDirection"; isReadonly: true } Property { name: "doubleTap"; type: "bool"; isReadonly: true } Signal { name: "isDoubleTapChanged" } @@ -429,15 +539,24 @@ Module { Component { name: "QmlTiltSensor" prototype: "QmlSensor" - exports: ["QtSensors/TiltSensor 5.0", "QtSensors/TiltSensor 5.1"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtSensors/TiltSensor 5.0", + "QtSensors/TiltSensor 5.1", + "QtSensors/TiltSensor 5.2" + ] + exportMetaObjectRevisions: [0, 0, 0] Method { name: "calibrate" } } Component { name: "QmlTiltSensorReading" prototype: "QmlSensorReading" - exports: ["QtSensors/TiltReading 5.0", "QtSensors/TiltReading 5.1"] - exportMetaObjectRevisions: [0, 0] + exports: [ + "QtSensors/TiltReading 5.0", + "QtSensors/TiltReading 5.1", + "QtSensors/TiltReading 5.2" + ] + isCreatable: false + exportMetaObjectRevisions: [0, 0, 0] Property { name: "yRotation"; type: "double"; isReadonly: true } Property { name: "xRotation"; type: "double"; isReadonly: true } } diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index abcb381..8e52590 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -133,7 +133,6 @@ public: qmlRegisterType (package, major, minor, "SensorGesture"); // Register the 5.1 interfaces - major = 5; minor = 1; qmlRegisterSingletonType (package, major, minor, "QmlSensors", global_object_50); qmlRegisterUncreatableType(package, major, minor, "Range", QLatin1String("Cannot create Range")); @@ -176,7 +175,6 @@ public: qmlRegisterType (package, major, minor, "SensorGesture"); // Register the 5.2 interfaces - major = 5; minor = 2; qmlRegisterSingletonType (package, major, minor, "QmlSensors", global_object_50); qmlRegisterUncreatableType(package, major, minor, "Range", QLatin1String("Cannot create Range")); @@ -217,6 +215,11 @@ public: qmlRegisterUncreatableType(package, major, minor, "TiltReading", QLatin1String("Cannot create TiltReading")); qmlRegisterType (package, major, minor, "SensorGesture"); + + // Register the 5.3 interfaces + // No API changes, just reintroduce existing interfaces for 5.3 + minor = 3; + qmlRegisterType (package, major, minor, "Altimeter"); } }; -- cgit v1.2.1