Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I497c153fe555fbfbbd5fbb40f65f614ee33b065d

7 files changed, 21 insertions, 18 deletions

diff --git a/src/plugins/sensors/android/jar/bundledjar.pro b/src/plugins/sensors/android/jar/bundledjar.pro
new file mode 100644
index 00000000..2f6f195d
--- /dev/null
+++ b/src/plugins/sensors/android/jar/bundledjar.pro
@@ -0,0 +1,3 @@
+TARGET = QtSensors-bundled
+CONFIG += bundled_jar_file
+include(jar.pri)
diff --git a/src/plugins/sensors/android/jar/distributedjar.pro b/src/plugins/sensors/android/jar/distributedjar.pro
new file mode 100644
index 00000000..2099826a
--- /dev/null
+++ b/src/plugins/sensors/android/jar/distributedjar.pro
@@ -0,0 +1,2 @@
+TARGET = QtSensors
+include(jar.pri)
diff --git a/src/plugins/sensors/android/jar/jar.pri b/src/plugins/sensors/android/jar/jar.pri
new file mode 100644
index 00000000..7e5916c8
--- /dev/null
+++ b/src/plugins/sensors/android/jar/jar.pri
@@ -0,0 +1,13 @@
+load(qt_build_paths)
+
+CONFIG += java
+DESTDIR = $$MODULE_BASE_OUTDIR/jar
+
+JAVACLASSPATH += $$PWD/src
+
+JAVASOURCES += \
+    $$PWD/src/org/qtproject/qt5/android/sensors/QtSensors.java
+
+# install
+target.path = $$[QT_INSTALL_PREFIX]/jar
+INSTALLS += target
diff --git a/src/plugins/sensors/android/jar/jar.pro b/src/plugins/sensors/android/jar/jar.pro
index 82f945b2..70373fe1 100644
--- a/src/plugins/sensors/android/jar/jar.pro
+++ b/src/plugins/sensors/android/jar/jar.pro
@@ -1,14 +1,3 @@
-load(qt_build_paths)
+TEMPLATE = subdirs
+SUBDIRS += bundledjar.pro distributedjar.pro
 
-CONFIG += java
-TARGET = QtSensors
-DESTDIR = $$MODULE_BASE_OUTDIR/jar
-
-JAVACLASSPATH += $$PWD/src
-
-JAVASOURCES += \
-    $$PWD/src/org/qtproject/qt5/android/sensors/QtSensors.java
-
-# install
-target.path = $$[QT_INSTALL_PREFIX]/jar
-INSTALLS += target
diff --git a/src/plugins/sensors/blackberry/bbmagnetometer.cpp b/src/plugins/sensors/blackberry/bbmagnetometer.cpp
index 45fd49b3..a58dfe91 100644
--- a/src/plugins/sensors/blackberry/bbmagnetometer.cpp
+++ b/src/plugins/sensors/blackberry/bbmagnetometer.cpp
@@ -56,9 +56,7 @@ bool BbMagnetometer::updateReadingFromEvent(const sensor_event_t &event, QMagnet
     float x, y, z;
 
     QMagnetometer * const magnetometer = qobject_cast<QMagnetometer *>(sensor());
-    Q_ASSERT(magnetometer);
-    const bool returnGeoValues = magnetometer->returnGeoValues();
-    if (returnGeoValues) {
+    if (magnetometer && magnetometer->returnGeoValues()) {
         switch (event.accuracy) {
         case SENSOR_ACCURACY_UNRELIABLE: reading->setCalibrationLevel(0.0f); break;
         case SENSOR_ACCURACY_LOW:        reading->setCalibrationLevel(0.1f); break;
diff --git a/src/plugins/sensors/dummy/main.cpp b/src/plugins/sensors/dummy/main.cpp
index 89f07fc6..062033d6 100644
--- a/src/plugins/sensors/dummy/main.cpp
+++ b/src/plugins/sensors/dummy/main.cpp
@@ -55,7 +55,6 @@ class dummySensorPlugin : public QObject, public QSensorPluginInterface, public
 public:
     void registerSensors()
     {
-        qDebug() << "loaded the dummy plugin";
         QSensorManager::registerBackend(QAccelerometer::type, dummyaccelerometer::id, this);
         QSensorManager::registerBackend(QAmbientLightSensor::type, dummylightsensor::id, this);
     }
diff --git a/src/plugins/sensors/linux/main.cpp b/src/plugins/sensors/linux/main.cpp
index 7e9ece5c..0ce90f36 100644
--- a/src/plugins/sensors/linux/main.cpp
+++ b/src/plugins/sensors/linux/main.cpp
@@ -56,7 +56,6 @@ class LinuxSensorPlugin : public QObject, public QSensorPluginInterface, public
 public:
     void registerSensors()
     {
-        qDebug() << "loaded the Linux plugin";
         QString path = QString::fromLatin1(qgetenv("QT_ACCEL_FILEPATH"));
         if (!path.isEmpty() && !QSensorManager::isBackendRegistered(QAccelerometer::type, LinuxSysAccelerometer::id))
             QSensorManager::registerBackend(QAccelerometer::type, LinuxSysAccelerometer::id, this);