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, 0 insertions, 43 deletions

diff --git a/src/quicktemplates2/qquickcontrol.cpp b/src/quicktemplates2/qquickcontrol.cpp
index 81950ee5..7174ba35 100644
--- a/src/quicktemplates2/qquickcontrol.cpp
+++ b/src/quicktemplates2/qquickcontrol.cpp
@@ -137,50 +137,7 @@ static bool isKeyFocusReason(Qt::FocusReason reason)
     return reason == Qt::TabFocusReason || reason == Qt::BacktabFocusReason || reason == Qt::ShortcutFocusReason;
 }
 
-QQuickControlPrivate::ExtraData::ExtraData()
-    : hasTopPadding(false),
-      hasLeftPadding(false),
-      hasRightPadding(false),
-      hasBottomPadding(false),
-      hasBaselineOffset(false),
-      hasTopInset(false),
-      hasLeftInset(false),
-      hasRightInset(false),
-      hasBottomInset(false),
-      hasBackgroundWidth(false),
-      hasBackgroundHeight(false),
-      topPadding(0),
-      leftPadding(0),
-      rightPadding(0),
-      bottomPadding(0),
-      topInset(0),
-      leftInset(0),
-      rightInset(0),
-      bottomInset(0)
-{
-}
-
 QQuickControlPrivate::QQuickControlPrivate()
-    : hasHorizontalPadding(false),
-      hasVerticalPadding(false),
-      hasLocale(false),
-      wheelEnabled(false),
-#if QT_CONFIG(quicktemplates2_hover)
-      hovered(false),
-      explicitHoverEnabled(false),
-#endif
-      resizingBackground(false),
-      touchId(-1),
-      padding(0),
-      horizontalPadding(0),
-      verticalPadding(0),
-      implicitContentWidth(0),
-      implicitContentHeight(0),
-      spacing(0),
-      focusPolicy(Qt::NoFocus),
-      focusReason(Qt::OtherFocusReason),
-      background(nullptr),
-      contentItem(nullptr)
 {
 #if QT_CONFIG(accessibility)
     QAccessible::installActivationObserver(this);