diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-15 00:17:25 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-06-15 08:06:26 +0000 |
| commit | c4f50fa96d22f1cecbe5abef6ebc5b6d55d3dfbf (patch) | |
| tree | 30c1ca3e90633803e61a7ceda6c757080ca7769a /src/controls | |
| parent | c0ab2d3494c4a9c14facba6824a9b45999340526 (diff) | |
Demote some containers to plain controls
These don't need the upcoming container API for managing child items.
Change-Id: I012db45277f0d4931c8c14fc74f46f9784430ea4
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/controls')
| -rw-r--r-- | src/controls/qquickpageindicator.cpp | 6 | ||||
| -rw-r--r-- | src/controls/qquickpageindicator_p.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/controls/qquickpageindicator.cpp b/src/controls/qquickpageindicator.cpp index 58b5d66f..7e55482f 100644 --- a/src/controls/qquickpageindicator.cpp +++ b/src/controls/qquickpageindicator.cpp @@ -35,7 +35,7 @@ ****************************************************************************/ #include "qquickpageindicator_p.h" -#include "qquickcontainer_p_p.h" +#include "qquickcontrol_p_p.h" QT_BEGIN_NAMESPACE @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE TODO */ -class QQuickPageIndicatorPrivate : public QQuickContainerPrivate +class QQuickPageIndicatorPrivate : public QQuickControlPrivate { public: QQuickPageIndicatorPrivate() : count(0), currentIndex(0) { } @@ -60,7 +60,7 @@ public: }; QQuickPageIndicator::QQuickPageIndicator(QQuickItem *parent) : - QQuickContainer(*(new QQuickPageIndicatorPrivate), parent) + QQuickControl(*(new QQuickPageIndicatorPrivate), parent) { } diff --git a/src/controls/qquickpageindicator_p.h b/src/controls/qquickpageindicator_p.h index dcf0d093..a5ce58b0 100644 --- a/src/controls/qquickpageindicator_p.h +++ b/src/controls/qquickpageindicator_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 QQuickPageIndicatorPrivate; -class Q_QUICKCONTROLS_EXPORT QQuickPageIndicator : public QQuickContainer +class Q_QUICKCONTROLS_EXPORT QQuickPageIndicator : public QQuickControl { Q_OBJECT Q_PROPERTY(int count READ count WRITE setCount NOTIFY countChanged FINAL) |