aboutsummaryrefslogtreecommitdiffstats
path: root/src/controls/qquicktabbar_p.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/controls/qquicktabbar_p.h')
-rw-r--r--src/controls/qquicktabbar_p.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/controls/qquicktabbar_p.h b/src/controls/qquicktabbar_p.h
index 7d43e24e..ac6e29cf 100644
--- a/src/controls/qquicktabbar_p.h
+++ b/src/controls/qquicktabbar_p.h
@@ -61,19 +61,22 @@ class Q_QUICKCONTROLS_EXPORT QQuickTabBar : public QQuickContainer
Q_PROPERTY(int count READ count NOTIFY countChanged FINAL)
Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOTIFY currentIndexChanged FINAL)
Q_PROPERTY(QQuickItem *currentItem READ currentItem NOTIFY currentItemChanged FINAL)
- Q_PROPERTY(QVariant model READ model CONSTANT FINAL)
- Q_PROPERTY(QQmlListProperty<QObject> contentData READ contentData)
+ Q_PROPERTY(QVariant contentModel READ contentModel CONSTANT FINAL)
+ Q_PROPERTY(QQmlListProperty<QObject> contentData READ contentData FINAL)
+ Q_PROPERTY(QQmlListProperty<QQuickItem> contentChildren READ contentChildren FINAL)
Q_CLASSINFO("DefaultProperty", "contentData")
public:
explicit QQuickTabBar(QQuickItem *parent = Q_NULLPTR);
+ ~QQuickTabBar();
int count() const;
int currentIndex() const;
QQuickItem *currentItem() const;
- QVariant model() const;
+ QVariant contentModel() const;
QQmlListProperty<QObject> contentData();
+ QQmlListProperty<QQuickItem> contentChildren();
Q_INVOKABLE QQuickItem *itemAt(int index) const;
Q_INVOKABLE void addItem(QQuickItem *item);
@@ -90,7 +93,10 @@ Q_SIGNALS:
void currentItemChanged();
protected:
+ void updatePolish() Q_DECL_OVERRIDE;
void componentComplete() Q_DECL_OVERRIDE;
+ void itemChange(ItemChange change, const ItemChangeData &data) Q_DECL_OVERRIDE;
+ void contentItemChange(QQuickItem *newItem, QQuickItem *oldItem) Q_DECL_OVERRIDE;
void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) Q_DECL_OVERRIDE;
private: