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

Conflicts:
	examples/quickcontrols2/gallery/gallery.qrc
	src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
	src/quicktemplates2/qquickstackview_p.cpp
	src/quicktemplates2/qquickstackview_p_p.h
	tests/auto/controls/data/tst_stackview.qml

Change-Id: If451fe0e5653572d305b4de90a6d5cb878463e8d

2 files changed, 64 insertions, 4 deletions

diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml
new file mode 100644
index 00000000..88cadc27
--- /dev/null
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-interactive.qml
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick.Controls 2.0
+
+Pane {
+//! [1]
+SwipeView {
+    id: view
+    currentIndex: pageIndicator.currentIndex
+    anchors.fill: parent
+
+    Page {
+        title: qsTr("Home")
+    }
+    Page {
+        title: qsTr("Discover")
+    }
+    Page {
+        title: qsTr("Activity")
+    }
+}
+
+PageIndicator {
+    id: pageIndicator
+    interactive: true
+    count: view.count
+    currentIndex: view.currentIndex
+
+    anchors.bottom: parent.bottom
+    anchors.horizontalCenter: parent.horizontalCenter
+}
+//! [1]
+}
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
index 1a1b7b3c..a1c4eeef 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
@@ -135,9 +135,10 @@
     The configuration file can specify the preferred style (may be overridden by either
     of the methods described earlier) and certain style-specific attributes. The following
     example specifies that the preferred style is the Material style. Furthermore, when the
-    application is run with the Material style, its theme is light and the accent color is
-    brown. However, if the application is run with the Universal style instead, the accent
-    color is red and the appropriate theme is chosen based on the system theme colors.
+    application is run with the Material style, its theme is light and the accent and primary
+    colors are teal and blue grey, respectively. However, if the application is run with the
+    Universal style instead, the accent color is red and the appropriate theme is chosen based
+    on the system theme colors.
 
     \code
     [Controls]
@@ -149,7 +150,8 @@
 
     [Material]
     Theme=Light
-    Accent=Brown
+    Accent=Teal
+    Primary=BlueGrey
     \endcode
 
     In order to make it possible for Qt Quick Controls 2 to find the configuration file,