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

Change-Id: Id4997327cc01bd4bb397a463bdffbd15e80398ef

1 files changed, 2 insertions, 8 deletions

diff --git a/tests/auto/corelib/tools/qelapsedtimer/tst_qelapsedtimer.cpp b/tests/auto/corelib/tools/qelapsedtimer/tst_qelapsedtimer.cpp
index f2852f6a50..48e3745be4 100644
--- a/tests/auto/corelib/tools/qelapsedtimer/tst_qelapsedtimer.cpp
+++ b/tests/auto/corelib/tools/qelapsedtimer/tst_qelapsedtimer.cpp
@@ -48,12 +48,7 @@ static const int minResolution = 50; // the minimum resolution for the tests
 
 QDebug operator<<(QDebug s, const QElapsedTimer &t)
 {
-    union {
-        QElapsedTimer t;
-        struct { qint64 t1, t2; } i;
-    } copy;
-    copy.t = t;
-    s.nospace() << "(" <<  copy.i.t1 << ", " << copy.i.t2 << ")";
+    s.nospace() << "(" << t.msecsSinceReference() << ")";
     return s.space();
 }
 
@@ -81,8 +76,7 @@ void tst_QElapsedTimer::validity()
 {
     QElapsedTimer t;
 
-    t.invalidate();
-    QVERIFY(!t.isValid());
+    QVERIFY(!t.isValid()); // non-POD now, it should always start invalid
 
     t.start();
     QVERIFY(t.isValid());