diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 14:18:12 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2017-11-06 14:15:04 +0000 |
commit | 8a56c3322f72d0ec1d55c3bfb679355919f27e34 (patch) | |
tree | 0ee4e2976af445207cde9e1743eadc4074abc31e /src/quicktemplates2/qquickdialog_p.h | |
parent | c39b126a77e27296ef82a1634753c775cc5a93fb (diff) |
Re-order revision 3 members and add explanatory comments
We've come to realize that even though it's tempting to group similar
properties together, organizing the API so that revisions are grouped
together makes future maintenance more pleasant. It's a lot easier to
to see what was added and when.
The same was done for earlier revisions in 5.9 in commit 430fe83.
Change-Id: I738d7fdadd348c21737228c37d0f31e39b37f8e7
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickdialog_p.h')
-rw-r--r-- | src/quicktemplates2/qquickdialog_p.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/quicktemplates2/qquickdialog_p.h b/src/quicktemplates2/qquickdialog_p.h index 8032cf83f0..d22685b67d 100644 --- a/src/quicktemplates2/qquickdialog_p.h +++ b/src/quicktemplates2/qquickdialog_p.h @@ -63,6 +63,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickDialog : public QQuickPopup Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL) Q_PROPERTY(QPlatformDialogHelper::StandardButtons standardButtons READ standardButtons WRITE setStandardButtons NOTIFY standardButtonsChanged FINAL) + // 2.3 (Qt 5.10) Q_PROPERTY(int result READ result WRITE setResult NOTIFY resultChanged FINAL REVISION 3) Q_FLAGS(QPlatformDialogHelper::StandardButtons) @@ -82,6 +83,7 @@ public: void setStandardButtons(QPlatformDialogHelper::StandardButtons buttons); Q_REVISION(3) Q_INVOKABLE QQuickAbstractButton *standardButton(QPlatformDialogHelper::StandardButton button) const; + // 2.3 (Qt 5.10) enum StandardCode { Rejected, Accepted }; Q_ENUM(StandardCode) @@ -96,15 +98,15 @@ public Q_SLOTS: Q_SIGNALS: void accepted(); void rejected(); - Q_REVISION(3) void applied(); - Q_REVISION(3) void reset(); - Q_REVISION(3) void discarded(); - Q_REVISION(3) void helpRequested(); - void titleChanged(); void headerChanged(); void footerChanged(); void standardButtonsChanged(); + // 2.3 (Qt 5.10) + Q_REVISION(3) void applied(); + Q_REVISION(3) void reset(); + Q_REVISION(3) void discarded(); + Q_REVISION(3) void helpRequested(); Q_REVISION(3) void resultChanged(); protected: |