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(-) 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; -- cgit v1.2.1 From 708b8ba9a2b7cdcda958b2c3cac8344f0ec3f3d0 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 23 Jul 2013 12:08:54 +0200 Subject: Bump MODULE_VERSION to 5.1.2 Change-Id: Ib467832043763d292bbe7d227e8d4a4966d74630 Reviewed-by: Oswald Buddenhagen --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 661ac1a..bf1b71f 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.1.1 +MODULE_VERSION = 5.1.2 -- cgit v1.2.1 From 0e86de52c22cef74a6d0536d985a2a047051c0d8 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 22 Jul 2013 13:35:37 +0200 Subject: Add changes-5.1.1 file Change-Id: I6bcc56af5bd19e1e6a9c15719e310461bc8dc1fd Reviewed-by: Lorn Potter --- dist/changes-5.1.1 | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 dist/changes-5.1.1 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 -- cgit v1.2.1 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(-) 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() -- cgit v1.2.1 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(+) 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 -- cgit v1.2.1