Merge remote-tracking branch 'origin/5.13' into dev

Change-Id: I7aa5284298990062fac9d9f1ab55d05f9b225ac9

2 files changed, 5 insertions, 5 deletions

diff --git a/tests/auto/qml/qqmlecmascript/testtypes.h b/tests/auto/qml/qqmlecmascript/testtypes.h
index 8d89df31db..4547a74470 100644
--- a/tests/auto/qml/qqmlecmascript/testtypes.h
+++ b/tests/auto/qml/qqmlecmascript/testtypes.h
@@ -1502,7 +1502,7 @@ public:
             }
             break;
         case Qt::OffsetFromUTC:
-            m_offset = m_datetime.utcOffset() / 60;
+            m_offset = m_datetime.offsetFromUtc() / 60;
             m_timespec = QString("%1%2:%3").arg(m_offset < 0 ? '-' : '+')
                                            .arg(abs(m_offset) / 60)
                                            .arg(abs(m_offset) % 60);
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
index 63bca255c2..dd73acc815 100644
--- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
+++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
@@ -517,22 +517,22 @@ void tst_qqmlecmascript::exportDate_data()
     QTest::newRow("UTC late") << testFileUrl("exportDate.4.qml") << QDateTime(date, late, Qt::UTC);
     {
         QDateTime dt(date, early, Qt::OffsetFromUTC);
-        dt.setUtcOffset(offset);
+        dt.setOffsetFromUtc(offset);
         QTest::newRow("+11:30 early") << testFileUrl("exportDate.5.qml") << dt;
     }
     {
         QDateTime dt(date, late, Qt::OffsetFromUTC);
-        dt.setUtcOffset(offset);
+        dt.setOffsetFromUtc(offset);
         QTest::newRow("+11:30 late") << testFileUrl("exportDate.6.qml") << dt;
     }
     {
         QDateTime dt(date, early, Qt::OffsetFromUTC);
-        dt.setUtcOffset(-offset);
+        dt.setOffsetFromUtc(-offset);
         QTest::newRow("-11:30 early") << testFileUrl("exportDate.7.qml") << dt;
     }
     {
         QDateTime dt(date, late, Qt::OffsetFromUTC);
-        dt.setUtcOffset(-offset);
+        dt.setOffsetFromUtc(-offset);
         QTest::newRow("-11:30 late") << testFileUrl("exportDate.8.qml") << dt;
     }
 }