diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-20 08:04:29 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-20 08:04:29 (GMT) |
| commit | 30b45ba2b11342a9e7cc06b68237b68a68955213 (patch) | |
| tree | 1018c188375b3217b31abe9b7a0883ee1184a447 /tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml | |
| parent | ce27cf24539e0c7971937e55d8539496ad51ee52 (diff) | |
| parent | 8f10ca802dee1ed110f301191c4a56a85575033c (diff) | |
| download | Qt-30b45ba2b11342a9e7cc06b68237b68a68955213.zip Qt-30b45ba2b11342a9e7cc06b68237b68a68955213.tar.gz Qt-30b45ba2b11342a9e7cc06b68237b68a68955213.tar.bz2 | |
Merge remote branch 'origin/master' into qt-master-from-4.6
Conflicts:
configure.exe
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
Diffstat (limited to 'tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml')
| -rw-r--r-- | tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml b/tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml index 022019c..f6376a1 100644 --- a/tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml +++ b/tests/auto/declarative/qmlgraphicspositioners/data/grid-animated.qml @@ -7,12 +7,12 @@ Item { columns: 3 add: Transition { NumberAnimation { - matchProperties: "x,y"; + properties: "x,y"; } } move: Transition { NumberAnimation { - matchProperties: "x,y"; + properties: "x,y"; } } Rectangle { |