diff options
| author | Bea Lam <bea.lam@nokia.com> | 2010-05-19 07:10:14 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2010-05-19 07:10:14 (GMT) |
| commit | d395903e4d061a30117f7b925bdad41771a29067 (patch) | |
| tree | e7e2e2d09afc77af51197f5d4954249b21ee9a44 /src/declarative/util | |
| parent | 8238ef5d6648ca8fde2c709d6125772cac6a11a5 (diff) | |
| parent | f5588a2177452de29804e67ae8cd45c50f6dfdba (diff) | |
| download | Qt-d395903e4d061a30117f7b925bdad41771a29067.zip Qt-d395903e4d061a30117f7b925bdad41771a29067.tar.gz Qt-d395903e4d061a30117f7b925bdad41771a29067.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
doc/src/snippets/declarative/listview/highlight.qml
doc/src/snippets/declarative/listview/listview.qml
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qdeclarativestateoperations.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index b11c0c2..80ae5f5 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -69,7 +69,7 @@ public: rewindParent(0), rewindStackBefore(0) {} QDeclarativeItem *target; - QDeclarativeItem *parent; + QDeclarativeGuard<QDeclarativeItem> parent; QDeclarativeGuard<QDeclarativeItem> origParent; QDeclarativeGuard<QDeclarativeItem> origStackBefore; QDeclarativeItem *rewindParent; |