diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:51:54 +0200 |
| commit | 5efb5dac71baf7910be0ebf5debb2b0236adf8fe (patch) | |
| tree | e01842e7e0c86c57096a49012381bd37f69dad52 /src/plugins/sensors/sensorfw/main.cpp | |
| parent | 8bd96b78bdf3598549d9de4256af4df93781c528 (diff) | |
| parent | d8e357f75a05bce5e1286c94e2b1954f6591218e (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I4286dcb9262bf38960ff3852932012718aaa5d65
Diffstat (limited to 'src/plugins/sensors/sensorfw/main.cpp')
| -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); } } |