diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-12 09:48:39 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-12 10:21:39 +0100 |
| commit | 19d7ab8d277500e88baf3b23edd62dee4d5d9c46 (patch) | |
| tree | b5589d3797c263adc057e2583f9a94e5801b4e21 /src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp | |
| parent | 26446d7dc33c44e2f84fe95381f02aca87c1a537 (diff) | |
| parent | 2c595c382c50a5632b14eda00d85a9b7fcb09b5d (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/sensors/ios/ios.pro
Change-Id: I8d9ca692713c8ba5d8c243371474b0e61630b05e
Diffstat (limited to 'src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp')
| -rw-r--r-- | src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp b/src/plugins/sensors/sensorfw/sensorfwlightsensor.cpp index babbf9ef..9fc5bef3 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(); } |