diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-03-01 23:49:27 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-03-01 23:49:27 (GMT) |
| commit | d943ce63bd962763205796cfb5bf960e1228a0b3 (patch) | |
| tree | 1cb7c259ab1fa0a80d9e83d5add6e45fa0c8220e /src/declarative/util/qdeclarativeview.cpp | |
| parent | 001d1a2eac5b0fe63ae9809c4c69065b7ae14f38 (diff) | |
| download | Qt-d943ce63bd962763205796cfb5bf960e1228a0b3.zip Qt-d943ce63bd962763205796cfb5bf960e1228a0b3.tar.gz Qt-d943ce63bd962763205796cfb5bf960e1228a0b3.tar.bz2 | |
Replace remaining QGuard usage with QDeclarativeGuard.
Diffstat (limited to 'src/declarative/util/qdeclarativeview.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativeview.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp index a3c372d..f08e634 100644 --- a/src/declarative/util/qdeclarativeview.cpp +++ b/src/declarative/util/qdeclarativeview.cpp @@ -51,6 +51,7 @@ #include <qdeclarativedebug_p.h> #include <qdeclarativedebugservice_p.h> #include <qdeclarativeglobal_p.h> +#include <qdeclarativeguard_p.h> #include <qscriptvalueiterator.h> #include <qdebug.h> @@ -136,8 +137,8 @@ public: QDeclarativeView *q; - QGuard<QGraphicsObject> root; - QGuard<QDeclarativeItem> qmlRoot; + QDeclarativeGuard<QGraphicsObject> root; + QDeclarativeGuard<QDeclarativeItem> qmlRoot; QUrl source; |