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, 45 insertions, 44 deletions

diff --git a/src/quicktemplates2/qquickpopup_p_p.h b/src/quicktemplates2/qquickpopup_p_p.h
index 00fba84ced..e32fdb2872 100644
--- a/src/quicktemplates2/qquickpopup_p_p.h
+++ b/src/quicktemplates2/qquickpopup_p_p.h
@@ -78,7 +78,7 @@ protected:
     void finished() override;
 
 private:
-    QQuickPopupPrivate *popup;
+    QQuickPopupPrivate *popup = nullptr;
 };
 
 class Q_AUTOTEST_EXPORT QQuickPopupPrivate : public QObjectPrivate, public QQuickItemChangeListener
@@ -87,7 +87,6 @@ class Q_AUTOTEST_EXPORT QQuickPopupPrivate : public QObjectPrivate, public QQuic
 
 public:
     QQuickPopupPrivate();
-    ~QQuickPopupPrivate();
 
     static QQuickPopupPrivate *get(QQuickPopup *popup)
     {
@@ -149,52 +148,54 @@ public:
         NoTransition, EnterTransition, ExitTransition
     };
 
-    bool focus;
-    bool modal;
-    bool dim;
-    bool hasDim;
-    bool visible;
-    bool complete;
-    bool positioning;
-    bool hasWidth;
-    bool hasHeight;
-    bool hasTopMargin;
-    bool hasLeftMargin;
-    bool hasRightMargin;
-    bool hasBottomMargin;
-    bool allowVerticalFlip;
-    bool allowHorizontalFlip;
-    bool allowVerticalMove;
-    bool allowHorizontalMove;
-    bool allowVerticalResize;
-    bool allowHorizontalResize;
-    bool hadActiveFocusBeforeExitTransition;
-    bool interactive;
-    bool hasClosePolicy;
-    int touchId;
-    qreal x;
-    qreal y;
-    qreal effectiveX;
-    qreal effectiveY;
-    qreal margins;
-    qreal topMargin;
-    qreal leftMargin;
-    qreal rightMargin;
-    qreal bottomMargin;
+    static const QQuickPopup::ClosePolicy DefaultClosePolicy;
+
+    bool focus = false;
+    bool modal = false;
+    bool dim = false;
+    bool hasDim = false;
+    bool visible = false;
+    bool complete = true;
+    bool positioning = false;
+    bool hasWidth = false;
+    bool hasHeight = false;
+    bool hasTopMargin = false;
+    bool hasLeftMargin = false;
+    bool hasRightMargin = false;
+    bool hasBottomMargin = false;
+    bool allowVerticalFlip = false;
+    bool allowHorizontalFlip = false;
+    bool allowVerticalMove = true;
+    bool allowHorizontalMove = true;
+    bool allowVerticalResize = true;
+    bool allowHorizontalResize = true;
+    bool hadActiveFocusBeforeExitTransition = false;
+    bool interactive = true;
+    bool hasClosePolicy = false;
+    int touchId = -1;
+    qreal x = 0;
+    qreal y = 0;
+    qreal effectiveX = 0;
+    qreal effectiveY = 0;
+    qreal margins = -1;
+    qreal topMargin = 0;
+    qreal leftMargin = 0;
+    qreal rightMargin = 0;
+    qreal bottomMargin = 0;
     QPointF pressPoint;
-    TransitionState transitionState;
-    QQuickPopup::ClosePolicy closePolicy;
-    QQuickItem *parentItem;
-    QQuickItem *dimmer;
-    QQuickWindow *window;
-    QQuickTransition *enter;
-    QQuickTransition *exit;
-    QQuickPopupItem *popupItem;
-    QQuickPopupPositioner *positioner;
+    TransitionState transitionState = NoTransition;
+    QQuickPopup::ClosePolicy closePolicy = DefaultClosePolicy;
+    QQuickItem *parentItem = nullptr;
+    QQuickItem *dimmer = nullptr;
+    QQuickWindow *window = nullptr;
+    QQuickTransition *enter = nullptr;
+    QQuickTransition *exit = nullptr;
+    QQuickPopupItem *popupItem = nullptr;
+    QQuickPopupPositioner *positioner = nullptr;
     QList<QQuickStateAction> enterActions;
     QList<QQuickStateAction> exitActions;
     QQuickPopupTransitionManager transitionManager;
-    QQuickPopupAnchors *anchors;
+    QQuickPopupAnchors *anchors = nullptr;
 
     friend class QQuickPopupTransitionManager;
 };