diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-02 05:51:44 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-02 05:51:44 (GMT) |
| commit | b0607f042af4ebad70ca821036bd3f2beff3955e (patch) | |
| tree | 95bcd430b0a7a10bbe93643f410887f0793ea4ef /src/declarative | |
| parent | 2501c66e3795040d72a1922499294a686832e7a2 (diff) | |
| parent | 969daadd245153e8bb6c9a89a51565b83832f484 (diff) | |
| download | Qt-b0607f042af4ebad70ca821036bd3f2beff3955e.zip Qt-b0607f042af4ebad70ca821036bd3f2beff3955e.tar.gz Qt-b0607f042af4ebad70ca821036bd3f2beff3955e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/util/qdeclarativestate.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp index 9f4cc39..f7dae10 100644 --- a/src/declarative/util/qdeclarativestate.cpp +++ b/src/declarative/util/qdeclarativestate.cpp @@ -358,8 +358,10 @@ QDeclarativeStatePrivate::generateActionList(QDeclarativeStateGroup *group) cons if (!extends.isEmpty()) { QList<QDeclarativeState *> states = group->states(); for (int ii = 0; ii < states.count(); ++ii) - if (states.at(ii)->name() == extends) + if (states.at(ii)->name() == extends) { + qmlExecuteDeferred(states.at(ii)); applyList = static_cast<QDeclarativeStatePrivate*>(states.at(ii)->d_func())->generateActionList(group); + } } foreach(QDeclarativeStateOperation *op, operations) |