Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4

5 files changed, 17 insertions, 5 deletions

diff --git a/src/gui/image/qimage_conversions.cpp b/src/gui/image/qimage_conversions.cpp
index 64a6cd8602..bfa628900f 100644
--- a/src/gui/image/qimage_conversions.cpp
+++ b/src/gui/image/qimage_conversions.cpp
@@ -1354,8 +1354,7 @@ void dither_to_Mono(QImageData *dst, const QImageData *src,
                 dst_data += dst_bpl;
                 src_data += src_bpl;
             }
-        } else
-            /* (d == 8) */ {
+        } else if (d == 8) {
             for (int i=0; i<h; i++) {
                 const uchar *p = src_data;
                 const uchar *end = p + w;
diff --git a/src/gui/painting/qregion.cpp b/src/gui/painting/qregion.cpp
index b21c77f745..6bf5f6bf88 100644
--- a/src/gui/painting/qregion.cpp
+++ b/src/gui/painting/qregion.cpp
@@ -3558,8 +3558,10 @@ static QRegionPrivate *PolygonRegion(const QPoint *Pts, int Count, int rule)
         return region;
     }
 
-    if (!(pETEs = static_cast<EdgeTableEntry *>(malloc(sizeof(EdgeTableEntry) * Count))))
+    if (!(pETEs = static_cast<EdgeTableEntry *>(malloc(sizeof(EdgeTableEntry) * Count)))) {
+        delete region;
         return 0;
+    }
 
     region->vectorize();
 
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index f597ea0e9e..04a97aabcb 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -250,6 +250,7 @@ QTransform::QTransform()
     , m_13(0), m_23(0), m_33(1)
     , m_type(TxNone)
     , m_dirty(TxNone)
+    , d(Q_NULLPTR)
 {
 }
 
@@ -268,6 +269,7 @@ QTransform::QTransform(qreal h11, qreal h12, qreal h13,
     , m_13(h13), m_23(h23), m_33(h33)
     , m_type(TxNone)
     , m_dirty(TxProject)
+    , d(Q_NULLPTR)
 {
 }
 
@@ -284,6 +286,7 @@ QTransform::QTransform(qreal h11, qreal h12, qreal h21,
     , m_13(0), m_23(0), m_33(1)
     , m_type(TxNone)
     , m_dirty(TxShear)
+    , d(Q_NULLPTR)
 {
 }
 
@@ -299,6 +302,7 @@ QTransform::QTransform(const QMatrix &mtx)
       m_13(0), m_23(0), m_33(1)
     , m_type(TxNone)
     , m_dirty(TxShear)
+    , d(Q_NULLPTR)
 {
 }
 
diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h
index e32e29c5da..68c4548644 100644
--- a/src/gui/painting/qtransform.h
+++ b/src/gui/painting/qtransform.h
@@ -154,12 +154,18 @@ private:
         : affine(h11, h12, h21, h22, h31, h32, true)
         , m_13(h13), m_23(h23), m_33(h33)
         , m_type(TxNone)
-        , m_dirty(TxProject) {}
+        , m_dirty(TxProject)
+        , d(Q_NULLPTR)
+    {
+    }
     inline QTransform(bool)
         : affine(true)
         , m_13(0), m_23(0), m_33(1)
         , m_type(TxNone)
-        , m_dirty(TxNone) {}
+        , m_dirty(TxNone)
+        , d(Q_NULLPTR)
+    {
+    }
     inline TransformationType inline_type() const;
     QMatrix affine;
     qreal   m_13;
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 70558a7cc4..9fe1fd26e9 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -2519,6 +2519,7 @@ bool QTextEngine::atWordSeparator(int position) const
     case '`':
     case '~':
     case '|':
+    case '\\':
         return true;
     default:
         break;