summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.6.png
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-03-30 07:30:01 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-30 07:30:01 (GMT)
commitc2bee860f72898c6d57ff9f117256059b3952479 (patch)
tree8f190bac91f9cbd11e6e52479a3effea132a3a20 /tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.6.png
parentde306893b464ed0fa00f98488912fd6269713519 (diff)
parentc4f59859a589b76419e9133110eda850223f03dd (diff)
downloadQt-c2bee860f72898c6d57ff9f117256059b3952479.zip
Qt-c2bee860f72898c6d57ff9f117256059b3952479.tar.gz
Qt-c2bee860f72898c6d57ff9f117256059b3952479.tar.bz2
Merge remote branch 'origin/4.7' into qt-4.7-from-4.6
Conflicts: mkspecs/common/symbian/symbian.conf src/3rdparty/webkit/WebCore/WebCore.pro
Diffstat (limited to 'tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.6.png')
-rw-r--r--tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.6.pngbin0 -> 9812 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.6.png b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.6.png
new file mode 100644
index 0000000..54a3934
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/focusscope/data-X11/test3.6.png
Binary files differ