From fc8d59cf737b1ea1afb4348fdfd3f3dba676966d Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@theqtcompany.com>
Date: Thu, 18 Jun 2015 13:47:46 +0200
Subject: Frame: inherit Control instead of Container

Change-Id: I4360dcec1e9c5db32e6cadc87bd12db3b79a10df
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
---
 src/controls/qquickframe.cpp   | 6 +++---
 src/controls/qquickframe_p.h   | 4 ++--
 src/controls/qquickframe_p_p.h | 4 ++--
 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();
-- 
cgit v1.2.3