diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-13 23:00:19 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-13 23:00:19 (GMT) |
| commit | d0cf0603fa6f55f7655e5e4b2ea5a2cbc42a39fc (patch) | |
| tree | cf78d53c6ea98e13574bdbae41c86c63a64821aa /tests/auto/declarative/qdeclarativegridview/data/manual-highlight.qml | |
| parent | 0af1f5508e165f3b494ab236cb1cdf1b0edcffa5 (diff) | |
| parent | ff60c64c30a2e889b7a894b7b4b38484b7dfe31a (diff) | |
| download | Qt-d0cf0603fa6f55f7655e5e4b2ea5a2cbc42a39fc.zip Qt-d0cf0603fa6f55f7655e5e4b2ea5a2cbc42a39fc.tar.gz Qt-d0cf0603fa6f55f7655e5e4b2ea5a2cbc42a39fc.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'tests/auto/declarative/qdeclarativegridview/data/manual-highlight.qml')
| -rw-r--r-- | tests/auto/declarative/qdeclarativegridview/data/manual-highlight.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativegridview/data/manual-highlight.qml b/tests/auto/declarative/qdeclarativegridview/data/manual-highlight.qml index 7bb2c95..d082847 100644 --- a/tests/auto/declarative/qdeclarativegridview/data/manual-highlight.qml +++ b/tests/auto/declarative/qdeclarativegridview/data/manual-highlight.qml @@ -28,8 +28,8 @@ Item { objectName: "highlight" width: 80; height: 80 color: "lightsteelblue"; radius: 5 - y: grid.currentItem.y - x: grid.currentItem.x + y: grid.currentItem.y+5 + x: grid.currentItem.x+5 } } |