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/10_08.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/10_08.svg')
-rw-r--r-- | tests/arthur/data/1.2/10_08.svg | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/tests/arthur/data/1.2/10_08.svg b/tests/arthur/data/1.2/10_08.svg deleted file mode 100644 index 62e7ed0843..0000000000 --- a/tests/arthur/data/1.2/10_08.svg +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" - "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> -<svg width="12cm" height="3.6cm" viewBox="0 0 1000 300" version="1.2" - xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> - <defs> - <path xml:id="MyPath" - d="M 100 200 - C 200 100 300 0 400 100 - C 500 200 600 300 700 200 - C 800 100 900 100 900 100" /> - </defs> - <desc>Example toap01 - simple text on a path</desc> - <use xlink:href="#MyPath" fill="none" stroke="red" /> - <text font-family="Verdana" font-size="42.5" fill="blue" > - <textPath xlink:href="#MyPath"> - We go up, then we go down, then up again - </textPath> - </text> - <!-- Show outline of canvas using 'rect' element --> - <rect x="1" y="1" width="998" height="298" - fill="none" stroke="blue" stroke-width="2" /> -</svg> |