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

diff --git a/src/quicktemplates2/qquicktabbar.cpp b/src/quicktemplates2/qquicktabbar.cpp
index 3873ecfa..1db04ba0 100644
--- a/src/quicktemplates2/qquicktabbar.cpp
+++ b/src/quicktemplates2/qquicktabbar.cpp
@@ -100,8 +100,6 @@ class QQuickTabBarPrivate : public QQuickContainerPrivate
     Q_DECLARE_PUBLIC(QQuickTabBar)
 
 public:
-    QQuickTabBarPrivate();
-
     void updateCurrentItem();
     void updateCurrentIndex();
     void updateLayout();
@@ -113,8 +111,8 @@ public:
     void itemImplicitWidthChanged(QQuickItem *item) override;
     void itemImplicitHeightChanged(QQuickItem *item) override;
 
-    bool updatingLayout;
-    QQuickTabBar::Position position;
+    bool updatingLayout = false;
+    QQuickTabBar::Position position = QQuickTabBar::Header;
 };
 
 class QQuickTabBarAttachedPrivate : public QObjectPrivate
@@ -122,12 +120,6 @@ class QQuickTabBarAttachedPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QQuickTabBarAttached)
 
 public:
-    QQuickTabBarAttachedPrivate()
-        : index(-1),
-          tabBar(nullptr)
-    {
-    }
-
     static QQuickTabBarAttachedPrivate *get(QQuickTabBarAttached *attached)
     {
         return attached->d_func();
@@ -135,17 +127,10 @@ public:
 
     void update(QQuickTabBar *tabBar, int index);
 
-    int index;
-    QQuickTabBar *tabBar;
+    int index = -1;
+    QQuickTabBar *tabBar = nullptr;
 };
 
-QQuickTabBarPrivate::QQuickTabBarPrivate()
-    : updatingLayout(false),
-      position(QQuickTabBar::Header)
-{
-    changeTypes |= Geometry | ImplicitWidth | ImplicitHeight;
-}
-
 void QQuickTabBarPrivate::updateCurrentItem()
 {
     QQuickTabButton *button = qobject_cast<QQuickTabButton *>(contentModel->get(currentIndex));
@@ -265,6 +250,7 @@ QQuickTabBar::QQuickTabBar(QQuickItem *parent)
     : QQuickContainer(*(new QQuickTabBarPrivate), parent)
 {
     Q_D(QQuickTabBar);
+    d->changeTypes |= QQuickItemPrivate::Geometry | QQuickItemPrivate::ImplicitWidth | QQuickItemPrivate::ImplicitHeight;
     setFlag(ItemIsFocusScope);
     QObjectPrivate::connect(this, &QQuickTabBar::currentIndexChanged, d, &QQuickTabBarPrivate::updateCurrentItem);
 }