diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-05-05 06:39:46 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-05-05 06:39:46 (GMT) |
commit | 89b4f1eb2bae2f09a9db8094db91a7dabdcdb0a3 (patch) | |
tree | d4408271cf6c31464054b01d3ea8c803e49c06b1 /src/declarative/graphicsitems/qdeclarativegridview.cpp | |
parent | ab030e931e05a060b4f6fabf4235f05aeb0c252c (diff) | |
parent | f5e3e21e95275a8cf31cddf2063dfa497e92872e (diff) | |
download | Qt-89b4f1eb2bae2f09a9db8094db91a7dabdcdb0a3.zip Qt-89b4f1eb2bae2f09a9db8094db91a7dabdcdb0a3.tar.gz Qt-89b4f1eb2bae2f09a9db8094db91a7dabdcdb0a3.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativegridview.cpp')
-rw-r--r-- | src/declarative/graphicsitems/qdeclarativegridview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp index 528cb22..ef6d3df 100644 --- a/src/declarative/graphicsitems/qdeclarativegridview.cpp +++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp @@ -964,7 +964,7 @@ QDeclarativeGridView::~QDeclarativeGridView() id: wrapper GridView.onRemove: SequentialAnimation { PropertyAction { target: wrapper; property: "GridView.delayRemove"; value: true } - NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: "InOutQuad" } + NumberAnimation { target: wrapper; property: "scale"; to: 0; duration: 250; easing.type: Easing.InOutQuad } PropertyAction { target: wrapper; property: "GridView.delayRemove"; value: false } } } |