Merge remote-tracking branch 'gerrit/release' into stable

Conflicts:
	configure
	mkspecs/features/qt_module_headers.prf
	mkspecs/features/qt_tool.prf
	src/angle/angle.pro
	src/tools/bootstrap/bootstrap.pro
	tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp

Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0

1 files changed, 6 insertions, 6 deletions

diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
index 7f53bec52f..0f3cde3efd 100644
--- a/src/gui/painting/qcosmeticstroker.cpp
+++ b/src/gui/painting/qcosmeticstroker.cpp
@@ -290,14 +290,14 @@ void QCosmeticStroker::setup()
         ppl = buffer->bytesPerLine()>>2;
     }
 
-    // dashes are sensitive to clips, so we need to clip consistently when painting to the same device
-    QRect clipRect = strokeSelection & Dashed ? deviceRect : clip;
+    // line drawing produces different results with different clips, so
+    // we need to clip consistently when painting to the same device
 
     // setup FP clip bounds
-    xmin = clipRect.left() - 1;
-    xmax = clipRect.right() + 2;
-    ymin = clipRect.top() - 1;
-    ymax = clipRect.bottom() + 2;
+    xmin = deviceRect.left() - 1;
+    xmax = deviceRect.right() + 2;
+    ymin = deviceRect.top() - 1;
+    ymax = deviceRect.bottom() + 2;
 
     lastPixel.x = -1;
 }