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

Comparing colors in tst_material.qml works fine now.

Conflicts:
	examples/quickcontrols2/gallery/qtquickcontrols2.conf
	tests/auto/material/data/tst_material.qml

Task-number: QTBUG-53556
Change-Id: I59970442a09bd72bf0ce53fe838c560ca8daf325

1 files changed, 5 insertions, 4 deletions

diff --git a/src/quicktemplates2/qquicktoolbar.cpp b/src/quicktemplates2/qquicktoolbar.cpp
index edf0bebf..9342c27a 100644
--- a/src/quicktemplates2/qquicktoolbar.cpp
+++ b/src/quicktemplates2/qquicktoolbar.cpp
@@ -35,15 +35,16 @@
 ****************************************************************************/
 
 #include "qquicktoolbar_p.h"
-#include "qquickframe_p_p.h"
+#include "qquickpane_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
 /*!
     \qmltype ToolBar
-    \inherits Frame
+    \inherits Pane
     \instantiates QQuickToolBar
     \inqmlmodule QtQuick.Controls
+    \since 5.7
     \ingroup qtquickcontrols2-containers
     \brief A container with context-sensitive controls.
 
@@ -90,7 +91,7 @@ QT_BEGIN_NAMESPACE
     \sa ApplicationWindow, ToolButton, {Customizing ToolBar}, {Container Controls}
 */
 
-class QQuickToolBarPrivate : public QQuickFramePrivate
+class QQuickToolBarPrivate : public QQuickPanePrivate
 {
 public:
     QQuickToolBarPrivate() : position(QQuickToolBar::Header) { }
@@ -99,7 +100,7 @@ public:
 };
 
 QQuickToolBar::QQuickToolBar(QQuickItem *parent) :
-    QQuickFrame(*(new QQuickToolBarPrivate), parent)
+    QQuickPane(*(new QQuickToolBarPrivate), parent)
 {
 }