Merge branch '4.5'

Conflicts:
	tools/linguist/lupdate/qscript.cpp
	tools/linguist/lupdate/qscript.g
	tools/linguist/lupdate/ui.cpp
	tools/linguist/shared/cpp.cpp
	tools/linguist/shared/qph.cpp
	tools/linguist/shared/translator.h

1 files changed, 7 insertions, 14 deletions

diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index 0d985c3..b5e092c 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -2443,21 +2443,13 @@ void qt_path_stroke_cubic_to(qfixed c1x, qfixed c1y,
     \sa QPen, QBrush
 */
 
-class QPainterPathStrokerPrivate
+QPainterPathStrokerPrivate::QPainterPathStrokerPrivate()
+    : dashOffset(0)
 {
-public:
-    QPainterPathStrokerPrivate()
-        : dashOffset(0)
-    {
-        stroker.setMoveToHook(qt_path_stroke_move_to);
-        stroker.setLineToHook(qt_path_stroke_line_to);
-        stroker.setCubicToHook(qt_path_stroke_cubic_to);
-    }
-
-    QStroker stroker;
-    QVector<qfixed> dashPattern;
-    qreal dashOffset;
-};
+    stroker.setMoveToHook(qt_path_stroke_move_to);
+    stroker.setLineToHook(qt_path_stroke_line_to);
+    stroker.setCubicToHook(qt_path_stroke_cubic_to);
+}
 
 /*!
    Creates a new stroker.
@@ -2501,6 +2493,7 @@ QPainterPath QPainterPathStroker::createStroke(const QPainterPath &path) const
         QDashStroker dashStroker(&d->stroker);
         dashStroker.setDashPattern(d->dashPattern);
         dashStroker.setDashOffset(d->dashOffset);
+        dashStroker.setClipRect(d->stroker.clipRect());
         dashStroker.strokePath(path, &stroke, QTransform());
     }
     stroke.setFillRule(Qt::WindingFill);