Merge remote-tracking branch 'gerrit/master' into newdocs

Change-Id: I10cf9f915c602c8e5a0e7d7c9e17b7bc5ca00640

1 files changed, 6 insertions, 2 deletions

diff --git a/src/printsupport/kernel/qpaintengine_alpha.cpp b/src/printsupport/kernel/qpaintengine_alpha.cpp
index e3312f2db7..387e87766b 100644
--- a/src/printsupport/kernel/qpaintengine_alpha.cpp
+++ b/src/printsupport/kernel/qpaintengine_alpha.cpp
@@ -45,6 +45,7 @@
 #include <qdebug.h>
 #include "private/qpaintengine_alpha_p.h"
 
+#include "private/qpainter_p.h"
 #include "private/qpicture_p.h"
 #include "private/qfont_p.h"
 #include "QtGui/qpicture.h"
@@ -384,11 +385,14 @@ QAlphaPaintEnginePrivate::~QAlphaPaintEnginePrivate()
 
 QRectF QAlphaPaintEnginePrivate::addPenWidth(const QPainterPath &path)
 {
+    Q_Q(QAlphaPaintEngine);
+
     QPainterPath tmp = path;
 
     if (m_pen.style() == Qt::NoPen)
         return (path.controlPointRect() * m_transform).boundingRect();
-    if (m_pen.isCosmetic())
+    bool cosmetic = qt_pen_is_cosmetic(m_pen, q->state->renderHints());
+    if (cosmetic)
         tmp = path * m_transform;
 
     QPainterPathStroker stroker;
@@ -399,7 +403,7 @@ QRectF QAlphaPaintEnginePrivate::addPenWidth(const QPainterPath &path)
     stroker.setJoinStyle(m_pen.joinStyle());
     stroker.setCapStyle(m_pen.capStyle());
     tmp = stroker.createStroke(tmp);
-    if (m_pen.isCosmetic())
+    if (cosmetic)
         return tmp.controlPointRect();
 
     return (tmp.controlPointRect() * m_transform).boundingRect();