From 43373f86d29dcff79f76fb728518f4ad7010a543 Mon Sep 17 00:00:00 2001 From: Andy Shaw Date: Tue, 23 Jul 2013 09:27:57 +0200 Subject: Undefine near if it is already defined to prevent a build issue In some Windows Embedded 7 SDKs near is still defined, so we need to undefine it in those cases. Task-number: QTBUG-32571 Change-Id: I0d48b9dafa2af31f88f48746bfcf4df9fe824554 Reviewed-by: Lorn Potter --- src/imports/sensors/qmlproximitysensor.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src') 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; -- cgit v1.2.3 From c7a09160444112c9b399b15442547c1ed3a8012f Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 1 Aug 2013 09:32:42 +1000 Subject: use 9.80665 as standard gravity for calculations. Task-number: QTBUG-32751 Change-Id: I65076fa41d5c6a4e716df96bc5156068c1bd0040 Reviewed-by: Alex Blasche Reviewed-by: Thomas McGuire --- src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src') 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() -- cgit v1.2.3 From 4afdb9965bf4a12e657be202c46cc19c65c8f49d Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Thu, 1 Aug 2013 13:30:21 +1000 Subject: add gyroscope for sensorfw backend Task-number: QTBUG-32754 Change-Id: I9037c20953d67584fdfeb4d0fabdfd73f919f14c Reviewed-by: Thomas McGuire Reviewed-by: Alex Blasche --- src/plugins/sensors/sensorfw/Sensors.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'src') 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 -- cgit v1.2.3