From a202a900cf8838d01bad178be39d7e4a065ac56f Mon Sep 17 00:00:00 2001
From: Sune Vuorela <sune@vuorela.dk>
Date: Tue, 12 Apr 2016 20:40:54 +0200
Subject: Handle PdmDevicePixelRatioScaled metric

Quiets a warning about an unhandled member.

Change-Id: I20f6b6849176df541fba2e1a75d1d4ee8f2df303
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
---
 src/svg/qsvggenerator.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/svg')

diff --git a/src/svg/qsvggenerator.cpp b/src/svg/qsvggenerator.cpp
index ca99de1..3bc5846 100644
--- a/src/svg/qsvggenerator.cpp
+++ b/src/svg/qsvggenerator.cpp
@@ -794,6 +794,7 @@ int QSvgGenerator::metric(QPaintDevice::PaintDeviceMetric metric) const
     case QPaintDevice::PdmPhysicalDpiY:
         return d->engine->resolution();
     case QPaintDevice::PdmDevicePixelRatio:
+    case QPaintDevice::PdmDevicePixelRatioScaled:
         return 1;
     default:
         qWarning("QSvgGenerator::metric(), unhandled metric %d\n", metric);
-- 
cgit v1.2.1


From e02df9c098b4d304b34c0ff65806a0576e45ed1a Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Mon, 18 Apr 2016 13:43:58 +0200
Subject: qtsvg.qdocconf: Fix plugin paths.

Fix qdoc warnings:
../qtsvg/src/svg/doc/qtsvg.qdocconf:33: warning: Cannot find file or directory: ../../plugins/svg
../qtsvg/src/svg/doc/qtsvg.qdocconf:36: warning: Cannot find file or directory: ../../plugins/svg

Change-Id: I6a085c539bd0244184e5b9a53878fb1e0144bd4c
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
---
 src/svg/doc/qtsvg.qdocconf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/svg')

diff --git a/src/svg/doc/qtsvg.qdocconf b/src/svg/doc/qtsvg.qdocconf
index e8460e9..d934f61 100644
--- a/src/svg/doc/qtsvg.qdocconf
+++ b/src/svg/doc/qtsvg.qdocconf
@@ -31,10 +31,12 @@ depends += qtcore \
 tagfile                 = ../../../doc/qtsvg/qtsvg.tags
 
 headerdirs  += .. \
-                ../../plugins/svg
+                ../../plugins/imageformats \
+                ../../plugins/iconengines
 
 sourcedirs  += .. \
-               ../../plugins/svg
+               ../../plugins/imageformats \
+               ../../plugins/iconengines
 
 exampledirs += ../../../examples/svg \
                snippets/
-- 
cgit v1.2.1


From 0e69a7c86f1908bc282362ec59f0ccf97d35d63a Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@theqtcompany.com>
Date: Tue, 10 May 2016 14:54:30 +0200
Subject: Doc: Remove repository name from examplesinstallpath

Examples in binary packages now directly match the install path.

Change-Id: I15cc16953efdfb3e327de82e3f6c412941811853
Task-number: QTBUG-52953
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
---
 src/svg/doc/qtsvg.qdocconf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/svg')

diff --git a/src/svg/doc/qtsvg.qdocconf b/src/svg/doc/qtsvg.qdocconf
index d934f61..b180daa 100644
--- a/src/svg/doc/qtsvg.qdocconf
+++ b/src/svg/doc/qtsvg.qdocconf
@@ -41,7 +41,7 @@ sourcedirs  += .. \
 exampledirs += ../../../examples/svg \
                snippets/
 
-examplesinstallpath = qtsvg/svg
+examplesinstallpath = svg
 
 imagedirs   += images
 
-- 
cgit v1.2.1