Changeset 846 for trunk/src/testlib/qtestsystem.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/testlib/qtestsystem.h (modified) (3 diffs)

trunk/src/testlib/qtestsystem.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -45 +45 @@
 #include <QtTest/qtestcase.h>
 #include <QtCore/qcoreapplication.h>
-#include <QtCore/qdatetime.h>
+#include <QtCore/qelapsedtimer.h>
 
 QT_BEGIN_HEADER
@@ -64 +64 @@
         Q_ASSERT(QCoreApplication::instance());
 
-        QTime timer;
+        QElapsedTimer timer;
         timer.start();
         do {