diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-14 03:37:59 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-14 03:37:59 (GMT) |
| commit | 3340b23699f0286876f1e237a66bdc85076fe191 (patch) | |
| tree | e7e50f2cb15297f4d8cc0ecb5d16a27399fa5aeb /src/declarative/util/qdeclarativestateoperations.cpp | |
| parent | bea52aaaaf188293a5e235d5b5f96b386efba5ac (diff) | |
| parent | 5cd963d2628ed7c01d331cdad03b4d77161c8b93 (diff) | |
| download | Qt-3340b23699f0286876f1e237a66bdc85076fe191.zip Qt-3340b23699f0286876f1e237a66bdc85076fe191.tar.gz Qt-3340b23699f0286876f1e237a66bdc85076fe191.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativestateoperations.cpp')
| -rw-r--r-- | src/declarative/util/qdeclarativestateoperations.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp index a93a25d..a6fcaf3 100644 --- a/src/declarative/util/qdeclarativestateoperations.cpp +++ b/src/declarative/util/qdeclarativestateoperations.cpp @@ -408,7 +408,7 @@ void QDeclarativeParentChange::saveOriginals() d->origStackBefore = d->rewindStackBefore; } -void QDeclarativeParentChange::copyOriginals(QDeclarativeActionEvent *other) +/*void QDeclarativeParentChange::copyOriginals(QDeclarativeActionEvent *other) { Q_D(QDeclarativeParentChange); QDeclarativeParentChange *pc = static_cast<QDeclarativeParentChange*>(other); @@ -417,7 +417,7 @@ void QDeclarativeParentChange::copyOriginals(QDeclarativeActionEvent *other) d->origStackBefore = pc->d_func()->rewindStackBefore; saveCurrentValues(); -} +}*/ void QDeclarativeParentChange::execute(Reason) { |