aboutsummaryrefslogtreecommitdiffstats
path: root/tests/benchmarks/declarative
diff options
context:
space:
mode:
Diffstat (limited to 'tests/benchmarks/declarative')
-rw-r--r--tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro8
-rw-r--r--tests/benchmarks/declarative/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp (renamed from tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp)32
-rw-r--r--tests/benchmarks/declarative/qperformancetimer/qperformancetimer.pro8
3 files changed, 24 insertions, 24 deletions
diff --git a/tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro b/tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro
new file mode 100644
index 0000000000..e9aea4f71c
--- /dev/null
+++ b/tests/benchmarks/declarative/qdeclarativedebugtrace/qdeclarativedebugtrace.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+QT += declarative
+TEMPLATE = app
+TARGET = tst_qdeclarativedebugtrace
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativedebugtrace.cpp
+
diff --git a/tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp b/tests/benchmarks/declarative/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp
index e52cd2e573..224e7b471f 100644
--- a/tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp
+++ b/tests/benchmarks/declarative/qdeclarativedebugtrace/tst_qdeclarativedebugtrace.cpp
@@ -39,16 +39,16 @@
**
****************************************************************************/
-#include <private/qperformancetimer_p.h>
+#include <QtCore/QElapsedTimer>
#include <QObject>
#include <qtest.h>
-class tst_qperformancetimer : public QObject
+class tst_qdeclarativedebugtrace : public QObject
{
Q_OBJECT
public:
- tst_qperformancetimer() {}
+ tst_qdeclarativedebugtrace() {}
private slots:
void all();
@@ -57,35 +57,35 @@ private slots:
void trace();
};
-void tst_qperformancetimer::all()
+void tst_qdeclarativedebugtrace::all()
{
QBENCHMARK {
- QPerformanceTimer t;
+ QElapsedTimer t;
t.start();
- t.elapsed();
+ t.nsecsElapsed();
}
}
-void tst_qperformancetimer::startElapsed()
+void tst_qdeclarativedebugtrace::startElapsed()
{
- QPerformanceTimer t;
+ QElapsedTimer t;
QBENCHMARK {
t.start();
- t.elapsed();
+ t.nsecsElapsed();
}
}
-void tst_qperformancetimer::doubleElapsed()
+void tst_qdeclarativedebugtrace::doubleElapsed()
{
- QPerformanceTimer t;
+ QElapsedTimer t;
t.start();
QBENCHMARK {
- t.elapsed();
- t.elapsed();
+ t.nsecsElapsed();
+ t.nsecsElapsed();
}
}
-void tst_qperformancetimer::trace()
+void tst_qdeclarativedebugtrace::trace()
{
QString s("A decent sized string of text here.");
QBENCHMARK {
@@ -95,6 +95,6 @@ void tst_qperformancetimer::trace()
}
}
-QTEST_MAIN(tst_qperformancetimer)
+QTEST_MAIN(tst_qdeclarativedebugtrace)
-#include "tst_qperformancetimer.moc"
+#include "tst_qdeclarativedebugtrace.moc"
diff --git a/tests/benchmarks/declarative/qperformancetimer/qperformancetimer.pro b/tests/benchmarks/declarative/qperformancetimer/qperformancetimer.pro
deleted file mode 100644
index a39cd3d979..0000000000
--- 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
-