diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:19:56 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-25 23:19:56 (GMT) |
| commit | b848c25000a3496dd1a3c4ffeb04786775cd4b50 (patch) | |
| tree | e10f1cc2f5e04b19681f7f5917313cca45a7e4bd /src/declarative/util/qmlstate.cpp | |
| parent | 2507dce1477e6d302838c546cfc1cf8cddd0b446 (diff) | |
| download | Qt-b848c25000a3496dd1a3c4ffeb04786775cd4b50.zip Qt-b848c25000a3496dd1a3c4ffeb04786775cd4b50.tar.gz Qt-b848c25000a3496dd1a3c4ffeb04786775cd4b50.tar.bz2 | |
Fix compile after merge from 4.6.
Diffstat (limited to 'src/declarative/util/qmlstate.cpp')
| -rw-r--r-- | src/declarative/util/qmlstate.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index e7149d5..a17d16e 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -281,7 +281,7 @@ QmlStatePrivate::generateActionList(QmlStateGroup *group) const QList<QmlState *> states = group->states(); for (int ii = 0; ii < states.count(); ++ii) if (states.at(ii)->name() == extends) - applyList = static_cast<QmlStatePrivate*>(states.at(ii)->d_ptr)->generateActionList(group); + applyList = static_cast<QmlStatePrivate*>(states.at(ii)->d_func())->generateActionList(group); } foreach(QmlStateOperation *op, operations) @@ -330,7 +330,7 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever if (revert) { QmlStatePrivate *revertPrivate = - static_cast<QmlStatePrivate*>(revert->d_ptr); + static_cast<QmlStatePrivate*>(revert->d_func()); d->revertList = revertPrivate->revertList; revertPrivate->revertList.clear(); } |