Merge remote-tracking branch 'origin/dev' into wip/cmake

Change-Id: I0c5b939c70bdb91ccdf7068784308416dcaa5736

1 files changed, 6 insertions, 7 deletions

diff --git a/src/quick/items/qquickimage_p_p.h b/src/quick/items/qquickimage_p_p.h
index e2c467c311..1c4ba88655 100644
--- a/src/quick/items/qquickimage_p_p.h
+++ b/src/quick/items/qquickimage_p_p.h
@@ -80,19 +80,18 @@ class Q_QUICK_PRIVATE_EXPORT QQuickImagePrivate : public QQuickImageBasePrivate
 
 public:
     QQuickImagePrivate();
-
-    QQuickImage::FillMode fillMode;
-    qreal paintedWidth;
-    qreal paintedHeight;
     void setImage(const QImage &img);
     void setPixmap(const QQuickPixmap &pixmap);
 
     bool pixmapChanged : 1;
     bool mipmap : 1;
-    QQuickImage::HAlignment hAlign;
-    QQuickImage::VAlignment vAlign;
+    QQuickImage::HAlignment hAlign = QQuickImage::AlignHCenter;
+    QQuickImage::VAlignment vAlign = QQuickImage::AlignVCenter;
+    QQuickImage::FillMode fillMode = QQuickImage::Stretch;
 
-    QQuickImageTextureProvider *provider;
+    qreal paintedWidth = 0;
+    qreal paintedHeight = 0;
+    QQuickImageTextureProvider *provider = nullptr;
 };
 
 QT_END_NAMESPACE