diff options
author | Martin Jones <martin.jones@nokia.com> | 2009-10-06 23:56:02 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2009-10-06 23:56:02 (GMT) |
commit | b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7 (patch) | |
tree | ac169cc9df2ff639e81b15dcaf268ed09d2e16cb /src/declarative/util | |
parent | 5584feca163e91588f08b0aa1f3ae2817cd90823 (diff) | |
parent | d7fe798e022884dcbc58844e686a7d4fd39cf027 (diff) | |
download | Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.zip Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.tar.gz Qt-b8d72b6bf833ffd7e02afa1199a5d3beea8fe9a7.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util')
-rw-r--r-- | src/declarative/util/qmlstateoperations.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index a9a5bd5..921aa6c 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -208,9 +208,12 @@ void QmlParentChange::saveOriginals() d->origParent = d->target->parentItem(); - //try to determine the items original stack position so we can restore it - if (!d->origParent) + if (!d->origParent) { d->origStackBefore = 0; + return; + } + + //try to determine the item's original stack position so we can restore it int siblingIndex = ((AccessibleFxItem*)d->target)->siblingIndex() + 1; QList<QGraphicsItem*> children = d->origParent->childItems(); for (int i = 0; i < children.count(); ++i) { |