summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLincoln Ramsay <lincoln.ramsay@nokia.com>2011-08-29 13:39:36 +1000
committerQt by Nokia <qt-info@nokia.com>2011-08-29 05:43:10 +0200
commit19c8ffcb012f7a55f7207c8834cb03cf12772ed8 (patch)
treec40aed23e778a0a1085748c64c5ca892665263d5
parente243c4fa9fce1ebbe1d0e625b6e2d3a07fe6b071 (diff)
Reset the version to 1.0
Change-Id: I606bed710e5546a4f33c885dfafb033ce8f1d002 Reviewed-on: http://codereview.qt.nokia.com/3693 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lincoln Ramsay <lincoln.ramsay@nokia.com>
-rw-r--r--src/imports/sensors/sensors.cpp27
1 files changed, 4 insertions, 23 deletions
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp
index 72adfc6b..e9eafd57 100644
--- a/src/imports/sensors/sensors.cpp
+++ b/src/imports/sensors/sensors.cpp
@@ -64,31 +64,12 @@ public:
{
char const * const package = "Qt.sensors";
if (QLatin1String(uri) != QLatin1String(package)) return;
+ int major;
+ int minor;
- // Register the 1.1 interfaces
- int major = 1;
- int minor = 1;
- qmlRegisterUncreatableType<QSensorReading >(package, major, minor, "SensorReading", QLatin1String("Cannot create SensorReading"));
- qmlRegisterType <QAccelerometer >(package, major, minor, "Accelerometer");
- qmlRegisterUncreatableType<QAccelerometerReading>(package, major, minor, "AccelerometerReading", QLatin1String("Cannot create AccelerometerReading"));
- qmlRegisterType <QAmbientLightSensor >(package, major, minor, "AmbientLightSensor");
- qmlRegisterUncreatableType<QAmbientLightReading >(package, major, minor, "AmbientLightReading", QLatin1String("Cannot create AmbientLightReading"));
- qmlRegisterType <QCompass >(package, major, minor, "Compass");
- qmlRegisterUncreatableType<QCompassReading >(package, major, minor, "CompassReading", QLatin1String("Cannot create CompassReading"));
- qmlRegisterType <QMagnetometer >(package, major, minor, "Magnetometer");
- qmlRegisterUncreatableType<QMagnetometerReading >(package, major, minor, "MagnetometerReading", QLatin1String("Cannot create MagnetometerReading"));
- qmlRegisterType <QOrientationSensor >(package, major, minor, "OrientationSensor");
- qmlRegisterUncreatableType<QOrientationReading >(package, major, minor, "OrientationReading", QLatin1String("Cannot create OrientationReading"));
- qmlRegisterType <QProximitySensor >(package, major, minor, "ProximitySensor");
- qmlRegisterUncreatableType<QProximityReading >(package, major, minor, "ProximityReading", QLatin1String("Cannot create ProximityReading"));
- qmlRegisterType <QRotationSensor >(package, major, minor, "RotationSensor");
- qmlRegisterUncreatableType<QRotationReading >(package, major, minor, "RotationReading", QLatin1String("Cannot create RotationReading"));
- qmlRegisterType <QTapSensor >(package, major, minor, "TapSensor");
- qmlRegisterUncreatableType<QTapReading >(package, major, minor, "TapReading", QLatin1String("Cannot create TapReading"));
-
- // Register the 1.2 interfaces
+ // Register the 1.0 interfaces
major = 1;
- minor = 2;
+ minor = 0;
qmlRegisterUncreatableType<QSensor >(package, major, minor, "Sensor", QLatin1String("Cannot create Sensor"));
qmlRegisterUncreatableType<QSensorReading >(package, major, minor, "SensorReading", QLatin1String("Cannot create SensorReading"));
qmlRegisterType <QAccelerometer >(package, major, minor, "Accelerometer");