aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2012-02-03 12:45:23 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-06 04:09:37 +0100
commit1a4dc88394fbe5f83f21facaebbef9adf199ed40 (patch)
tree3f191a1cfd0ad6c928a9492e30294985bab9db99
parent7a3d6f0396ff8ecddbf9891f60db6893d88b5f11 (diff)
Remove SVG use from example
With the SVG module now an optional dependency, examples that don't need SVG shouldn't use them. Change-Id: I17ad57dec6982e78090904d1514e28233c354b5b Reviewed-by: Martin Jones <martin.jones@nokia.com>
-rw-r--r--examples/declarative/snake/content/pics/head.svg134
-rw-r--r--examples/declarative/ui-components/slideswitch/content/Switch.qml4
-rw-r--r--examples/declarative/ui-components/slideswitch/content/background.pngbin0 -> 3091 bytes
-rw-r--r--examples/declarative/ui-components/slideswitch/content/knob.pngbin0 -> 3101 bytes
4 files changed, 2 insertions, 136 deletions
diff --git a/examples/declarative/snake/content/pics/head.svg b/examples/declarative/snake/content/pics/head.svg
deleted file mode 100644
index 3bf0bd2feb..0000000000
--- a/examples/declarative/snake/content/pics/head.svg
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- id="svg2"
- sodipodi:version="0.32"
- inkscape:version="0.46"
- width="40"
- height="40"
- version="1.0"
- sodipodi:docname="head.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-filename="/home/ettrich/dev/research/qml-validate/snake/pics/head.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90">
- <metadata
- id="metadata7">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs5">
- <inkscape:perspective
- sodipodi:type="inkscape:persp3d"
- inkscape:vp_x="0 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- id="perspective9" />
- <inkscape:perspective
- id="perspective2444"
- inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
- inkscape:vp_z="744.09448 : 526.18109 : 1"
- inkscape:vp_y="0 : 1000 : 0"
- inkscape:vp_x="0 : 526.18109 : 1"
- sodipodi:type="inkscape:persp3d" />
- </defs>
- <sodipodi:namedview
- inkscape:window-height="838"
- inkscape:window-width="907"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0.0"
- guidetolerance="10.0"
- gridtolerance="10.0"
- objecttolerance="10.0"
- borderopacity="1.0"
- bordercolor="#666666"
- pagecolor="#ffffff"
- id="base"
- showgrid="false"
- inkscape:zoom="12.35"
- inkscape:cx="20"
- inkscape:cy="20"
- inkscape:window-x="117"
- inkscape:window-y="45"
- inkscape:current-layer="svg2" />
- <image
- y="0.21862352"
- x="-0.048582077"
- id="image2446"
- height="40"
- width="40"
- sodipodi:absref="/home/ettrich/dev/research/qml-validate/snake/pics/redStone.png"
- xlink:href="redStone.png" />
- <path
- sodipodi:type="arc"
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path2384"
- sodipodi:cx="18.056681"
- sodipodi:cy="9.5141697"
- sodipodi:rx="7.1255059"
- sodipodi:ry="11.295547"
- d="M 25.182187,9.5141697 A 7.1255059,11.295547 0 1 1 10.931175,9.5141697 A 7.1255059,11.295547 0 1 1 25.182187,9.5141697 z"
- transform="matrix(1.0089865,0,0,0.5462656,-4.9233835,3.3301401)" />
- <path
- sodipodi:type="arc"
- style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- id="path3158"
- sodipodi:cx="18.056681"
- sodipodi:cy="9.5141697"
- sodipodi:rx="7.1255059"
- sodipodi:ry="11.295547"
- d="M 25.182187,9.5141697 A 7.1255059,11.295547 0 1 1 10.931175,9.5141697 A 7.1255059,11.295547 0 1 1 25.182187,9.5141697 z"
- transform="matrix(1.0089865,0,0,0.5462656,9.6190931,3.3522563)" />
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1"
- id="path3182"
- sodipodi:cx="16.275303"
- sodipodi:cy="12.307693"
- sodipodi:rx="2.2672064"
- sodipodi:ry="3.4008098"
- d="M 18.542509,12.307693 A 2.2672064,3.4008098 0 0 1 14.008446,12.367372"
- sodipodi:start="0"
- sodipodi:end="3.1240432"
- transform="translate(11.65992,-9.740891)"
- sodipodi:open="true" />
- <rect
- style="fill:#000000;fill-opacity:0"
- id="rect2382"
- width="40"
- height="40"
- x="0"
- y="-7.1054274e-15"
- inkscape:export-filename="/home/ettrich/dev/research/qml-validate/snake/pics/eyes.png"
- inkscape:export-xdpi="90"
- inkscape:export-ydpi="90" />
- <path
- sodipodi:type="arc"
- style="fill:#000000;fill-opacity:1"
- id="path2383"
- sodipodi:cx="16.275303"
- sodipodi:cy="12.307693"
- sodipodi:rx="2.2672064"
- sodipodi:ry="3.4008098"
- d="M 18.542509,12.307693 A 2.2672064,3.4008098 0 0 1 14.008446,12.367372"
- sodipodi:start="0"
- sodipodi:end="3.1240432"
- transform="translate(-3.3200119,-9.821862)"
- sodipodi:open="true" />
-</svg>
diff --git a/examples/declarative/ui-components/slideswitch/content/Switch.qml b/examples/declarative/ui-components/slideswitch/content/Switch.qml
index 3e1012907c..981fc16673 100644
--- a/examples/declarative/ui-components/slideswitch/content/Switch.qml
+++ b/examples/declarative/ui-components/slideswitch/content/Switch.qml
@@ -73,7 +73,7 @@ Item {
//![4]
Image {
id: background
- source: "background.svg"
+ source: "background.png"
MouseArea { anchors.fill: parent; onClicked: toggle() }
}
//![4]
@@ -82,7 +82,7 @@ Item {
Image {
id: knob
x: 1; y: 2
- source: "knob.svg"
+ source: "knob.png"
MouseArea {
anchors.fill: parent
diff --git a/examples/declarative/ui-components/slideswitch/content/background.png b/examples/declarative/ui-components/slideswitch/content/background.png
new file mode 100644
index 0000000000..d736815870
--- /dev/null
+++ b/examples/declarative/ui-components/slideswitch/content/background.png
Binary files differ
diff --git a/examples/declarative/ui-components/slideswitch/content/knob.png b/examples/declarative/ui-components/slideswitch/content/knob.png
new file mode 100644
index 0000000000..ee0a436f84
--- /dev/null
+++ b/examples/declarative/ui-components/slideswitch/content/knob.png
Binary files differ