Remove QPerformanceTimer now that QElapsedTimer contains the necessary bits

QPerformanceTimer was a copy of QElapsedTimer with some additional functionality
which has since been subsumed into QElapsedTimer, so remove the forked code.

(backport of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e from qtdeclarative)
(backport of d733f6a942e40e58ebc09f1d4414e2f8fa3f6a28 from qtquick1)

Change-Id: I261f0e957ffe3fc5fe42cd50672d2dd99b080f1e
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>

5 files changed, 1 insertions, 197 deletions

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 9cd2aa0..c9486b0 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -77,8 +77,7 @@ contains(QT_CONFIG, private_tests) {
            qdeclarativevisualdatamodel \
            qdeclarativeworkerscript \
            qdeclarativexmllistmodel \
-           qpacketprotocol \
-           qperformancetimer
+           qpacketprotocol
 }
 
 contains(QT_CONFIG, opengl): SUBDIRS += qmlshadersplugin
diff --git a/tests/auto/declarative/qperformancetimer/qperformancetimer.pro b/tests/auto/declarative/qperformancetimer/qperformancetimer.pro
deleted file mode 100644
index 656bf68..0000000
--- a/tests/auto/declarative/qperformancetimer/qperformancetimer.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
-SOURCES += tst_qperformancetimer.cpp
-macx:CONFIG -= app_bundle
-
-CONFIG += parallel_test
-
diff --git a/tests/auto/declarative/qperformancetimer/tst_qperformancetimer.cpp b/tests/auto/declarative/qperformancetimer/tst_qperformancetimer.cpp
deleted file mode 100644
index 57004cc..0000000
--- a/tests/auto/declarative/qperformancetimer/tst_qperformancetimer.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <private/qperformancetimer_p.h>
-#include <QObject>
-#include <qtest.h>
-
-class tst_qperformancetimer : public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_qperformancetimer() {}
-
-private slots:
-    void units();
-};
-
-void tst_qperformancetimer::units()
-{
-    QPerformanceTimer timer;
-    timer.start();
-    {
-        QTest::qWait(300);
-        qint64 elapsed = timer.elapsed();
-        QVERIFY(elapsed > 300000000 && elapsed < 310000000);
-    }
-    {
-        timer.start();
-        qint64 monotonic_start = -timer.elapsedToAbsoluteTime(0);
-        qint64 wait_ms = 300;
-        QTest::qWait(wait_ms);
-        qint64 elapsed1 = timer.elapsed();
-        qint64 elapsed2 = timer.elapsedToAbsoluteTime(monotonic_start + elapsed1);
-        qint64 diff = elapsed1 - elapsed2;
-        QVERIFY(diff == 0);
-    }
-}
-
-QTEST_MAIN(tst_qperformancetimer)
-
-#include "tst_qperformancetimer.moc"
diff --git a/tests/benchmarks/declarative/qperformancetimer/qperformancetimer.pro b/tests/benchmarks/declarative/qperformancetimer/qperformancetimer.pro
deleted file mode 100644
index a39cd3d..0000000
--- a/tests/benchmarks/declarative/qperformancetimer/qperformancetimer.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-load(qttest_p4)
-QT += declarative
-TEMPLATE = app
-TARGET = tst_qperformancetimer
-macx:CONFIG -= app_bundle
-
-SOURCES += tst_qperformancetimer.cpp
-
diff --git a/tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp b/tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp
deleted file mode 100644
index 587339a..0000000
--- a/tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <private/qperformancetimer_p.h>
-#include <QObject>
-#include <qtest.h>
-
-class tst_qperformancetimer : public QObject
-{
-    Q_OBJECT
-
-public:
-    tst_qperformancetimer() {}
-
-private slots:
-    void all();
-    void startElapsed();
-    void doubleElapsed();
-    void trace();
-};
-
-void tst_qperformancetimer::all()
-{
-    QBENCHMARK {
-        QPerformanceTimer t;
-        t.start();
-        t.elapsed();
-    }
-}
-
-void tst_qperformancetimer::startElapsed()
-{
-    QPerformanceTimer t;
-    QBENCHMARK {
-        t.start();
-        t.elapsed();
-    }
-}
-
-void tst_qperformancetimer::doubleElapsed()
-{
-    QPerformanceTimer t;
-    t.start();
-    QBENCHMARK {
-        t.elapsed();
-        t.elapsed();
-    }
-}
-
-void tst_qperformancetimer::trace()
-{
-    QString s("A decent sized string of text here.");
-    QBENCHMARK {
-        QByteArray data;
-        QDataStream ds(&data, QIODevice::WriteOnly);
-        ds << (qint64)100 << (int)5 << (int)5 << s;
-    }
-}
-
-QTEST_MAIN(tst_qperformancetimer)
-
-#include "tst_qperformancetimer.moc"