summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2010-01-14 00:27:24 (GMT)
committerMichael Brasser <michael.brasser@nokia.com>2010-01-14 00:27:24 (GMT)
commit0c0afc25be3267dddddc63f0cf17c1fba4d5e69d (patch)
tree3f655ffcd4c4fbbec1748fd885e078a2206e438b /tests
parent351060bd313220044b9323d59d56627e78deea9f (diff)
downloadQt-0c0afc25be3267dddddc63f0cf17c1fba4d5e69d.zip
Qt-0c0afc25be3267dddddc63f0cf17c1fba4d5e69d.tar.gz
Qt-0c0afc25be3267dddddc63f0cf17c1fba4d5e69d.tar.bz2
Update pointer benchmark to use QmlGuard rather than QGuard.
Diffstat (limited to 'tests')
-rw-r--r--tests/benchmarks/declarative/pointers/pointers.pro1
-rw-r--r--tests/benchmarks/declarative/pointers/tst_pointers.cpp8
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/benchmarks/declarative/pointers/pointers.pro b/tests/benchmarks/declarative/pointers/pointers.pro
index 6de6e31..5180a2a 100644
--- a/tests/benchmarks/declarative/pointers/pointers.pro
+++ b/tests/benchmarks/declarative/pointers/pointers.pro
@@ -1,4 +1,5 @@
load(qttest_p4)
+QT += declarative
TEMPLATE = app
TARGET = tst_pointers
macx:CONFIG -= app_bundle
diff --git a/tests/benchmarks/declarative/pointers/tst_pointers.cpp b/tests/benchmarks/declarative/pointers/tst_pointers.cpp
index 5026660..55c2e89 100644
--- a/tests/benchmarks/declarative/pointers/tst_pointers.cpp
+++ b/tests/benchmarks/declarative/pointers/tst_pointers.cpp
@@ -40,7 +40,7 @@
****************************************************************************/
#include <qtest.h>
-#include "private/qguard_p.h"
+#include "private/qmlguard_p.h"
#include <QWeakPointer>
class tst_pointers : public QObject
@@ -51,15 +51,15 @@ public:
tst_pointers() {}
private slots:
- void guard();
+ void qmlguard();
void weakPointer();
};
-void tst_pointers::guard()
+void tst_pointers::qmlguard()
{
QObject *obj = new QObject;
QBENCHMARK {
- QGuard<QObject> guardedObject;
+ QmlGuard<QObject> guardedObject;
guardedObject = obj;
}
}