diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-06-26 10:53:07 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-06-27 09:36:41 +0000 |
| commit | 7bf3fb919d6ab212cdafd9832343b1a413eecd53 (patch) | |
| tree | c8ca62c6fd1f368af1744a848fdff8779fd95e75 | |
| parent | a3adc71865c4d6af1c6f1eb850dec708299ae3de (diff) | |
| download | qtscript-7bf3fb919d6ab212cdafd9832343b1a413eecd53.tar.gz | |
Remove usages of deprecated APIs from QDateTime
Replaced the deprecated QDateTime::toTime_t() with
QDateTime::toSecsSinceEpoch().
Task-number: QTBUG-76491
Change-Id: If5ae11025e083f37b1d5c4b10d45de735ec0f84c
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| -rw-r--r-- | examples/script/context2d/environment.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qscriptengine/tst_qscriptengine.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/script/context2d/environment.cpp b/examples/script/context2d/environment.cpp index 53b56fe..3afb759 100644 --- a/examples/script/context2d/environment.cpp +++ b/examples/script/context2d/environment.cpp @@ -506,7 +506,7 @@ QScriptValue Environment::newFakeDomEvent(const QString &type, const QScriptValu e.setProperty("target", target, QScriptValue::ReadOnly); e.setProperty("currentTarget", target, QScriptValue::ReadOnly); e.setProperty("eventPhase", 3); // bubbling - e.setProperty("timeStamp", QDateTime::currentDateTime().toTime_t()); + e.setProperty("timeStamp", static_cast<int>(QDateTime::currentDateTime().toSecsSinceEpoch())); // UIEvent e.setProperty("detail", 0, QScriptValue::ReadOnly); e.setProperty("view", m_engine->globalObject(), QScriptValue::ReadOnly); diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp index c4f81d4..e7ad7f8 100644 --- a/tests/auto/qscriptengine/tst_qscriptengine.cpp +++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp @@ -5783,7 +5783,7 @@ void tst_QScriptEngine::qRegExpInport() } } -static QByteArray msgDateRoundtripJSQtJS(int i, uint secs, +static QByteArray msgDateRoundtripJSQtJS(int i, qint64 secs, const QScriptValue &jsDate2, const QScriptValue &jsDate) { @@ -5803,7 +5803,7 @@ static QByteArray msgDateRoundtripJSQtJS(int i, uint secs, // effect at a given date (QTBUG-9770). void tst_QScriptEngine::dateRoundtripJSQtJS() { - uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t(); + qint64 secs = QDateTime(QDate(2009, 1, 1)).toUTC().toSecsSinceEpoch(); QScriptEngine eng; for (int i = 0; i < 8000; ++i) { QScriptValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0 * 1000.0)").arg(secs)); @@ -5828,7 +5828,7 @@ void tst_QScriptEngine::dateRoundtripQtJSQt() } } -static QByteArray msgDateConversionJSQt(int i, uint secs, +static QByteArray msgDateConversionJSQt(int i, qint64 secs, const QString &qtUTCDateStr, const QString &jsUTCDateStr, const QScriptValue &jsDate) @@ -5843,7 +5843,7 @@ static QByteArray msgDateConversionJSQt(int i, uint secs, void tst_QScriptEngine::dateConversionJSQt() { - uint secs = QDateTime(QDate(2009, 1, 1)).toUTC().toTime_t(); + qint64 secs = QDateTime(QDate(2009, 1, 1)).toUTC().toSecsSinceEpoch(); QScriptEngine eng; for (int i = 0; i < 8000; ++i) { QScriptValue jsDate = eng.evaluate(QString::fromLatin1("new Date(%0 * 1000.0)").arg(secs)); |