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

Conflicts:
	src/imports/controls/material/DialogButtonBox.qml
	src/imports/controls/universal/DialogButtonBox.qml

Change-Id: I16cbf9912a3526783c21a6f30996f83fce9e02c3

9 files changed, 13 insertions, 0 deletions

diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png
deleted file mode 100644
index a487bd27..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png
deleted file mode 100644
index 7e7e281b..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png b/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png
deleted file mode 100644
index 2dff7764..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png
deleted file mode 100644
index 060d2b2a..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png
deleted file mode 100644
index 2384f76a..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png
+++ /dev/null
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png
deleted file mode 100644
index 5f84f62a..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png
+++ /dev/null
diff --git a/src/imports/controls/material/DialogButtonBox.qml b/src/imports/controls/material/DialogButtonBox.qml
index 34ee0913..82d988cc 100644
--- a/src/imports/controls/material/DialogButtonBox.qml
+++ b/src/imports/controls/material/DialogButtonBox.qml
@@ -36,6 +36,7 @@
 
 import QtQuick 2.9
 import QtQuick.Templates 2.2 as T
+import QtQuick.Controls 2.2
 import QtQuick.Controls.Material 2.2
 import QtQuick.Controls.Material.impl 2.2
 
diff --git a/src/imports/controls/universal/DialogButtonBox.qml b/src/imports/controls/universal/DialogButtonBox.qml
index 4c7d3a21..0ab84db8 100644
--- a/src/imports/controls/universal/DialogButtonBox.qml
+++ b/src/imports/controls/universal/DialogButtonBox.qml
@@ -36,6 +36,7 @@
 
 import QtQuick 2.9
 import QtQuick.Templates 2.2 as T
+import QtQuick.Controls 2.2
 import QtQuick.Controls.Universal 2.2
 
 T.DialogButtonBox {
diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp
index b5bf0af7..0838e762 100644
--- a/src/quicktemplates2/qquickstackview.cpp
+++ b/src/quicktemplates2/qquickstackview.cpp
@@ -466,6 +466,8 @@ QQuickItem *QQuickStackView::find(const QJSValue &callback, LoadBehavior behavio
     \value StackView.ReplaceTransition An operation with replace transitions (since QtQuick.Controls 2.1).
     \value StackView.PopTransition An operation with pop transitions (since QtQuick.Controls 2.1).
 
+    \note Items that already exist in the stack are not pushed.
+
     \sa initialItem, {Pushing Items}
 */
 void QQuickStackView::push(QQmlV4Function *args)
@@ -486,6 +488,15 @@ void QQuickStackView::push(QQmlV4Function *args)
         operation = static_cast<Operation>(lastArg->toInt32());
 
     QList<QQuickStackElement *> elements = d->parseElements(args);
+    // Remove any items that are already in the stack, as they can't be in two places at once.
+    for (int i = 0; i < elements.size(); ) {
+        QQuickStackElement *element = elements.at(i);
+        if (element->item && d->findElement(element->item))
+            elements.removeAt(i);
+        else
+            ++i;
+    }
+
     if (elements.isEmpty()) {
         qmlInfo(this) << "push: nothing to push";
         args->setReturnValue(QV4::Encode::null());