Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	src/qml/qml/qqmlpropertycache.cpp

Change-Id: Ie7727499700b85cc0959ef3abb30d55dc728b659

1 files changed, 7 insertions, 2 deletions

diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp
index de19a927a0..546f3011ec 100644
--- a/src/quick/items/context2d/qquickcontext2d.cpp
+++ b/src/quick/items/context2d/qquickcontext2d.cpp
@@ -1548,7 +1548,7 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_strokeStyle(const QV4::Function
     if (value->as<Object>()) {
         QColor color = scope.engine->toVariant(value, qMetaTypeId<QColor>()).value<QColor>();
         if (color.isValid()) {
-            r->d()->context()->state.fillStyle = color;
+            r->d()->context()->state.strokeStyle = color;
             r->d()->context()->buffer()->setStrokeStyle(color);
             r->d()->context()->m_strokeStyle.set(scope.engine, value);
         } else {
@@ -1559,7 +1559,12 @@ QV4::ReturnedValue QQuickJSContext2D::method_set_strokeStyle(const QV4::Function
                 r->d()->context()->m_strokeStyle.set(scope.engine, value);
                 r->d()->context()->state.strokePatternRepeatX = style->d()->patternRepeatX;
                 r->d()->context()->state.strokePatternRepeatY = style->d()->patternRepeatY;
-
+            } else if (!style && r->d()->context()->state.strokeStyle != QBrush(QColor())) {
+                // If there is no style object, then ensure that the strokeStyle is at least
+                // QColor in case it was previously set
+                r->d()->context()->state.strokeStyle = QBrush(QColor());
+                r->d()->context()->buffer()->setStrokeStyle(r->d()->context()->state.strokeStyle);
+                r->d()->context()->m_strokeStyle.set(scope.engine, value);
             }
         }
     } else if (value->isString()) {