diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:32:11 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-08-05 10:32:11 +0200 |
| commit | 82b88416950c5d7cae82eeca44068fad47567e32 (patch) | |
| tree | d8497021c807c4145af76bacff5177947ce8aaa4 /src/plugins/sensors/sensorfw/Sensors.conf | |
| parent | 26c192e6df519db3c8adfd86c41a6768e78aa323 (diff) | |
| parent | 4afdb9965bf4a12e657be202c46cc19c65c8f49d (diff) | |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ifed287670b09398ef659b9420c3e513a699a0944
Diffstat (limited to 'src/plugins/sensors/sensorfw/Sensors.conf')
| -rw-r--r-- | src/plugins/sensors/sensorfw/Sensors.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/sensors/sensorfw/Sensors.conf b/src/plugins/sensors/sensorfw/Sensors.conf index a003f12c..31d1aff0 100644 --- a/src/plugins/sensors/sensorfw/Sensors.conf +++ b/src/plugins/sensors/sensorfw/Sensors.conf @@ -9,3 +9,4 @@ QRotationSensor=sensorfw.rotationsensor QTapSensor=sensorfw.tapsensor QLightSensor=sensorfw.lightsensor QIRProximitySensor=sensorfw.irproximitysensor +QGyroscope=sensorfw.gyroscope |