summaryrefslogtreecommitdiffstats
path: root/src/plugins/sensors/blackberry/bbsensorbackend.cpp
diff options
context:
space:
mode:
authorBernd Weimer <bweimer@blackberry.com>2013-10-24 10:19:04 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-28 10:48:06 +0100
commit6348938a792b83374829ea09482539855cf2e56d (patch)
treeabc4582729badebdac37936640deee6b4dc3962b /src/plugins/sensors/blackberry/bbsensorbackend.cpp
parent4682c6c1fddbf364d428d5b1b1b052e7781905e0 (diff)
BlackBerry: Disabled "returnGeoValues" feature
Elimination of interference is not supported on BlackBerry, so returnGeoValues property will be ignored. Change-Id: I5c6e3a80ec18f9e0d349d3c4040bfb8067a72291 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Diffstat (limited to 'src/plugins/sensors/blackberry/bbsensorbackend.cpp')
-rw-r--r--src/plugins/sensors/blackberry/bbsensorbackend.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/plugins/sensors/blackberry/bbsensorbackend.cpp b/src/plugins/sensors/blackberry/bbsensorbackend.cpp
index 7822dd86..89f564d3 100644
--- a/src/plugins/sensors/blackberry/bbsensorbackend.cpp
+++ b/src/plugins/sensors/blackberry/bbsensorbackend.cpp
@@ -215,7 +215,8 @@ void BbSensorBackendBase::remapMatrix(const float inputMatrix[], float outputMat
void BbSensorBackendBase::remapAxes(float *x, float *y, float *z)
{
- Q_ASSERT(x && y && z);
+ Q_UNUSED(z);
+ Q_ASSERT(x && y);
if (!isAutoAxisRemappingEnabled() || orientationForRemapping() == 0)
return;
@@ -306,11 +307,6 @@ bool BbSensorBackendBase::isFeatureSupported(QSensor::Feature feature) const
case QSensor::PressureSensorTemperature:
return true;
case QSensor::GeoValues:
-#ifndef Q_OS_BLACKBERRY_TABLET
- return (sensorType() == SENSOR_TYPE_MAGNETOMETER);
-#else
- return false;
-#endif
case QSensor::Reserved:
case QSensor::FieldOfView:
break;