From 56440366c661babc6316d9491a82ae1dfe6308f9 Mon Sep 17 00:00:00 2001
From: Maurice Kalinowski <maurice.kalinowski@digia.com>
Date: Mon, 7 Jul 2014 10:52:21 +0200
Subject: Remove example for WinRT

Change-Id: Iaf1109eb70c892aa819775f2773168633c62af67
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
(cherry picked from commit b6ba8a7448148794f4a36158003a3d5dad7f1e6c)
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
---
 examples/svg/embedded/embedded.pro | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/examples/svg/embedded/embedded.pro b/examples/svg/embedded/embedded.pro
index 9545cc4..42232fb 100644
--- a/examples/svg/embedded/embedded.pro
+++ b/examples/svg/embedded/embedded.pro
@@ -1,2 +1,5 @@
 TEMPLATE = subdirs
 qtHaveModule(widgets): SUBDIRS += desktopservices fluidlauncher weatherinfo
+
+# Disable platforms without process support
+winrt: SUBDIRS -= fluidlauncher
-- 
cgit v1.2.1


From 3167c1374bb918033b5b4a5b54e0d0608698eeb0 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@digia.com>
Date: Wed, 1 Oct 2014 18:55:15 +0200
Subject: fix crash on malformed SVG

In a gradient that references itself via xlink:href we encountered
an infinite recursion, and eventually a stack overflow.
Now we print a warning and ignore the invalid link.

Task-number: QTBUG-35387
Change-Id: Id72800eaa267d015a471df284245861ed8bc94cd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 src/svg/qsvgstyle.cpp                        | 2 +-
 tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp
index 4385291..662692b 100644
--- a/src/svg/qsvgstyle.cpp
+++ b/src/svg/qsvgstyle.cpp
@@ -937,7 +937,7 @@ void QSvgGradientStyle::resolveStops()
 {
     if (!m_link.isEmpty() && m_doc) {
         QSvgStyleProperty *prop = m_doc->styleProperty(m_link);
-        if (prop) {
+        if (prop && prop != this) {
             if (prop->type() == QSvgStyleProperty::GRADIENT) {
                 QSvgGradientStyle *st =
                     static_cast<QSvgGradientStyle*>(prop);
diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
index 2aa2225..8487d54 100644
--- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
+++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
@@ -620,6 +620,15 @@ void tst_QSvgRenderer::gradientRefs()
                 "<linearGradient id=\"gradient\" xlink:href=\"#gradient0\">"
                 "</linearGradient>"
             "</defs>"
+        "</svg>",
+        "<svg>"
+            "<defs>"
+                "<linearGradient xlink:href=\"#0\" id=\"0\">"
+                    "<stop offset=\"0\" stop-color=\"red\" stop-opacity=\"0\"/>"
+                    "<stop offset=\"1\" stop-color=\"blue\"/>"
+                "</linearGradient>"
+            "</defs>"
+            "<rect fill=\"url(#0)\" height=\"8\" width=\"256\" x=\"0\" y=\"0\"/>"
         "</svg>"
     };
     for (size_t i = 0 ; i < sizeof(svgs) / sizeof(svgs[0]) ; ++i)
-- 
cgit v1.2.1