diff options
Diffstat (limited to 'src/labs/models/qqmldelegatecomponent_p.h')
| -rw-r--r-- | src/labs/models/qqmldelegatecomponent_p.h | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/src/labs/models/qqmldelegatecomponent_p.h b/src/labs/models/qqmldelegatecomponent_p.h index 254f9d0b7e..2929094fd6 100644 --- a/src/labs/models/qqmldelegatecomponent_p.h +++ b/src/labs/models/qqmldelegatecomponent_p.h @@ -25,14 +25,14 @@ QT_REQUIRE_CONFIG(qml_delegate_model); QT_BEGIN_NAMESPACE -class Q_LABSQMLMODELS_PRIVATE_EXPORT QQmlDelegateChoice : public QObject +class Q_LABSQMLMODELS_EXPORT QQmlDelegateChoice : public QObject { Q_OBJECT - Q_PROPERTY(QVariant roleValue READ roleValue WRITE setRoleValue NOTIFY roleValueChanged) - Q_PROPERTY(int row READ row WRITE setRow NOTIFY rowChanged) - Q_PROPERTY(int index READ row WRITE setRow NOTIFY indexChanged) - Q_PROPERTY(int column READ column WRITE setColumn NOTIFY columnChanged) - Q_PROPERTY(QQmlComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged) + Q_PROPERTY(QVariant roleValue READ roleValue WRITE setRoleValue NOTIFY roleValueChanged FINAL) + Q_PROPERTY(int row READ row WRITE setRow NOTIFY rowChanged FINAL) + Q_PROPERTY(int index READ row WRITE setRow NOTIFY indexChanged FINAL) + Q_PROPERTY(int column READ column WRITE setColumn NOTIFY columnChanged FINAL) + Q_PROPERTY(QQmlComponent* delegate READ delegate WRITE setDelegate NOTIFY delegateChanged FINAL) Q_CLASSINFO("DefaultProperty", "delegate") QML_NAMED_ELEMENT(DelegateChoice) QML_ADDED_IN_VERSION(1, 0) @@ -67,17 +67,17 @@ private: QQmlComponent *m_delegate = nullptr; }; -class Q_LABSQMLMODELS_PRIVATE_EXPORT QQmlDelegateChooser : public QQmlAbstractDelegateComponent +class Q_LABSQMLMODELS_EXPORT QQmlDelegateChooser : public QQmlAbstractDelegateComponent { Q_OBJECT - Q_PROPERTY(QString role READ role WRITE setRole NOTIFY roleChanged) - Q_PROPERTY(QQmlListProperty<QQmlDelegateChoice> choices READ choices CONSTANT) + Q_PROPERTY(QString role READ role WRITE setRole NOTIFY roleChanged FINAL) + Q_PROPERTY(QQmlListProperty<QQmlDelegateChoice> choices READ choices CONSTANT FINAL) Q_CLASSINFO("DefaultProperty", "choices") QML_NAMED_ELEMENT(DelegateChooser) QML_ADDED_IN_VERSION(1, 0) public: - QString role() const { return m_role; } + QString role() const final { return m_role; } void setRole(const QString &role); virtual QQmlListProperty<QQmlDelegateChoice> choices(); @@ -101,7 +101,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPE(QQmlDelegateChoice) -QML_DECLARE_TYPE(QQmlDelegateChooser) - #endif // QQMLDELEGATECOMPONENT_P_H |