diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 07:59:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 07:59:52 (GMT) |
| commit | b70dd15c635990306bab35e440d7b561cac7c67e (patch) | |
| tree | b77966b6e81063257cff343bc61ba9c0dc4cb9b3 /src/declarative/util/qdeclarativestateoperations_p.h | |
| parent | b915d0aa46599f707df4db6eb33965602a2d7422 (diff) | |
| parent | d9ab23c190de774ea093652060981e14ac5aeaf8 (diff) | |
| download | Qt-b70dd15c635990306bab35e440d7b561cac7c67e.zip Qt-b70dd15c635990306bab35e440d7b561cac7c67e.tar.gz Qt-b70dd15c635990306bab35e440d7b561cac7c67e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Qt.include() support in worker scripts
Only add "include" property in non-workerscript threads
Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89
Reduce the chance of AnchorAnimation animating geometry changes it
Add Qt.include() method for scoped inclusion of JavaScript files
Fix crash in ParentAnimation.
Revert "Fix crash in ParentAnimation."
Symbian build fix to declarative auto and benchmark tests
Revert "Use raster graphicssystem for qml.app on OS X."
Fix crash in ParentAnimation.
Minor declarative webview tweaks
Removed dependency of QDeclarativeWebView to private Qt (Declarative) API
Note that you need to unset a flag to create a visual item
Follow-up on Flickable changes.
ListModel::get() should return undefined if bad index specified
Add an example spinner.
Fix crash on remote content.
Dates and variants are not considered nested objects
Diffstat (limited to 'src/declarative/util/qdeclarativestateoperations_p.h')
| -rw-r--r-- | src/declarative/util/qdeclarativestateoperations_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativestateoperations_p.h b/src/declarative/util/qdeclarativestateoperations_p.h index e22c1e2..21a86f5 100644 --- a/src/declarative/util/qdeclarativestateoperations_p.h +++ b/src/declarative/util/qdeclarativestateoperations_p.h @@ -107,7 +107,7 @@ public: virtual ActionList actions(); virtual void saveOriginals(); - virtual void copyOriginals(QDeclarativeActionEvent*); + //virtual void copyOriginals(QDeclarativeActionEvent*); virtual void execute(Reason reason = ActualChange); virtual bool isReversable(); virtual void reverse(Reason reason = ActualChange); @@ -277,6 +277,7 @@ public: virtual bool override(QDeclarativeActionEvent*other); virtual bool changesBindings(); virtual void saveOriginals(); + virtual bool needsCopy() { return true; } virtual void copyOriginals(QDeclarativeActionEvent*); virtual void clearBindings(); virtual void rewind(); |