diff options
author | Robin Burchell <robin+git@viroteck.net> | 2014-07-17 14:07:15 +0000 |
---|---|---|
committer | Robin Burchell <robin+qt@viroteck.net> | 2014-07-17 19:39:13 +0200 |
commit | c5a18346589b88ed9fc7970ad0857aef9d333b69 (patch) | |
tree | 3a7da749e2882919de8abf1e5e3696689c1597fa | |
parent | 9f377d1fa286817a17a5e5de3786a2d73aeaa822 (diff) | |
download | qtsensors-c5a18346589b88ed9fc7970ad0857aef9d333b69.tar.gz qtsensors-c5a18346589b88ed9fc7970ad0857aef9d333b69.tar.bz2 qtsensors-c5a18346589b88ed9fc7970ad0857aef9d333b69.zip |
Restore setting of sensors interface.
Change I5c1bf3999ad2268c0dba9b3fe511d999c2e63fd9's forward porting from Qt 5.1
removed this, thus the interface was never set, thus sensors all broke.
Change-Id: If3b14b5ebd20e6cb64bc2000b23a2c1e37d36b05
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
-rw-r--r-- | src/plugins/sensors/sensorfw/sensorfwsensorbase.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h index 26bc4aa..39e4147 100644 --- a/src/plugins/sensors/sensorfw/sensorfwsensorbase.h +++ b/src/plugins/sensors/sensorfw/sensorfwsensorbase.h @@ -90,6 +90,10 @@ protected: } m_remoteSensorManager->registerSensorInterface<T>(name); } + m_sensorInterface = T::controlInterface(name); + if (!m_sensorInterface) { + m_sensorInterface = const_cast<T*>(T::listenInterface(name)); + } initDone = initSensorInterface(name); }; |