diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:59 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:59 +0100 |
commit | 93ab7107ebae0ca72c1632b665a199973ea278be (patch) | |
tree | ebddf15d7cb0822b68b14da53ed37d24520fe5cd | |
parent | 5858916b27bd261eaa5c3869bc46557e18bd8e02 (diff) | |
parent | fc60f53817d3182c545cef15e3ab94a85ef01379 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I11b81861a0dcd8380374060161550690812ff96d
-rw-r--r-- | dist/changes-5.6.3 | 29 | ||||
-rw-r--r-- | dist/changes-5.9.2 | 24 | ||||
-rw-r--r-- | src/plugins/sensors/dummy/dummylightsensor.cpp | 2 |
3 files changed, 54 insertions, 1 deletions
diff --git a/dist/changes-5.6.3 b/dist/changes-5.6.3 new file mode 100644 index 00000000..686fbc6f --- /dev/null +++ b/dist/changes-5.6.3 @@ -0,0 +1,29 @@ +Qt 5.6.3 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.6.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://doc.qt.io/qt-5/index.html + +The Qt version 5.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + + +QtSensors +--------- + + - [QTBUG-57184] Fixed incorrect accuracy levels of QMagnetometer on Android. + - Improved QMagnetometerReading documentation (broken link) diff --git a/dist/changes-5.9.2 b/dist/changes-5.9.2 new file mode 100644 index 00000000..24beba48 --- /dev/null +++ b/dist/changes-5.9.2 @@ -0,0 +1,24 @@ +Qt 5.9.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.9.2 Changes * +**************************************************************************** + +- Use QDeadlineTimer to greatly simplify dummy plugin diff --git a/src/plugins/sensors/dummy/dummylightsensor.cpp b/src/plugins/sensors/dummy/dummylightsensor.cpp index 47a1e752..8f2a9b8e 100644 --- a/src/plugins/sensors/dummy/dummylightsensor.cpp +++ b/src/plugins/sensors/dummy/dummylightsensor.cpp @@ -53,7 +53,7 @@ dummylightsensor::dummylightsensor(QSensor *sensor) void dummylightsensor::poll() { m_reading.setTimestamp(getTimestamp()); - if (QRandomGenerator::bounded(100) == 0) + if (QRandomGenerator::global()->bounded(100) == 0) m_reading.setLightLevel(QAmbientLightReading::Dark); else m_reading.setLightLevel(QAmbientLightReading::Light); |