Merge remote-tracking branch 'origin/5.5' into 5.6

Change-Id: Ic4c5a95a53ff695b879314cd2d6092bcbe427d94

2 files changed, 34 insertions, 1 deletions

diff --git a/dist/changes-5.5.1 b/dist/changes-5.5.1
new file mode 100644
index 00000000..57567d5c
--- /dev/null
+++ b/dist/changes-5.5.1
@@ -0,0 +1,32 @@
+Qt 5.5.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.5.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://doc.qt.io/qt-5.5/
+
+The Qt version 5.5 series is binary compatible with the 5.4.x series.
+Applications compiled for 5.4 will continue to run with 5.5.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                           Library                                        *
+****************************************************************************
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+Sensor Framework platforms
+--------------------------
+
+ - [QTBUG-47854] Fixed interaction between generic and sensorfw plugin.
+
diff --git a/src/plugins/sensors/sensorfw/main.cpp b/src/plugins/sensors/sensorfw/main.cpp
index b22b6474..9951f096 100644
--- a/src/plugins/sensors/sensorfw/main.cpp
+++ b/src/plugins/sensors/sensorfw/main.cpp
@@ -65,7 +65,8 @@ public:
         QStringList keys = settings.allKeys();
         for (int i=0,l=keys.size(); i<l; i++) {
             QString type = keys.at(i);
-            QSensorManager::registerBackend(type.toLocal8Bit(), settings.value(type).toByteArray(), this);
+            if (settings.value(type).toString().contains(QStringLiteral("sensorfw")))//register only ones we know
+                QSensorManager::registerBackend(type.toLocal8Bit(), settings.value(type).toByteArray(), this);
         }
     }