From 56440366c661babc6316d9491a82ae1dfe6308f9 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Mon, 7 Jul 2014 10:52:21 +0200 Subject: Remove example for WinRT Change-Id: Iaf1109eb70c892aa819775f2773168633c62af67 Reviewed-by: Oliver Wolff (cherry picked from commit b6ba8a7448148794f4a36158003a3d5dad7f1e6c) Reviewed-by: Maurice Kalinowski --- 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 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 --- 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(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() "" "" "" + "", + "" + "" + "" + "" + "" + "" + "" + "" "" }; for (size_t i = 0 ; i < sizeof(svgs) / sizeof(svgs[0]) ; ++i) -- cgit v1.2.1 From 2f0fabdfc33d7ceed43fe3c543473081f51c4ec3 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Wed, 8 Oct 2014 13:47:36 +0200 Subject: Doc: Applied title case to section1 titles Task-number: QTBUG-41250 Change-Id: I32a25f6c524503cf6de5e9349d4817747bafe076 Reviewed-by: Martin Smith --- doc/src/examples/bearercloud.qdoc | 4 ++-- src/svg/doc/src/svgrendering.qdoc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/src/examples/bearercloud.qdoc b/doc/src/examples/bearercloud.qdoc index fb58661..50063bd 100644 --- a/doc/src/examples/bearercloud.qdoc +++ b/doc/src/examples/bearercloud.qdoc @@ -66,7 +66,7 @@ class implements a Graphics View scene and manages the life-cycle of Cloud objects in response to notification signals from QNetworkConfigurationManager. - \section1 Setting the scene + \section1 Setting the Scene When constructing the scene we first calculate some random offsets using the global qsand() and qrand() functions. We will use these offsets to scatter the initial position of new Cloud @@ -123,7 +123,7 @@ \snippet examples/network/bearercloud/bearercloud.cpp 4 - \section1 Responding to changes + \section1 Responding to Changes Each network session and associated network configuration known to the system is represented in the scene as a Cloud object. diff --git a/src/svg/doc/src/svgrendering.qdoc b/src/svg/doc/src/svgrendering.qdoc index 3ef66d5..eb8a365 100644 --- a/src/svg/doc/src/svgrendering.qdoc +++ b/src/svg/doc/src/svgrendering.qdoc @@ -40,7 +40,7 @@ \snippet doc_src_qtsvg.pro 1 - \section1 Rendering SVG files + \section1 Rendering SVG Files Scalable Vector Graphics (SVG) is a language for describing two-dimensional graphics and graphical applications in XML. SVG 1.1 is a W3C Recommendation -- cgit v1.2.1