diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-03-29 03:38:10 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-03-29 03:38:10 (GMT) |
| commit | f183932778932a8c2fc5ac38c753893eaeb99575 (patch) | |
| tree | 392acf9ef4e355667517d41b9443f957ba14a7e8 /tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png | |
| parent | 123172f61f1f1bba6389850835ec946ca6ee82de (diff) | |
| parent | 059a91650d7fdb7491108c07e3eda0e79e2d9203 (diff) | |
| download | Qt-f183932778932a8c2fc5ac38c753893eaeb99575.zip Qt-f183932778932a8c2fc5ac38c753893eaeb99575.tar.gz Qt-f183932778932a8c2fc5ac38c753893eaeb99575.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
doc/src/declarative/examples.qdoc
doc/src/declarative/focus.qdoc
doc/src/declarative/modules.qdoc
doc/src/declarative/network.qdoc
doc/src/declarative/qdeclarativedebugging.qdoc
doc/src/declarative/qdeclarativei18n.qdoc
doc/src/declarative/qmlruntime.qdoc
doc/src/declarative/tutorial.qdoc
tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
Diffstat (limited to 'tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png')
| -rw-r--r-- | tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png | bin | 0 -> 1341 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png Binary files differnew file mode 100644 index 0000000..2d0c731 --- /dev/null +++ b/tests/auto/declarative/qmlvisual/qdeclarativegridview/data/gridview2.2.png |