diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2010-11-23 11:26:54 (GMT) |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2010-11-23 11:26:54 (GMT) |
| commit | 802498fcd43558a10bb7477d3957cdd27fd8ec09 (patch) | |
| tree | c40ddd859b032ffa7ed9c6df1173312c0bb1947d /tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml | |
| parent | 901fee7e610ec53f744416aeeca89c4605923120 (diff) | |
| parent | 538e7b8ddf45936bb274ed3230b591b3459edfa7 (diff) | |
| download | Qt-802498fcd43558a10bb7477d3957cdd27fd8ec09.zip Qt-802498fcd43558a10bb7477d3957cdd27fd8ec09.tar.gz Qt-802498fcd43558a10bb7477d3957cdd27fd8ec09.tar.bz2 | |
Merge remote branch 'qt/master' into file-engine-refactor
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/corelib/io/io.pri
src/corelib/io/qfsfileengine.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qfsfileengine_win.cpp
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtDeclarativeu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qapplication/test/test.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qdiriterator/qdiriterator.pro
tests/auto/qsound/qsound.pro
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml index ce516ac..4374b84 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativepathview/test-pathview.qml @@ -1,7 +1,7 @@ import QtQuick 1.0 Rectangle { - width: 800; height: 450 + width: 580; height: 220 ListModel { id: rssModel @@ -19,7 +19,7 @@ Rectangle { id: photoDelegate Rectangle { id: wrapper - width: 85; height: 85; color: lColor + width: 65; height: 65; color: lColor scale: wrapper.PathView.scale MouseArea { anchors.fill: parent } @@ -33,7 +33,8 @@ Rectangle { PathView { id: photoPathView; model: rssModel; delegate: photoDelegate - y: 100; width: 800; height: 330; pathItemCount: 10; z: 1 + anchors.fill: parent; z: 1 + anchors.topMargin:40 path: Path { startX: -50; startY: 40; @@ -41,18 +42,18 @@ Rectangle { PathAttribute { name: "angle"; value: -45 } PathCubic { - x: 400; y: 220 - control1X: 140; control1Y: 40 - control2X: 210; control2Y: 220 + x: 300; y: 140 + control1X: 90; control1Y: 30 + control2X: 140; control2Y: 150 } PathAttribute { name: "scale"; value: 1.2 } PathAttribute { name: "angle"; value: 0 } PathCubic { - x: 850; y: 40 - control2X: 660; control2Y: 40 - control1X: 590; control1Y: 220 + x: 600; y: 30 + control2X: 440; control2Y: 30 + control1X: 420; control1Y: 150 } PathAttribute { name: "scale"; value: 0.5 } |