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 | |
parent | 26c192e6df519db3c8adfd86c41a6768e78aa323 (diff) | |
parent | 4afdb9965bf4a12e657be202c46cc19c65c8f49d (diff) | |
download | qtsensors-82b88416950c5d7cae82eeca44068fad47567e32.tar.gz |
Merge branch 'stable' into dev
Conflicts:
.qmake.conf
Change-Id: Ifed287670b09398ef659b9420c3e513a699a0944
-rw-r--r-- | dist/changes-5.1.1 | 25 | ||||
-rw-r--r-- | src/imports/sensors/qmlproximitysensor.h | 4 | ||||
-rw-r--r-- | src/plugins/sensors/sensorfw/Sensors.conf | 1 | ||||
-rw-r--r-- | src/plugins/sensors/sensorfw/sensorfwsensorbase.cpp | 3 |
4 files changed, 30 insertions, 3 deletions
diff --git a/dist/changes-5.1.1 b/dist/changes-5.1.1 new file mode 100644 index 0000000..dc0131c --- /dev/null +++ b/dist/changes-5.1.1 @@ -0,0 +1,25 @@ +Qt 5.1.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.1.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.1/ + +The Qt version 5.1 series is binary compatible with the 5.0.x series. +Applications compiled for 5.0 will continue to run with 5.1. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + +**************************************************************************** +* General * +**************************************************************************** + + - [QTBUG-32108] Freefall gesture needs to be initialized into plugin to be usable diff --git a/src/imports/sensors/qmlproximitysensor.h b/src/imports/sensors/qmlproximitysensor.h index 17cb2f9..78f171a 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 a003f12..31d1aff 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 b41d630..fde2b97 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() |