diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-18 01:19:33 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-11-18 01:19:33 (GMT) |
| commit | 051793b7558ed16dfcb84f62ce3bd4a1545906a7 (patch) | |
| tree | 2496fdaec40857e9982c93d18107e09e233145d4 /tests/auto/declarative/qmlvisual/rect/MyRect.qml | |
| parent | 14ddf44ce2fdd7195741b9683226a3cd774e17e4 (diff) | |
| parent | cca7c5b40751e2192ba2c7c7422557eeb5672a17 (diff) | |
| download | Qt-051793b7558ed16dfcb84f62ce3bd4a1545906a7.zip Qt-051793b7558ed16dfcb84f62ce3bd4a1545906a7.tar.gz Qt-051793b7558ed16dfcb84f62ce3bd4a1545906a7.tar.bz2 | |
Merge remote branch 'qt/4.7' into 4.7
Conflicts:
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
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 } |