1 files changed, 18 insertions, 16 deletions

diff --git a/src/quicktemplates2/qquickstackview.cpp b/src/quicktemplates2/qquickstackview.cpp
index d16d7b16..b5bf0af7 100644
--- a/src/quicktemplates2/qquickstackview.cpp
+++ b/src/quicktemplates2/qquickstackview.cpp
@@ -36,6 +36,8 @@
 
 #include "qquickstackview_p.h"
 #include "qquickstackview_p_p.h"
+#include "qquickstackelement_p_p.h"
+#include "qquickstacktransition_p_p.h"
 
 #include <QtQml/qjsvalue.h>
 #include <QtQml/qqmlengine.h>
@@ -109,7 +111,7 @@ QT_BEGIN_NAMESPACE
     Using StackView in an application is as simple as adding it as a child to
     a Window. The stack is usually anchored to the edges of the window, except
     at the top or bottom where it might be anchored to a status bar, or some
-    other similar UI component. The stack can then be  used by invoking its
+    other similar UI component. The stack can then be used by invoking its
     navigation methods. The first item to show in the StackView is the one
     that was assigned to \l initialItem, or the topmost item if \l initialItem
     is not set.
@@ -312,9 +314,9 @@ QQuickStackView::~QQuickStackView()
     qDeleteAll(d->elements);
 }
 
-QQuickStackAttached *QQuickStackView::qmlAttachedProperties(QObject *object)
+QQuickStackViewAttached *QQuickStackView::qmlAttachedProperties(QObject *object)
 {
-    return new QQuickStackAttached(object);
+    return new QQuickStackViewAttached(object);
 }
 
 /*!
@@ -999,9 +1001,9 @@ QAccessible::Role QQuickStackView::accessibleRole() const
 }
 #endif
 
-void QQuickStackAttachedPrivate::itemParentChanged(QQuickItem *item, QQuickItem *parent)
+void QQuickStackViewAttachedPrivate::itemParentChanged(QQuickItem *item, QQuickItem *parent)
 {
-    Q_Q(QQuickStackAttached);
+    Q_Q(QQuickStackViewAttached);
     int oldIndex = element ? element->index : -1;
     QQuickStackView *oldView = element ? element->view : nullptr;
     QQuickStackView::Status oldStatus = element ? element->status : QQuickStackView::Inactive;
@@ -1020,10 +1022,10 @@ void QQuickStackAttachedPrivate::itemParentChanged(QQuickItem *item, QQuickItem
         emit q->statusChanged();
 }
 
-QQuickStackAttached::QQuickStackAttached(QObject *parent) :
-    QObject(*(new QQuickStackAttachedPrivate), parent)
+QQuickStackViewAttached::QQuickStackViewAttached(QObject *parent) :
+    QObject(*(new QQuickStackViewAttachedPrivate), parent)
 {
-    Q_D(QQuickStackAttached);
+    Q_D(QQuickStackViewAttached);
     QQuickItem *item = qobject_cast<QQuickItem *>(parent);
     if (item) {
         QQuickItemPrivate::get(item)->addItemChangeListener(d, QQuickItemPrivate::Parent);
@@ -1033,9 +1035,9 @@ QQuickStackAttached::QQuickStackAttached(QObject *parent) :
     }
 }
 
-QQuickStackAttached::~QQuickStackAttached()
+QQuickStackViewAttached::~QQuickStackViewAttached()
 {
-    Q_D(QQuickStackAttached);
+    Q_D(QQuickStackViewAttached);
     QQuickItem *parentItem = qobject_cast<QQuickItem *>(parent());
     if (parentItem)
         QQuickItemPrivate::get(parentItem)->removeItemChangeListener(d, QQuickItemPrivate::Parent);
@@ -1048,9 +1050,9 @@ QQuickStackAttached::~QQuickStackAttached()
     This attached property holds the stack index of the item it's
     attached to, or \c -1 if the item is not in a stack.
 */
-int QQuickStackAttached::index() const
+int QQuickStackViewAttached::index() const
 {
-    Q_D(const QQuickStackAttached);
+    Q_D(const QQuickStackViewAttached);
     return d->element ? d->element->index : -1;
 }
 
@@ -1061,9 +1063,9 @@ int QQuickStackAttached::index() const
     This attached property holds the stack view of the item it's
     attached to, or \c null if the item is not in a stack.
 */
-QQuickStackView *QQuickStackAttached::view() const
+QQuickStackView *QQuickStackViewAttached::view() const
 {
-    Q_D(const QQuickStackAttached);
+    Q_D(const QQuickStackViewAttached);
     return d->element ? d->element->view : nullptr;
 }
 
@@ -1080,9 +1082,9 @@ QQuickStackView *QQuickStackAttached::view() const
     \value StackView.Activating The item is being activated (becoming the current item).
     \value StackView.Active The item is active, that is, the current item.
 */
-QQuickStackView::Status QQuickStackAttached::status() const
+QQuickStackView::Status QQuickStackViewAttached::status() const
 {
-    Q_D(const QQuickStackAttached);
+    Q_D(const QQuickStackViewAttached);
     return d->element ? d->element->status : QQuickStackView::Inactive;
 }