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, 4 insertions, 13 deletions

diff --git a/src/quicktemplates2/qquickdelaybutton.cpp b/src/quicktemplates2/qquickdelaybutton.cpp
index 02efc3a2..a42057bd 100644
--- a/src/quicktemplates2/qquickdelaybutton.cpp
+++ b/src/quicktemplates2/qquickdelaybutton.cpp
@@ -80,15 +80,13 @@ class QQuickDelayButtonPrivate : public QQuickAbstractButtonPrivate
     Q_DECLARE_PUBLIC(QQuickDelayButton)
 
 public:
-    QQuickDelayButtonPrivate();
-
     void beginTransition(qreal to);
     void finishTransition();
     void cancelTransition();
 
-    int delay;
-    qreal progress;
-    QQuickTransition *transition;
+    int delay = 300;
+    qreal progress = 0.0;
+    QQuickTransition *transition = nullptr;
     QScopedPointer<QQuickDelayTransitionManager> transitionManager;
 };
 
@@ -103,7 +101,7 @@ protected:
     void finished() override;
 
 private:
-    QQuickDelayButton *m_button;
+    QQuickDelayButton *m_button = nullptr;
 };
 
 void QQuickDelayTransitionManager::transition(QQuickTransition *transition, qreal progress)
@@ -129,13 +127,6 @@ void QQuickDelayTransitionManager::finished()
         emit m_button->activated();
 }
 
-QQuickDelayButtonPrivate::QQuickDelayButtonPrivate()
-    : delay(3000),
-      progress(0.0),
-      transition(nullptr)
-{
-}
-
 void QQuickDelayButtonPrivate::beginTransition(qreal to)
 {
     Q_Q(QQuickDelayButton);