diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-19 15:24:08 +0100 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-11-19 15:24:08 +0100 |
| commit | e50e811461b54e07184af547f62aa44b3c5bb681 (patch) | |
| tree | 45541bc05471d6c49305afeafa13f69031ccdecd /tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml | |
| parent | 05b65c2f9df1c2c56c72f313401a6adb422d381b (diff) | |
| parent | b115770cc3bba68740a6848c7ccaed932399aca9 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/text/qfontengine_mac.mm
src/gui/text/qfontengine_p.h
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml index 811e0e4806..0dd9d0e62c 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/gridview2.qml @@ -1,6 +1,7 @@ import QtQuick 1.0 Rectangle { + property string skip: "Last bit is wrong (rest is probably right, just bitrot). QTBUG-14838" width: 300; height: 400; color: "black" ListModel { @@ -45,7 +46,7 @@ Rectangle { model: appModel; delegate: appDelegate; focus: true keyNavigationWraps: true - flickableData: [ + flickableData: [//Presumably the different way of doing highlight tests more things Rectangle { color: "transparent"; border.color: "white"; border.width: 8; z: 3000 height: 100; width: 100 |