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, 14 insertions, 37 deletions

diff --git a/src/quicktemplates2/qquickspinbox.cpp b/src/quicktemplates2/qquickspinbox.cpp
index c5bde74e..46519dc7 100644
--- a/src/quicktemplates2/qquickspinbox.cpp
+++ b/src/quicktemplates2/qquickspinbox.cpp
@@ -108,22 +108,6 @@ class QQuickSpinBoxPrivate : public QQuickControlPrivate
     Q_DECLARE_PUBLIC(QQuickSpinBox)
 
 public:
-    QQuickSpinBoxPrivate()
-        : editable(false),
-          wrap(false),
-          from(0),
-          to(99),
-          value(0),
-          stepSize(1),
-          delayTimer(0),
-          repeatTimer(0),
-          up(nullptr),
-          down(nullptr),
-          validator(nullptr),
-          inputMethodHints(Qt::ImhDigitsOnly)
-    {
-    }
-
     int boundValue(int value, bool wrap) const;
     void updateValue();
     bool setValue(int value, bool wrap, bool modified);
@@ -154,21 +138,21 @@ public:
     void itemImplicitWidthChanged(QQuickItem *item) override;
     void itemImplicitHeightChanged(QQuickItem *item) override;
 
-    bool editable;
-    bool wrap;
-    int from;
-    int to;
-    int value;
-    int stepSize;
-    int delayTimer;
-    int repeatTimer;
+    bool editable = false;
+    bool wrap = false;
+    int from = 0;
+    int to = 99;
+    int value = 0;
+    int stepSize = 1;
+    int delayTimer = 0;
+    int repeatTimer = 0;
     QString displayText;
-    QQuickSpinButton *up;
-    QQuickSpinButton *down;
-    QValidator *validator;
+    QQuickSpinButton *up = nullptr;
+    QQuickSpinButton *down = nullptr;
+    QValidator *validator = nullptr;
     mutable QJSValue textFromValue;
     mutable QJSValue valueFromText;
-    Qt::InputMethodHints inputMethodHints;
+    Qt::InputMethodHints inputMethodHints = Qt::ImhDigitsOnly;
 };
 
 class QQuickSpinButtonPrivate : public QObjectPrivate
@@ -176,13 +160,6 @@ class QQuickSpinButtonPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QQuickSpinButton)
 
 public:
-    QQuickSpinButtonPrivate()
-        : pressed(false),
-          hovered(false),
-          indicator(nullptr)
-    {
-    }
-
     static QQuickSpinButtonPrivate *get(QQuickSpinButton *button)
     {
         return button->d_func();
@@ -191,8 +168,8 @@ public:
     void cancelIndicator();
     void executeIndicator(bool complete = false);
 
-    bool pressed;
-    bool hovered;
+    bool pressed = false;
+    bool hovered = false;
     QQuickDeferredPointer<QQuickItem> indicator;
 };