diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-17 23:00:11 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-11-17 23:00:11 (GMT) |
| commit | 7727a0288c1ffb40ecff13e7bfc49ce99b984633 (patch) | |
| tree | d94518fa3c56bdfc07f015e2acf779904dbe648d /tests/auto/declarative/qmlvisual/rect/MyRect.qml | |
| parent | 569b076bb650c5082109d6406616c7536ac9f79f (diff) | |
| parent | cca7c5b40751e2192ba2c7c7422557eeb5672a17 (diff) | |
| download | Qt-7727a0288c1ffb40ecff13e7bfc49ce99b984633.zip Qt-7727a0288c1ffb40ecff13e7bfc49ce99b984633.tar.gz Qt-7727a0288c1ffb40ecff13e7bfc49ce99b984633.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'tests/auto/declarative/qmlvisual/rect/MyRect.qml')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/rect/MyRect.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qmlvisual/rect/MyRect.qml b/tests/auto/declarative/qmlvisual/rect/MyRect.qml index a595f7d..99226d3 100644 --- a/tests/auto/declarative/qmlvisual/rect/MyRect.qml +++ b/tests/auto/declarative/qmlvisual/rect/MyRect.qml @@ -9,11 +9,11 @@ Item { property int borderWidth property bool smooth: false - width: 80; height: 80 + width: 40; height: 40 Item { anchors.centerIn: parent; rotation: rect.rotation; Rectangle { - anchors.centerIn: parent; width: 80; height: 80 + anchors.centerIn: parent; width: 40; height: 40 color: rect.color; border.color: rect.border; border.width: rect.border != Qt.rgba(0,0,0,0) ? 2 : 0 radius: rect.radius; smooth: rect.smooth } |