aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-18 13:47:46 +0200
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-06-18 12:37:22 +0000
commitfc8d59cf737b1ea1afb4348fdfd3f3dba676966d (patch)
treebe3f8a066b4e7cebc602b63be6dd848a7aea7f1a /src
parent4fcb46a8b51b5db5ab9c6c720d2ee8f9cbe8ccc9 (diff)
Frame: inherit Control instead of Container
Change-Id: I4360dcec1e9c5db32e6cadc87bd12db3b79a10df Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
-rw-r--r--src/controls/qquickframe.cpp6
-rw-r--r--src/controls/qquickframe_p.h4
-rw-r--r--src/controls/qquickframe_p_p.h4
3 files changed, 7 insertions, 7 deletions
diff --git a/src/controls/qquickframe.cpp b/src/controls/qquickframe.cpp
index e64ff13e..2f2ec65d 100644
--- a/src/controls/qquickframe.cpp
+++ b/src/controls/qquickframe.cpp
@@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype Frame
- \inherits Container
+ \inherits Control
\instantiates QQuickFrame
\inqmlmodule QtQuick.Controls
\ingroup containers
@@ -55,12 +55,12 @@ QQuickFramePrivate::QQuickFramePrivate() : frame(Q_NULLPTR)
}
QQuickFrame::QQuickFrame(QQuickItem *parent) :
- QQuickContainer(*(new QQuickFramePrivate), parent)
+ QQuickControl(*(new QQuickFramePrivate), parent)
{
}
QQuickFrame::QQuickFrame(QQuickFramePrivate &dd, QQuickItem *parent) :
- QQuickContainer(dd, parent)
+ QQuickControl(dd, parent)
{
}
diff --git a/src/controls/qquickframe_p.h b/src/controls/qquickframe_p.h
index c62cf0fb..d7bcc490 100644
--- a/src/controls/qquickframe_p.h
+++ b/src/controls/qquickframe_p.h
@@ -48,13 +48,13 @@
// We mean it.
//
-#include <QtQuickControls/private/qquickcontainer_p.h>
+#include <QtQuickControls/private/qquickcontrol_p.h>
QT_BEGIN_NAMESPACE
class QQuickFramePrivate;
-class Q_QUICKCONTROLS_EXPORT QQuickFrame : public QQuickContainer
+class Q_QUICKCONTROLS_EXPORT QQuickFrame : public QQuickControl
{
Q_OBJECT
Q_PROPERTY(QQuickItem *frame READ frame WRITE setFrame NOTIFY frameChanged FINAL)
diff --git a/src/controls/qquickframe_p_p.h b/src/controls/qquickframe_p_p.h
index f7985593..19a9af84 100644
--- a/src/controls/qquickframe_p_p.h
+++ b/src/controls/qquickframe_p_p.h
@@ -48,11 +48,11 @@
// We mean it.
//
-#include <QtQuickControls/private/qquickcontainer_p_p.h>
+#include <QtQuickControls/private/qquickcontrol_p_p.h>
QT_BEGIN_NAMESPACE
-class Q_QUICKCONTROLS_EXPORT QQuickFramePrivate : public QQuickContainerPrivate
+class Q_QUICKCONTROLS_EXPORT QQuickFramePrivate : public QQuickControlPrivate
{
public:
QQuickFramePrivate();