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, 6 insertions, 19 deletions

diff --git a/src/quicktemplates2/qquickswipeview.cpp b/src/quicktemplates2/qquickswipeview.cpp
index 0f3b6851..f887be7b 100644
--- a/src/quicktemplates2/qquickswipeview.cpp
+++ b/src/quicktemplates2/qquickswipeview.cpp
@@ -108,13 +108,6 @@ class QQuickSwipeViewPrivate : public QQuickContainerPrivate
     Q_DECLARE_PUBLIC(QQuickSwipeView)
 
 public:
-    QQuickSwipeViewPrivate()
-        : interactive(true),
-          orientation(Qt::Horizontal)
-    {
-        changeTypes |= ImplicitWidth | ImplicitHeight;
-    }
-
     void resizeItem(QQuickItem *item);
     void resizeItems();
 
@@ -126,8 +119,8 @@ public:
     qreal getContentWidth() const override;
     qreal getContentHeight() const override;
 
-    bool interactive;
-    Qt::Orientation orientation;
+    bool interactive = true;
+    Qt::Orientation orientation = Qt::Horizontal;
 };
 
 class QQuickSwipeViewAttachedPrivate : public QObjectPrivate
@@ -135,13 +128,6 @@ class QQuickSwipeViewAttachedPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QQuickSwipeViewAttached)
 
 public:
-    QQuickSwipeViewAttachedPrivate()
-        : swipeView(nullptr),
-          index(-1),
-          currentIndex(-1)
-    {
-    }
-
     static QQuickSwipeViewAttachedPrivate *get(QQuickSwipeViewAttached *attached)
     {
         return attached->d_func();
@@ -151,9 +137,9 @@ public:
     void updateCurrentIndex();
     void setCurrentIndex(int i);
 
-    QQuickSwipeView *swipeView;
-    int index;
-    int currentIndex;
+    QQuickSwipeView *swipeView = nullptr;
+    int index = -1;
+    int currentIndex = -1;
 };
 
 void QQuickSwipeViewPrivate::resizeItems()
@@ -218,6 +204,7 @@ QQuickSwipeView::QQuickSwipeView(QQuickItem *parent)
     : QQuickContainer(*(new QQuickSwipeViewPrivate), parent)
 {
     Q_D(QQuickSwipeView);
+    d->changeTypes |= QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight;
     setFlag(ItemIsFocusScope);
     setActiveFocusOnTab(true);
     QObjectPrivate::connect(this, &QQuickContainer::currentItemChanged, d, &QQuickControlPrivate::updateImplicitContentSize);