From a7b94516e1412073eb9d3fb57e49315ef966b183 Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@gmail.com>
Date: Thu, 20 Aug 2015 16:00:05 +1000
Subject: Only register plugins that sensorfw plugin can instantiate

This makes it possible to use Tilt sensor from generic plugin.

Task-number: QTBUG-47854
Change-Id: I14883e8d4a18a56c52845a4a5172c8c46bfe385f
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
---
 src/plugins/sensors/sensorfw/main.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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);
         }
     }
 
-- 
cgit v1.2.3


From 6a16281aceedb713676e16c3074e6f7ea1e70b79 Mon Sep 17 00:00:00 2001
From: Alex Blasche <alexander.blasche@theqtcompany.com>
Date: Wed, 23 Sep 2015 13:40:28 +0200
Subject: Add changelog for QtSensors 5.5.1 release

Change-Id: I04d2fecc6bd53438eacc59154c32f09ce1c85b0d
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
---
 dist/changes-5.5.1 | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 dist/changes-5.5.1

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.
+
-- 
cgit v1.2.3