diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index d20faf89a2f..8516d73537b 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -661,6 +661,7 @@ void QPainterPath::clear()
 
     detach();
     d_func()->clear();
+    d_func()->elements.append( {0, 0, MoveToElement} );
 }
 
 /*!
@@ -2337,12 +2338,12 @@ bool QPainterPath::operator==(const QPainterPath &path) const
 {
     QPainterPathData *d = reinterpret_cast<QPainterPathData *>(d_func());
     QPainterPathData *other_d = path.d_func();
-    if (other_d == d)
+    if (other_d == d) {
         return true;
-    else if (!d || !other_d) {
-        if (!d && other_d->elements.empty() && other_d->fillRule == Qt::OddEvenFill)
+    } else if (!d || !other_d) {
+        if (!other_d && isEmpty() && elementAt(0) == QPointF() && d->fillRule == Qt::OddEvenFill)
             return true;
-        if (!other_d && d && d->elements.empty() && d->fillRule == Qt::OddEvenFill)
+        if (!d && path.isEmpty() && path.elementAt(0) == QPointF() && other_d->fillRule == Qt::OddEvenFill)
             return true;
         return false;
     }
diff --git a/src/gui/painting/qpainterpath_p.h b/src/gui/painting/qpainterpath_p.h
index a36c8005bc3..567f1552106 100644
--- a/src/gui/painting/qpainterpath_p.h
+++ b/src/gui/painting/qpainterpath_p.h
@@ -298,7 +298,7 @@ inline void QPainterPathData::clear()
     elements.clear();
 
     cStart = 0;
-
+    fillRule = Qt::OddEvenFill;
     bounds = {};
     controlBounds = {};
 
diff --git a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
index c90348e91a6..67cf9a321af 100644
--- a/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
+++ b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
@@ -161,10 +161,18 @@ void tst_QPainterPath::clear()
     p1.clear();
     QCOMPARE(p1, p2);
 
+    p1.lineTo(50, 50);
+    QPainterPath p3;
+    QCOMPARE(p1.elementCount(), 2);
+    p3.lineTo(50, 50);
+    QCOMPARE(p1, p3);
+
     QCOMPARE(p1.fillRule(), Qt::OddEvenFill);
     p1.setFillRule(Qt::WindingFill);
+    QVERIFY(p1 != p3);
     p1.clear();
-    QCOMPARE(p1.fillRule(), Qt::WindingFill);
+    QCOMPARE(p1.fillRule(), Qt::OddEvenFill);
+    QCOMPARE(p1, p2);
 }
 
 void tst_QPainterPath::reserveAndCapacity()