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

Change-Id: Idf19dd882ba3015be2afda6988cac1e95a4912fa

2 files changed, 3 insertions, 2 deletions

diff --git a/src/quicktemplates2/qquickcontainer.cpp b/src/quicktemplates2/qquickcontainer.cpp
index be70f540..31a92b5d 100644
--- a/src/quicktemplates2/qquickcontainer.cpp
+++ b/src/quicktemplates2/qquickcontainer.cpp
@@ -55,11 +55,11 @@ QT_BEGIN_NAMESPACE
 
     \section2 Using Containers
 
-    Container provides API to \l {addItem}{add}, \l {insertItem}{insert},
+    Container provides an API to \l {addItem}{add}, \l {insertItem}{insert},
     \l {moveItem}{move} and \l {removeItem}{remove} items dynamically. The
     items in a container can be accessed using \l itemAt() or \l contentChildren.
 
-    Most containers have a concept of a "current" item. The current item is
+    Most containers have the concept of a "current" item. The current item is
     specified via the \l currentIndex property, and can be accessed using the
     read-only \l currentItem property.
 
diff --git a/src/quicktemplates2/qquickstackview_p.cpp b/src/quicktemplates2/qquickstackview_p.cpp
index 5d25793e..0f5674c2 100644
--- a/src/quicktemplates2/qquickstackview_p.cpp
+++ b/src/quicktemplates2/qquickstackview_p.cpp
@@ -155,6 +155,7 @@ void QQuickStackElement::incubate(QObject *object)
     item = qmlobject_cast<QQuickItem *>(object);
     if (item) {
         QQmlEngine::setObjectOwnership(item, QQmlEngine::CppOwnership);
+        item->setParent(view);
         initialize();
     }
 }