diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-18 12:49:29 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-18 10:52:19 +0000 |
| commit | 4fcb46a8b51b5db5ab9c6c720d2ee8f9cbe8ccc9 (patch) | |
| tree | 3f85e3ca419d713b4045b4410b5c29253a79fa98 | |
| parent | 21697e9df962339dc4b1b40c3d3c46ae65790881 (diff) | |
StackView: inherit Control instead of Container
Change-Id: I0bdaa7f4a7af659f75c15879914b104ca5843d22
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| -rw-r--r-- | src/controls/qquickstackview.cpp | 8 | ||||
| -rw-r--r-- | src/controls/qquickstackview_p.h | 4 | ||||
| -rw-r--r-- | src/controls/qquickstackview_p_p.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/controls/qquickstackview.cpp b/src/controls/qquickstackview.cpp index 9373fdd2..8d017a46 100644 --- a/src/controls/qquickstackview.cpp +++ b/src/controls/qquickstackview.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype StackView - \inherits Container + \inherits Control \instantiates QQuickStackView \inqmlmodule QtQuick.Controls \ingroup navigation @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE */ QQuickStackView::QQuickStackView(QQuickItem *parent) : - QQuickContainer(*(new QQuickStackViewPrivate), parent) + QQuickControl(*(new QQuickStackViewPrivate), parent) { setFlag(ItemIsFocusScope); } @@ -459,7 +459,7 @@ void QQuickStackView::setPushExit(QQuickTransition *exit) void QQuickStackView::componentComplete() { - QQuickContainer::componentComplete(); + QQuickControl::componentComplete(); Q_D(QQuickStackView); QQuickStackElement *element = Q_NULLPTR; @@ -475,7 +475,7 @@ void QQuickStackView::componentComplete() void QQuickStackView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { - QQuickContainer::geometryChanged(newGeometry, oldGeometry); + QQuickControl::geometryChanged(newGeometry, oldGeometry); Q_D(QQuickStackView); foreach (QQuickStackElement *element, d->elements) { diff --git a/src/controls/qquickstackview_p.h b/src/controls/qquickstackview_p.h index 377af3c8..19ffd28c 100644 --- a/src/controls/qquickstackview_p.h +++ b/src/controls/qquickstackview_p.h @@ -48,7 +48,7 @@ // We mean it. // -#include <QtQuickControls/private/qquickcontainer_p.h> +#include <QtQuickControls/private/qquickcontrol_p.h> QT_BEGIN_NAMESPACE @@ -58,7 +58,7 @@ class QQuickStackElement; class QQuickStackAttached; class QQuickStackViewPrivate; -class Q_QUICKCONTROLS_EXPORT QQuickStackView : public QQuickContainer +class Q_QUICKCONTROLS_EXPORT QQuickStackView : public QQuickControl { Q_OBJECT Q_PROPERTY(bool busy READ busy NOTIFY busyChanged FINAL) diff --git a/src/controls/qquickstackview_p_p.h b/src/controls/qquickstackview_p_p.h index 6a07e972..46046519 100644 --- a/src/controls/qquickstackview_p_p.h +++ b/src/controls/qquickstackview_p_p.h @@ -49,7 +49,7 @@ // #include <QtQuickControls/private/qquickstackview_p.h> -#include <QtQuickControls/private/qquickcontainer_p_p.h> +#include <QtQuickControls/private/qquickcontrol_p_p.h> #include <QtQuick/private/qquickitemviewtransition_p.h> #include <QtQuick/private/qquickitemchangelistener_p.h> #include <QtQml/private/qv4persistent_p.h> @@ -97,7 +97,7 @@ public: QV4::PersistentValue qmlGlobal; }; -class QQuickStackViewPrivate : public QQuickContainerPrivate, public QQuickItemViewTransitionChangeListener +class QQuickStackViewPrivate : public QQuickControlPrivate, public QQuickItemViewTransitionChangeListener { Q_DECLARE_PUBLIC(QQuickStackView) |