diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:55:49 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-26 12:55:49 +0100 |
commit | 07bf3002fecd493a47bfb97420d3c3fbe6ee1458 (patch) | |
tree | 26cc548ef1e8e079b8fe85c7ae4624d4362c45b3 /src/plugins/sensors/sensorfw | |
parent | 5bf1bd00335d0c95c54de426a02da2a98257fedb (diff) | |
parent | 4c5873b43a2d7d80a33374d89b870a67e7900eca (diff) | |
download | qtsensors-07bf3002fecd493a47bfb97420d3c3fbe6ee1458.tar.gz |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I912756c6bbecf7c55acd60d136ea6ce490118ebb
Diffstat (limited to 'src/plugins/sensors/sensorfw')
-rw-r--r-- | src/plugins/sensors/sensorfw/sensorfwals.cpp | 2 | ||||
-rw-r--r-- | src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/sensors/sensorfw/sensorfwals.cpp b/src/plugins/sensors/sensorfw/sensorfwals.cpp index 8946201..c43f764 100644 --- a/src/plugins/sensors/sensorfw/sensorfwals.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwals.cpp @@ -71,7 +71,7 @@ void Sensorfwals::start() void Sensorfwals::slotDataAvailable(const Unsigned& data) { - QAmbientLightReading::LightLevel level = getLightLevel(data.x()); + QAmbientLightReading::LightLevel level = getLightLevel(data.UnsignedData().value_); if (level != m_reading.lightLevel()) { m_reading.setLightLevel(level); m_reading.setTimestamp(data.UnsignedData().timestamp_); diff --git a/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp b/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp index babbf9e..9fc5bef 100644 --- a/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp +++ b/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp @@ -52,7 +52,7 @@ SensorfwLightSensor::SensorfwLightSensor(QSensor *sensor) void SensorfwLightSensor::slotDataAvailable(const Unsigned& data) { - m_reading.setLux(data.x()); + m_reading.setLux(data.UnsignedData().value_); m_reading.setTimestamp(data.UnsignedData().timestamp_); newReadingAvailable(); } |