diff options
author | Lincoln Ramsay <lincoln.ramsay@nokia.com> | 2012-03-02 14:13:39 +1000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-03 09:22:38 +0200 |
commit | 4c61854d60fb5d2c68c6dcb1fb5bdf5c0dead3e2 (patch) | |
tree | b41d70a37b8a1ff76c32025d8562a94581a3bd22 /src/imports/sensors/sensors.cpp | |
parent | fb68fb8c052ae08fabed8f49256e79b0d0915fb0 (diff) |
Add TiltSensor to QtMobility.sensors 1.3
This has been adapted from the TiltSensor type in QtSensors 5.0
import but the code there has been split into multiple pieces.
There's a C++ class, a generic backend
and a QML interface.
Change-Id: Ic09465a5f76250a02a13938abe4789958137376f
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Diffstat (limited to 'src/imports/sensors/sensors.cpp')
-rw-r--r-- | src/imports/sensors/sensors.cpp | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/src/imports/sensors/sensors.cpp b/src/imports/sensors/sensors.cpp index e5f43835..9e425297 100644 --- a/src/imports/sensors/sensors.cpp +++ b/src/imports/sensors/sensors.cpp @@ -41,18 +41,20 @@ #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> +#include <QtSensors/QSensorManager> -#include <qaccelerometer.h> -#include <qambientlightsensor.h> -#include <qcompass.h> -#include <qmagnetometer.h> -#include <qorientationsensor.h> -#include <qproximitysensor.h> -#include <qrotationsensor.h> -#include <qtapsensor.h> -#include <qlightsensor.h> -#include <qgyroscope.h> -#include <qirproximitysensor.h> +#include <QtSensors/qaccelerometer.h> +#include <QtSensors/qambientlightsensor.h> +#include <QtSensors/qcompass.h> +#include <QtSensors/qmagnetometer.h> +#include <QtSensors/qorientationsensor.h> +#include <QtSensors/qproximitysensor.h> +#include <QtSensors/qrotationsensor.h> +#include <QtSensors/qtapsensor.h> +#include <QtSensors/qlightsensor.h> +#include <QtSensors/qgyroscope.h> +#include <QtSensors/qirproximitysensor.h> +#include <QtSensors/qtiltsensor.h> #include "qmlsensorglobal.h" #include "qmlsensor.h" @@ -67,6 +69,7 @@ #include "qmlproximitysensor.h" #include "qmlrotationsensor.h" #include "qmltapsensor.h" +#include "qmltiltsensor.h" QT_BEGIN_NAMESPACE @@ -75,7 +78,7 @@ static QObject *global_object_13(QQmlEngine *, QJSEngine *) return new QmlSensorGlobal; } -class QSensorsDeclarativeModule : public QQmlExtensionPlugin +class QtSensorsDeclarativeModule : public QQmlExtensionPlugin { Q_OBJECT Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface" FILE "plugin.json") @@ -164,6 +167,8 @@ public: qmlRegisterUncreatableType<QmlRotationSensorReading >(package, major, minor, "RotationReading", QLatin1String("Cannot create RotationReading")); qmlRegisterType <QmlTapSensor >(package, major, minor, "TapSensor"); qmlRegisterUncreatableType<QmlTapSensorReading >(package, major, minor, "TapReading", QLatin1String("Cannot create TapReading")); + qmlRegisterType <QmlTiltSensor >(package, major, minor, "TiltSensor"); + qmlRegisterUncreatableType<QmlTiltSensorReading >(package, major, minor, "TiltReading", QLatin1String("Cannot create TiltReading")); } }; |