diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 13:55:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 14:08:02 +0200 |
| commit | 314fdbce8ce473eb3610be3658c61fab2fac0efb (patch) | |
| tree | 98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863 /tests/arthur/data/1.2/noonoo.svg | |
| parent | 8d7647e286e07690de15a6ff9189307ee1a3517c (diff) | |
| parent | 83736a8d06a6ca2a1f165d6119ddaca90646e1f8 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
config.tests/unix/opengldesktop/opengldesktop.cpp
examples/itemviews/interview/interview.pro
examples/mainwindows/mainwindow/mainwindow.pro
examples/openvg/README
examples/richtext/textedit/textedit.pro
examples/tools/undo/undo.pro
src/corelib/global/qglobal.h
src/corelib/kernel/qcoreapplication.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qmetatype.h
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/text/qfontdatabase.cpp
src/opengl/qgl.h
src/openvg/qpaintengine_vg.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
tests/auto/qmainwindow/qmainwindow.pro
Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
Diffstat (limited to 'tests/arthur/data/1.2/noonoo.svg')
| -rw-r--r-- | tests/arthur/data/1.2/noonoo.svg | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/tests/arthur/data/1.2/noonoo.svg b/tests/arthur/data/1.2/noonoo.svg deleted file mode 100644 index 9e601bd075..0000000000 --- a/tests/arthur/data/1.2/noonoo.svg +++ /dev/null @@ -1,13 +0,0 @@ -<svg xmlns="http://www.w3.org/2000/svg" version="1.2" baseProfile="tiny" - xmlns:xlink="http://www.w3.org/1999/xlink" - width="420" height="340" viewBox="0 0 420 340"> - <desc>SVG 1.2 video example</desc> - <g> - <circle cx="0" cy="0" r="170" fill="#da4" fill-opacity="0.3"/> - <video xlink:href="noonoo.avi" audio-level=".8" type="video/x-msvideo" - width="320" height="240" x="50" y="50" repeatCount="indefinite"/> - <circle cx="420" cy="340" r="170" fill="#927" fill-opacity="0.3"/> - <rect x="1" y="1" width="418" height="338" fill="none" - stroke="#777" stroke-width="1"/> - </g> -</svg> |
