diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:49:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-02 13:49:24 +0200 |
| commit | 556c25d95adc43d9d7e4532ab23118ba125f8a5a (patch) | |
| tree | b94ea64cfea831770b3bc6865dc133f1568a02f0 /src/plugins | |
| parent | f835e172519fbf78a319273bd9dd4411376a3395 (diff) | |
| parent | 6a16281aceedb713676e16c3074e6f7ea1e70b79 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ic4c5a95a53ff695b879314cd2d6092bcbe427d94
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sensors/sensorfw/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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); } } |