diff options
10 files changed, 20 insertions, 20 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1ed62c5a..db2e0b65 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.13.1 +MODULE_VERSION = 5.14.0 diff --git a/examples/sensors/grue/plugin/gruesensorimpl.h b/examples/sensors/grue/plugin/gruesensorimpl.h index 0847ed9c..8a4a9565 100644 --- a/examples/sensors/grue/plugin/gruesensorimpl.h +++ b/examples/sensors/grue/plugin/gruesensorimpl.h @@ -54,7 +54,7 @@ #include <qsensorbackend.h> #include "gruesensor.h" #include <qambientlightsensor.h> -#include <QTime> +#include <QElapsedTimer> QT_BEGIN_NAMESPACE class QTimer; @@ -79,7 +79,7 @@ private: GrueSensorReading m_reading; QAmbientLightSensor *lightSensor; QTimer *darkTimer; - QTime timer; + QElapsedTimer timer; QAmbientLightReading::LightLevel lightLevel; }; diff --git a/src/plugins/sensors/simulator/simulatoraccelerometer.cpp b/src/plugins/sensors/simulator/simulatoraccelerometer.cpp index 481128f4..280fc7ee 100644 --- a/src/plugins/sensors/simulator/simulatoraccelerometer.cpp +++ b/src/plugins/sensors/simulator/simulatoraccelerometer.cpp @@ -54,9 +54,9 @@ void SimulatorAccelerometer::poll() QtMobility::QAccelerometerReadingData data = SensorsConnection::instance()->qtAccelerometerData; quint64 newTimestamp; if (!data.timestamp.isValid()) - newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000; + newTimestamp = static_cast<quint64>(QDateTime::currentMSecsSinceEpoch()) / 1000; else - newTimestamp = data.timestamp.toTime_t(); + newTimestamp = static_cast<quint64>(data.timestamp.toSecsSinceEpoch()); if (m_reading.x() != data.x || m_reading.y() != data.y || m_reading.z() != data.z) { diff --git a/src/plugins/sensors/simulator/simulatorambientlightsensor.cpp b/src/plugins/sensors/simulator/simulatorambientlightsensor.cpp index 177684fe..5d84b36c 100644 --- a/src/plugins/sensors/simulator/simulatorambientlightsensor.cpp +++ b/src/plugins/sensors/simulator/simulatorambientlightsensor.cpp @@ -76,9 +76,9 @@ void SimulatorAmbientLightSensor::poll() quint64 newTimestamp; if (!data.timestamp.isValid()) - newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000; + newTimestamp = static_cast<quint64>(QDateTime::currentMSecsSinceEpoch()) / 1000; else - newTimestamp = data.timestamp.toTime_t(); + newTimestamp = static_cast<quint64>(data.timestamp.toSecsSinceEpoch()); if (m_reading.lightLevel() != convertedLightLevel) { m_reading.setTimestamp(newTimestamp); m_reading.setLightLevel(convertedLightLevel); diff --git a/src/plugins/sensors/simulator/simulatorcompass.cpp b/src/plugins/sensors/simulator/simulatorcompass.cpp index fc68c513..e9d0f1d7 100644 --- a/src/plugins/sensors/simulator/simulatorcompass.cpp +++ b/src/plugins/sensors/simulator/simulatorcompass.cpp @@ -54,9 +54,9 @@ void SimulatorCompass::poll() QtMobility::QCompassReadingData data = SensorsConnection::instance()->qtCompassData; quint64 newTimestamp; if (!data.timestamp.isValid()) - newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000; + newTimestamp = static_cast<quint64>(QDateTime::currentMSecsSinceEpoch()) / 1000; else - newTimestamp = data.timestamp.toTime_t(); + newTimestamp = static_cast<quint64>(data.timestamp.toSecsSinceEpoch()); if (m_reading.azimuth() != data.azimuth || m_reading.calibrationLevel() != data.calibrationLevel) { m_reading.setTimestamp(newTimestamp); diff --git a/src/plugins/sensors/simulator/simulatorirproximitysensor.cpp b/src/plugins/sensors/simulator/simulatorirproximitysensor.cpp index 4499128f..d041a86d 100644 --- a/src/plugins/sensors/simulator/simulatorirproximitysensor.cpp +++ b/src/plugins/sensors/simulator/simulatorirproximitysensor.cpp @@ -54,9 +54,9 @@ void SimulatorIRProximitySensor::poll() QtMobility::QIRProximityReadingData data = SensorsConnection::instance()->qtIRProximityData; quint64 newTimestamp; if (!data.timestamp.isValid()) - newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000; + newTimestamp = static_cast<quint64>(QDateTime::currentMSecsSinceEpoch()) / 1000; else - newTimestamp = data.timestamp.toTime_t(); + newTimestamp = static_cast<quint64>(data.timestamp.toSecsSinceEpoch()); if (m_reading.reflectance() != data.irProximity) { m_reading.setTimestamp(newTimestamp); m_reading.setReflectance(data.irProximity); diff --git a/src/plugins/sensors/simulator/simulatorlightsensor.cpp b/src/plugins/sensors/simulator/simulatorlightsensor.cpp index 40d9edbd..bb4dd94d 100644 --- a/src/plugins/sensors/simulator/simulatorlightsensor.cpp +++ b/src/plugins/sensors/simulator/simulatorlightsensor.cpp @@ -54,9 +54,9 @@ void SimulatorLightSensor::poll() QtMobility::QLightReadingData data = SensorsConnection::instance()->qtLightData; quint64 newTimestamp; if (!data.timestamp.isValid()) - newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000; + newTimestamp = static_cast<quint64>(QDateTime::currentMSecsSinceEpoch()) / 1000; else - newTimestamp = data.timestamp.toTime_t(); + newTimestamp = static_cast<quint64>(data.timestamp.toSecsSinceEpoch()); if (m_reading.lux() != data.lux) { m_reading.setTimestamp(newTimestamp); m_reading.setLux(data.lux); diff --git a/src/plugins/sensors/simulator/simulatormagnetometer.cpp b/src/plugins/sensors/simulator/simulatormagnetometer.cpp index 64a31776..b54525ab 100644 --- a/src/plugins/sensors/simulator/simulatormagnetometer.cpp +++ b/src/plugins/sensors/simulator/simulatormagnetometer.cpp @@ -54,9 +54,9 @@ void SimulatorMagnetometer::poll() QtMobility::QMagnetometerReadingData data = SensorsConnection::instance()->qtMagnetometerData; quint64 newTimestamp; if (!data.timestamp.isValid()) - newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000; + newTimestamp = static_cast<quint64>(QDateTime::currentMSecsSinceEpoch()) / 1000; else - newTimestamp = data.timestamp.toTime_t(); + newTimestamp = static_cast<quint64>(data.timestamp.toSecsSinceEpoch()); if (m_reading.x() != data.x || m_reading.y() != data.y || m_reading.z() != data.z diff --git a/src/plugins/sensors/simulator/simulatorproximitysensor.cpp b/src/plugins/sensors/simulator/simulatorproximitysensor.cpp index b4430959..6a28ce52 100644 --- a/src/plugins/sensors/simulator/simulatorproximitysensor.cpp +++ b/src/plugins/sensors/simulator/simulatorproximitysensor.cpp @@ -54,9 +54,9 @@ void SimulatorProximitySensor::poll() QtMobility::QProximityReadingData data = SensorsConnection::instance()->qtProximityData; quint64 newTimestamp; if (!data.timestamp.isValid()) - newTimestamp = QDateTime::currentMSecsSinceEpoch() / 1000; + newTimestamp = static_cast<quint64>(QDateTime::currentMSecsSinceEpoch() / 1000; else - newTimestamp = data.timestamp.toTime_t(); + newTimestamp = static_cast<quint64>(data.timestamp.toSecsSinceEpoch(); if (m_reading.close() != data.close) { m_reading.setTimestamp(newTimestamp); m_reading.setClose(data.close); diff --git a/tests/auto/qsensor/tst_qsensor.cpp b/tests/auto/qsensor/tst_qsensor.cpp index 911e9c2c..8e027971 100644 --- a/tests/auto/qsensor/tst_qsensor.cpp +++ b/tests/auto/qsensor/tst_qsensor.cpp @@ -139,7 +139,7 @@ private slots: QList<QByteArray> expected; expected << TestSensor::type << TestSensor2::type; QList<QByteArray> actual = QSensor::sensorTypes(); - qSort(actual); // The actual list is not in a defined order + std::sort(actual.begin(), actual.end()); // The actual list is not in a defined order QCOMPARE(actual, expected); } @@ -148,7 +148,7 @@ private slots: QList<QByteArray> expected; expected << "test sensor 2" << "test sensor 3" << testsensorimpl::id; QList<QByteArray> actual = QSensor::sensorsForType(TestSensor::type); - qSort(actual); // The actual list is not in a defined order + std::sort(actual.begin(), actual.end()); // The actual list is not in a defined order QCOMPARE(actual, expected); } @@ -776,7 +776,7 @@ private slots: QList<QByteArray> expected; expected << TestSensor::type << TestSensor2::type; QList<QByteArray> actual = QSensor::sensorTypes(); - qSort(actual); // The actual list is not in a defined order + std::sort(actual.begin(), actual.end()); // The actual list is not in a defined order QCOMPARE(actual, expected); } |