diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | examples/script/qstetrix/main.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1efc04d..a555316 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ android|boot2qt: CONFIG -= headersclean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.13.0 +MODULE_VERSION = 5.14.0 diff --git a/examples/script/qstetrix/main.cpp b/examples/script/qstetrix/main.cpp index 2d71048..43f32b4 100644 --- a/examples/script/qstetrix/main.cpp +++ b/examples/script/qstetrix/main.cpp @@ -148,7 +148,6 @@ int main(int argc, char *argv[]) ui->resize(550, 370); ui->show(); - qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); return app.exec(); //! [4] } diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index 195fe0c..35f0555 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -1524,7 +1524,7 @@ void tst_QScriptValue::toDateTime() QDateTime dt = eng.evaluate("new Date(0)").toDateTime(); QVERIFY(dt.isValid()); QCOMPARE(dt.timeSpec(), Qt::LocalTime); - QCOMPARE(dt.toUTC(), QDateTime(QDate(1970, 1, 1), QTime(0, 0, 0), Qt::UTC)); + QCOMPARE(dt.toUTC(), QDateTime::fromMSecsSinceEpoch(0, Qt::UTC)); QVERIFY(!eng.evaluate("[]").toDateTime().isValid()); QVERIFY(!eng.evaluate("{}").toDateTime().isValid()); |