diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-01-08 08:49:33 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-01-08 08:49:33 +0000 |
| commit | 10b8f6af42a1cd80273d0a2d36e75b79078b5994 (patch) | |
| tree | 366acd2409145aba86d0ee752f15dfbf46c20b9d /src/quicktemplates2/qquickabstractbutton_p.h | |
| parent | d26d6a46bb5793e4a3bdc2c7a387f8f8a89b349b (diff) | |
| parent | 1fcec5bf1e208a4f32ef4f3afa54684358a11a1d (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging/5.10
Diffstat (limited to 'src/quicktemplates2/qquickabstractbutton_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickabstractbutton_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton_p.h b/src/quicktemplates2/qquickabstractbutton_p.h index 0ab40368..2f3d88f6 100644 --- a/src/quicktemplates2/qquickabstractbutton_p.h +++ b/src/quicktemplates2/qquickabstractbutton_p.h @@ -70,6 +70,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAbstractButton : public QQuickContr Q_PROPERTY(QQuickIcon icon READ icon WRITE setIcon NOTIFY iconChanged FINAL REVISION 3) Q_PROPERTY(Display display READ display WRITE setDisplay NOTIFY displayChanged FINAL REVISION 3) Q_PROPERTY(QQuickAction *action READ action WRITE setAction NOTIFY actionChanged FINAL REVISION 3) + Q_CLASSINFO("DeferredPropertyNames", "background,contentItem,indicator") public: explicit QQuickAbstractButton(QQuickItem *parent = nullptr); @@ -151,6 +152,8 @@ Q_SIGNALS: protected: QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQuickItem *parent); + void componentComplete() override; + bool event(QEvent *event) override; void focusOutEvent(QFocusEvent *event) override; void keyPressEvent(QKeyEvent *event) override; |