From 0c0afc25be3267dddddc63f0cf17c1fba4d5e69d Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Thu, 14 Jan 2010 10:27:24 +1000
Subject: Update pointer benchmark to use QmlGuard rather than QGuard.

---
 src/declarative/qml/qmldeclarativedata_p.h             | 2 +-
 tests/benchmarks/declarative/pointers/pointers.pro     | 1 +
 tests/benchmarks/declarative/pointers/tst_pointers.cpp | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/declarative/qml/qmldeclarativedata_p.h b/src/declarative/qml/qmldeclarativedata_p.h
index 21111dd..e2717e0 100644
--- a/src/declarative/qml/qmldeclarativedata_p.h
+++ b/src/declarative/qml/qmldeclarativedata_p.h
@@ -63,7 +63,7 @@ class QmlCompiledData;
 class QmlAbstractBinding;
 class QmlContext;
 class QmlPropertyCache;
-class QmlDeclarativeData : public QDeclarativeData
+class Q_AUTOTEST_EXPORT QmlDeclarativeData : public QDeclarativeData
 {
 public:
     QmlDeclarativeData(QmlContext *ctxt = 0)
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;
     }
 }
-- 
cgit v0.12