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, 16 insertions, 34 deletions

diff --git a/src/quicktemplates2/qquickswipedelegate.cpp b/src/quicktemplates2/qquickswipedelegate.cpp
index ed6da9dc..b4c1c18e 100644
--- a/src/quicktemplates2/qquickswipedelegate.cpp
+++ b/src/quicktemplates2/qquickswipedelegate.cpp
@@ -127,7 +127,7 @@ protected:
     void finished() override;
 
 private:
-    QQuickSwipe *m_swipe;
+    QQuickSwipe *m_swipe = nullptr;
 };
 
 class QQuickSwipePrivate : public QObjectPrivate
@@ -135,23 +135,7 @@ class QQuickSwipePrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QQuickSwipe)
 
 public:
-    QQuickSwipePrivate(QQuickSwipeDelegate *control)
-        : control(control),
-          positionBeforePress(0),
-          position(0),
-          wasComplete(false),
-          complete(false),
-          enabled(true),
-          left(nullptr),
-          behind(nullptr),
-          right(nullptr),
-          leftItem(nullptr),
-          behindItem(nullptr),
-          rightItem(nullptr),
-          transition(nullptr),
-          transitionManager(nullptr)
-    {
-    }
+    QQuickSwipePrivate(QQuickSwipeDelegate *control) : control(control) { }
 
     static QQuickSwipePrivate *get(QQuickSwipe *swipe);
 
@@ -175,24 +159,24 @@ public:
     void beginTransition(qreal position);
     void finishTransition();
 
-    QQuickSwipeDelegate *control;
+    QQuickSwipeDelegate *control = nullptr;
     // Same range as position, but is set before press events so that we can
     // keep track of which direction the user must swipe when using left and right delegates.
-    qreal positionBeforePress;
-    qreal position;
+    qreal positionBeforePress = 0;
+    qreal position = 0;
     // A "less strict" version of complete that is true if complete was true
     // before the last press event.
-    bool wasComplete;
-    bool complete;
-    bool enabled;
+    bool wasComplete = false;
+    bool complete = false;
+    bool enabled = true;
     QQuickVelocityCalculator velocityCalculator;
-    QQmlComponent *left;
-    QQmlComponent *behind;
-    QQmlComponent *right;
-    QQuickItem *leftItem;
-    QQuickItem *behindItem;
-    QQuickItem *rightItem;
-    QQuickTransition *transition;
+    QQmlComponent *left = nullptr;
+    QQmlComponent *behind = nullptr;
+    QQmlComponent *right = nullptr;
+    QQuickItem *leftItem = nullptr;
+    QQuickItem *behindItem = nullptr;
+    QQuickItem *rightItem = nullptr;
+    QQuickTransition *transition = nullptr;
     QScopedPointer<QQuickSwipeTransitionManager> transitionManager;
 };
 
@@ -1257,10 +1241,8 @@ class QQuickSwipeDelegateAttachedPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QQuickSwipeDelegateAttached)
 
 public:
-    QQuickSwipeDelegateAttachedPrivate() : pressed(false) { }
-
     // True when left/right/behind is non-interactive and is pressed.
-    bool pressed;
+    bool pressed = false;
 };
 
 /*!