summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-08-05 10:32:11 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-08-05 10:32:11 +0200
commit82b88416950c5d7cae82eeca44068fad47567e32 (patch)
treed8497021c807c4145af76bacff5177947ce8aaa4 /src
parent26c192e6df519db3c8adfd86c41a6768e78aa323 (diff)
parent4afdb9965bf4a12e657be202c46cc19c65c8f49d (diff)
Merge branch 'stable' into dev
Conflicts: .qmake.conf Change-Id: Ifed287670b09398ef659b9420c3e513a699a0944
Diffstat (limited to 'src')
-rw-r--r--src/imports/sensors/qmlproximitysensor.h4
-rw-r--r--src/plugins/sensors/sensorfw/Sensors.conf1
-rw-r--r--src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp3
3 files changed, 5 insertions, 3 deletions
diff --git a/src/imports/sensors/qmlproximitysensor.h b/src/imports/sensors/qmlproximitysensor.h
index 17cb2f9a..78f171a4 100644
--- a/src/imports/sensors/qmlproximitysensor.h
+++ b/src/imports/sensors/qmlproximitysensor.h
@@ -43,7 +43,9 @@
#define QMLPROXIMITYSENSOR_H
#include "qmlsensor.h"
-
+#ifdef near
+#undef near
+#endif
QT_BEGIN_NAMESPACE
class QProximitySensor;
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
diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
index b41d6308..fde2b972 100644
--- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
+++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp
@@ -45,8 +45,7 @@
SensorManagerInterface* SensorfwSensorBase::m_remoteSensorManager = 0;
//According to wikipedia link http://en.wikipedia.org/wiki/Standard_gravity
-//const float sensorfwsensorbase::GRAVITY_EARTH = 9.812865328;
-const float SensorfwSensorBase::GRAVITY_EARTH_THOUSANDTH = 0.009812865328;
+const float SensorfwSensorBase::GRAVITY_EARTH_THOUSANDTH = 0.00980665;
const int SensorfwSensorBase::KErrNotFound=-1;
const int SensorfwSensorBase::KErrInUse=-14;
QStringList SensorfwSensorBase::m_bufferingSensors = QStringList()