diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 20:32:26 +0100 |
commit | 501d45012f746d843e0144c78202297a577758bc (patch) | |
tree | 5c2b125327d49e3495b5f47995d93fb4215acbb4 /src/quicktemplates2/qquickabstractbutton_p.h | |
parent | 9e1b044afa994cdd77fd256cea78cd144e804d76 (diff) | |
parent | 442843db6f5dce6b594448d43b380c9b884a7c91 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/quickcontrols2/qquickchecklabel.cpp
src/quickcontrols2/qquickchecklabel_p.h
src/quickcontrols2/qquickmnemoniclabel_p.h
src/quicktemplates2/qquickbuttongroup_p.h
src/quicktemplates2/qquickspinbox.cpp
src/quicktemplates2/qquickswipedelegate.cpp
Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c
Diffstat (limited to 'src/quicktemplates2/qquickabstractbutton_p.h')
-rw-r--r-- | src/quicktemplates2/qquickabstractbutton_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/quicktemplates2/qquickabstractbutton_p.h b/src/quicktemplates2/qquickabstractbutton_p.h index ccaf6d19..81caed5a 100644 --- a/src/quicktemplates2/qquickabstractbutton_p.h +++ b/src/quicktemplates2/qquickabstractbutton_p.h @@ -67,6 +67,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickAbstractButton : public QQuickContr Q_PROPERTY(bool autoExclusive READ autoExclusive WRITE setAutoExclusive NOTIFY autoExclusiveChanged FINAL) Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat NOTIFY autoRepeatChanged FINAL) Q_PROPERTY(QQuickItem *indicator READ indicator WRITE setIndicator NOTIFY indicatorChanged FINAL) + // 2.3 (Qt 5.10) 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) @@ -104,6 +105,7 @@ public: QQuickItem *indicator() const; void setIndicator(QQuickItem *indicator); + // 2.3 (Qt 5.10) QQuickIcon icon() const; void setIcon(const QQuickIcon &icon); @@ -143,7 +145,6 @@ Q_SIGNALS: void released(); void canceled(); void clicked(); - Q_REVISION(2) void toggled(); void pressAndHold(); void doubleClicked(); void textChanged(); @@ -154,6 +155,9 @@ Q_SIGNALS: void autoExclusiveChanged(); void autoRepeatChanged(); void indicatorChanged(); + // 2.2 (Qt 5.9) + Q_REVISION(2) void toggled(); + // 2.3 (Qt 5.10) Q_REVISION(3) void iconChanged(); Q_REVISION(3) void displayChanged(); Q_REVISION(3) void actionChanged(); |