Merge remote-tracking branch 'origin/dev' into stable

Change-Id: Ice524edcc51373509f0023ae7f7c2963f4602f88

1 files changed, 24 insertions, 24 deletions

diff --git a/src/widgets/doc/snippets/customstyle/customstyle.cpp b/src/widgets/doc/snippets/customstyle/customstyle.cpp
index 9d00745e6a..b5d44ebecd 100644
--- a/src/widgets/doc/snippets/customstyle/customstyle.cpp
+++ b/src/widgets/doc/snippets/customstyle/customstyle.cpp
@@ -57,32 +57,32 @@ void CustomStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *op
                                 QPainter *painter, const QWidget *widget) const
 {
     if (element == PE_IndicatorSpinUp || element == PE_IndicatorSpinDown) {
-	QPolygon points(3);
-	int x = option->rect.x();
-	int y = option->rect.y();
-	int w = option->rect.width() / 2;
-	int h = option->rect.height() / 2;
-	x += (option->rect.width() - w) / 2;
-	y += (option->rect.height() - h) / 2;
+        QPolygon points(3);
+        int x = option->rect.x();
+        int y = option->rect.y();
+        int w = option->rect.width() / 2;
+        int h = option->rect.height() / 2;
+        x += (option->rect.width() - w) / 2;
+        y += (option->rect.height() - h) / 2;
 
-	if (element == PE_IndicatorSpinUp) {
-	    points[0] = QPoint(x, y + h);
-	    points[1] = QPoint(x + w, y + h);
-	    points[2] = QPoint(x + w / 2, y);
-	} else { // PE_SpinBoxDown
-	    points[0] = QPoint(x, y);
-	    points[1] = QPoint(x + w, y);
-	    points[2] = QPoint(x + w / 2, y + h);
-	}
+        if (element == PE_IndicatorSpinUp) {
+            points[0] = QPoint(x, y + h);
+            points[1] = QPoint(x + w, y + h);
+            points[2] = QPoint(x + w / 2, y);
+        } else { // PE_SpinBoxDown
+            points[0] = QPoint(x, y);
+            points[1] = QPoint(x + w, y);
+            points[2] = QPoint(x + w / 2, y + h);
+        }
 
-	if (option->state & State_Enabled) {
-	    painter->setPen(option->palette.mid().color());
-	    painter->setBrush(option->palette.buttonText());
-	} else {
-	    painter->setPen(option->palette.buttonText().color());
-	    painter->setBrush(option->palette.mid());
-	}
-	painter->drawPolygon(points);
+        if (option->state & State_Enabled) {
+            painter->setPen(option->palette.mid().color());
+            painter->setBrush(option->palette.buttonText());
+        } else {
+            painter->setPen(option->palette.buttonText().color());
+            painter->setBrush(option->palette.mid());
+        }
+        painter->drawPolygon(points);
     } else {
     QProxyStyle::drawPrimitive(element, option, painter, widget);
 //! [2] //! [3]