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

 Conflicts:
	src/quicktemplates2/qquickabstractbutton_p_p.h
	src/quicktemplates2/qquickcombobox.cpp
	src/quicktemplates2/qquickcontainer.cpp
	src/quicktemplates2/qquickcontrol.cpp
	src/quicktemplates2/qquickcontrol_p_p.h
	src/quicktemplates2/qquickdialog_p_p.h
	src/quicktemplates2/qquickdialogbuttonbox.cpp
	src/quicktemplates2/qquickdialogbuttonbox_p_p.h
	src/quicktemplates2/qquickdrawer.cpp
	src/quicktemplates2/qquickmenubar.cpp
	src/quicktemplates2/qquickmenubar_p_p.h
	src/quicktemplates2/qquickpage.cpp
	src/quicktemplates2/qquickpage_p_p.h
	src/quicktemplates2/qquickpane.cpp
	src/quicktemplates2/qquickpane_p_p.h
	src/quicktemplates2/qquickpopup.cpp
	src/quicktemplates2/qquickpopup_p_p.h
	src/quicktemplates2/qquickrangeslider.cpp
	src/quicktemplates2/qquickscrollview.cpp
	src/quicktemplates2/qquickslider.cpp
	src/quicktemplates2/qquickspinbox.cpp
	src/quicktemplates2/qquickswipeview.cpp
	src/quicktemplates2/qquicktabbar.cpp
	src/quicktemplates2/qquicktextarea_p_p.h
	src/quicktemplates2/qquicktextfield_p_p.h
	src/quicktemplates2/qquicktheme_p.h

Change-Id: I6e2b8fe99e51e3e26c87546aa66af045bc429ec4

1 files changed, 15 insertions, 20 deletions

diff --git a/src/quicktemplates2/qquicktumbler_p_p.h b/src/quicktemplates2/qquicktumbler_p_p.h
index 24589486..4d4c3bcf 100644
--- a/src/quicktemplates2/qquicktumbler_p_p.h
+++ b/src/quicktemplates2/qquicktumbler_p_p.h
@@ -58,9 +58,6 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickTumblerPrivate : public QQuickContr
     Q_DECLARE_PUBLIC(QQuickTumbler)
 
 public:
-    QQuickTumblerPrivate();
-    ~QQuickTumblerPrivate();
-
     enum ContentItemType {
         NoContentItem,
         UnsupportedContentItemType,
@@ -75,23 +72,23 @@ public:
     static QQuickTumblerPrivate *get(QQuickTumbler *tumbler);
 
     QVariant model;
-    QQmlComponent *delegate;
-    int visibleItemCount;
-    bool wrap;
-    bool explicitWrap;
-    bool ignoreWrapChanges;
-    QQuickItem *view;
-    QQuickItem *viewContentItem;
-    ContentItemType viewContentItemType;
+    QQmlComponent *delegate = nullptr;
+    int visibleItemCount = 5;
+    bool wrap = true;
+    bool explicitWrap = false;
+    bool ignoreWrapChanges = false;
+    QQuickItem *view = nullptr;
+    QQuickItem *viewContentItem = nullptr;
+    ContentItemType viewContentItemType = UnsupportedContentItemType;
     union {
         qreal viewOffset; // PathView
         qreal viewContentY; // ListView
     };
-    int currentIndex;
-    int pendingCurrentIndex;
-    bool ignoreCurrentIndexChanges;
-    int count;
-    bool ignoreSignals;
+    int currentIndex = -1;
+    int pendingCurrentIndex = -1;
+    bool ignoreCurrentIndexChanges = false;
+    int count = 0;
+    bool ignoreSignals = false;
 
     void _q_updateItemHeights();
     void _q_updateItemWidths();
@@ -123,8 +120,6 @@ class QQuickTumblerAttachedPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QQuickTumblerAttached)
 
 public:
-    QQuickTumblerAttachedPrivate();
-
     static QQuickTumblerAttachedPrivate *get(QQuickTumblerAttached *attached)
     {
         return attached->d_func();
@@ -138,9 +133,9 @@ public:
     // The Tumbler that contains the delegate. Required to calculated the displacement.
     QPointer<QQuickTumbler> tumbler;
     // The index of the delegate. Used to calculate the displacement.
-    int index;
+    int index = -1;
     // The displacement for our delegate.
-    qreal displacement;
+    qreal displacement = 0;
 };
 
 QT_END_NAMESPACE