Merge remote-tracking branch 'origin/5.14' into 5.15

Change-Id: If6bf34ca3216ab9e0866d8c4eea7c4e92a7f3f4d

2 files changed, 10 insertions, 10 deletions

diff --git a/src/svg/qsvgrenderer.cpp b/src/svg/qsvgrenderer.cpp
index d4ad373..da31a31 100644
--- a/src/svg/qsvgrenderer.cpp
+++ b/src/svg/qsvgrenderer.cpp
@@ -401,10 +401,10 @@ void QSvgRenderer::render(QPainter *painter, const QString &elementId,
 }
 
 /*!
-    Renders the current document, or the current frame of an animated
-    document, using the given \a painter on the specified \a bounds within
-    the painter.  If the bounding rectangle is not specified
-    the SVG file is mapped to the whole paint device.
+    Renders the current document, or the current frame of an animated document,
+    using the given \a painter on the specified \a bounds within the painter.
+    If \a bounds is not empty, the output will be scaled to fill it, ignoring
+    any aspect ratio implied by the SVG.
 */
 void QSvgRenderer::render(QPainter *painter, const QRectF &bounds)
 {
diff --git a/src/svg/qsvgtinydocument.cpp b/src/svg/qsvgtinydocument.cpp
index 56960bf..173baaa 100644
--- a/src/svg/qsvgtinydocument.cpp
+++ b/src/svg/qsvgtinydocument.cpp
@@ -420,9 +420,10 @@ void QSvgTinyDocument::mapSourceToTarget(QPainter *p, const QRectF &targetRect,
         source = viewBox();
 
     if (source != target && !source.isNull()) {
-        if (m_implicitViewBox || !sourceRect.isNull()) {
+        if (m_implicitViewBox || !sourceRect.isNull() || !targetRect.isNull()) {
             // Code path used when no view box is set, or when an explicit source size is given which
-            // overrides it (which is the case when we're rendering only a specific element by id).
+            // overrides it (which is the case when we're rendering only a specific element by id),
+            // or when user has given explicit target bounds that overrides viebox aspect ratio
             QTransform transform;
             transform.scale(target.width() / source.width(),
                             target.height() / source.height());
@@ -441,15 +442,14 @@ void QSvgTinyDocument::mapSourceToTarget(QPainter *p, const QRectF &targetRect,
             viewBoxSize.scale(target.width(), target.height(), Qt::KeepAspectRatio);
 
             // Center the view box in the view port
-            p->translate((target.width() - viewBoxSize.width()) / 2,
-                         (target.height() - viewBoxSize.height()) / 2);
+            p->translate(target.x() + (target.width() - viewBoxSize.width()) / 2,
+                         target.y() + (target.height() - viewBoxSize.height()) / 2);
 
             p->scale(viewBoxSize.width() / source.width(),
                      viewBoxSize.height() / source.height());
 
             // Apply the view box translation if specified.
-            p->translate(target.x() - source.x(),
-                         target.y() - source.y());
+            p->translate(-source.x(), -source.y());
         }
     }
 }