diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:31:22 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-02 10:31:22 +0200 |
| commit | b421290b67507cfe125db206f378fc1b38eaae4e (patch) | |
| tree | c3545d82d65b3b207e80446013f0499ddf0617f8 /src/plugins/sensors/simulator/simulatoraccelerometer.cpp | |
| parent | 614326721259f1424981444ec84b6b9f4d6400ef (diff) | |
| parent | beac0b2e3ea4b292f0473c00bcf68d75360f89ef (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Conflicts:
.qmake.conf
Change-Id: I4be6cbe9e4ac981f46b3c45d271cac5c7fc677cb
Diffstat (limited to 'src/plugins/sensors/simulator/simulatoraccelerometer.cpp')
| -rw-r--r-- | src/plugins/sensors/simulator/simulatoraccelerometer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/sensors/simulator/simulatoraccelerometer.cpp b/src/plugins/sensors/simulator/simulatoraccelerometer.cpp index 9d2c9290..481128f4 100644 --- a/src/plugins/sensors/simulator/simulatoraccelerometer.cpp +++ b/src/plugins/sensors/simulator/simulatoraccelerometer.cpp @@ -54,7 +54,7 @@ void SimulatorAccelerometer::poll() QtMobility::QAccelerometerReadingData data = SensorsConnection::instance()->qtAccelerometerData; quint64 newTimestamp; if (!data.timestamp.isValid()) - newTimestamp = QDateTime::currentDateTime().toTime_t(); + newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000; else newTimestamp = data.timestamp.toTime_t(); if (m_reading.x() != data.x |