Merge remote-tracking branch 'origin/5.6' into 5.7

Conflicts:
	.qmake.conf

Change-Id: Ia45d6b4318ffe60c386c8548de7bb3f07c4cd6f9

5 files changed, 37 insertions, 9 deletions

diff --git a/src/controls/Label.qml b/src/controls/Label.qml
index 47db7389..f9bc8cdd 100644
--- a/src/controls/Label.qml
+++ b/src/controls/Label.qml
@@ -84,13 +84,9 @@ Text {
     */
 
     id: label
-    color: pal.windowText
+    color: SystemPaletteSingleton.windowText(enabled)
     activeFocusOnTab: false
     renderType: Settings.isMobile ? Text.QtRendering : Text.NativeRendering
-    SystemPalette {
-        id: pal
-        colorGroup: enabled ? SystemPalette.Active : SystemPalette.Disabled
-    }
     Accessible.name: text
     Accessible.role: Accessible.StaticText
 }
diff --git a/src/controls/Private/qquickstyleitem.cpp b/src/controls/Private/qquickstyleitem.cpp
index 527fefce..4f6aec08 100644
--- a/src/controls/Private/qquickstyleitem.cpp
+++ b/src/controls/Private/qquickstyleitem.cpp
@@ -277,7 +277,39 @@ QQuickStyleItem1::QQuickStyleItem1(QQuickItem *parent)
 
 QQuickStyleItem1::~QQuickStyleItem1()
 {
-    delete m_styleoption;
+    if (const QStyleOptionButton *aux = qstyleoption_cast<const QStyleOptionButton*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionViewItem *aux = qstyleoption_cast<const QStyleOptionViewItem*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionHeader *aux = qstyleoption_cast<const QStyleOptionHeader*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionToolButton *aux = qstyleoption_cast<const QStyleOptionToolButton*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionToolBar *aux = qstyleoption_cast<const QStyleOptionToolBar*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionTab *aux = qstyleoption_cast<const QStyleOptionTab*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionFrame *aux = qstyleoption_cast<const QStyleOptionFrame*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionFocusRect *aux = qstyleoption_cast<const QStyleOptionFocusRect*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionTabWidgetFrame *aux = qstyleoption_cast<const QStyleOptionTabWidgetFrame*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionMenuItem *aux = qstyleoption_cast<const QStyleOptionMenuItem*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionComboBox *aux = qstyleoption_cast<const QStyleOptionComboBox*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionSpinBox *aux = qstyleoption_cast<const QStyleOptionSpinBox*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionSlider *aux = qstyleoption_cast<const QStyleOptionSlider*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionProgressBar *aux = qstyleoption_cast<const QStyleOptionProgressBar*>(m_styleoption))
+        delete aux;
+    else if (const QStyleOptionGroupBox *aux = qstyleoption_cast<const QStyleOptionGroupBox*>(m_styleoption))
+        delete aux;
+    else
+        delete m_styleoption;
+
     m_styleoption = 0;
 }
 
diff --git a/src/controls/doc/qtquickcontrols.qdocconf b/src/controls/doc/qtquickcontrols.qdocconf
index 801cfb75..9aada9f6 100644
--- a/src/controls/doc/qtquickcontrols.qdocconf
+++ b/src/controls/doc/qtquickcontrols.qdocconf
@@ -41,7 +41,7 @@ depends = qtcore qtdoc qtgui qtwidgets qtqml qtquick qtquicklayouts qtquickdialo
 # is given as part of \example commands
 exampledirs += ../../../examples/quickcontrols/controls \
     snippets
-examplesinstallpath = qtquickcontrols/quickcontrols/controls
+examplesinstallpath = quickcontrols/controls
 
 headerdirs += ..
 
diff --git a/src/dialogs/doc/qtquickdialogs.qdocconf b/src/dialogs/doc/qtquickdialogs.qdocconf
index d4c55b84..ccb555a7 100644
--- a/src/dialogs/doc/qtquickdialogs.qdocconf
+++ b/src/dialogs/doc/qtquickdialogs.qdocconf
@@ -26,7 +26,7 @@ depends = qtqml qtquick qtgui qtwidgets qtdoc qtcore
 
 exampledirs += ../../../examples/quickcontrols/dialogs
 
-examplesinstallpath = qtquickcontrols/quickcontrols/dialogs
+examplesinstallpath = quickcontrols/dialogs
 
 headerdirs += ..
 
diff --git a/src/extras/doc/qtquickextras.qdocconf b/src/extras/doc/qtquickextras.qdocconf
index f854b89e..5c4dc472 100644
--- a/src/extras/doc/qtquickextras.qdocconf
+++ b/src/extras/doc/qtquickextras.qdocconf
@@ -30,7 +30,7 @@ qhp.QtQuickExtras.subprojects.qtquickextrasexamples.sortPages  = true
 depends = qtqml qtquick qtdoc qtquickcontrols qtgui
 
 exampledirs += ../../../examples/quickcontrols/extras
-examplesinstallpath = qtquickcontrols/quickcontrols/extras
+examplesinstallpath = quickcontrols/extras
 
 headerdirs += ../