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/qquickapplicationwindow_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/qquickapplicationwindow_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickapplicationwindow_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow_p.h b/src/quicktemplates2/qquickapplicationwindow_p.h index 97fe3d0c..4e24009f 100644 --- a/src/quicktemplates2/qquickapplicationwindow_p.h +++ b/src/quicktemplates2/qquickapplicationwindow_p.h @@ -73,6 +73,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickApplicationWindow : public QQuickWi Q_PROPERTY(QQuickOverlay *overlay READ overlay CONSTANT FINAL) Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged FINAL) Q_PROPERTY(QLocale locale READ locale WRITE setLocale RESET resetLocale NOTIFY localeChanged FINAL) + // 2.3 (Qt 5.10) Q_PROPERTY(QPalette palette READ palette WRITE setPalette RESET resetPalette NOTIFY paletteChanged FINAL REVISION 3) Q_PROPERTY(QQuickItem *menuBar READ menuBar WRITE setMenuBar NOTIFY menuBarChanged FINAL REVISION 3) Q_CLASSINFO("DefaultProperty", "contentData") @@ -81,6 +82,8 @@ public: explicit QQuickApplicationWindow(QWindow *parent = nullptr); ~QQuickApplicationWindow(); + static QQuickApplicationWindowAttached *qmlAttachedProperties(QObject *object); + QQuickItem *background() const; void setBackground(QQuickItem *background); @@ -105,6 +108,7 @@ public: void setLocale(const QLocale &locale); void resetLocale(); + // 2.3 (Qt 5.10) QPalette palette() const; void setPalette(const QPalette &palette); void resetPalette(); @@ -112,8 +116,6 @@ public: QQuickItem *menuBar() const; void setMenuBar(QQuickItem *menuBar); - static QQuickApplicationWindowAttached *qmlAttachedProperties(QObject *object); - Q_SIGNALS: void backgroundChanged(); void activeFocusControlChanged(); @@ -166,6 +168,7 @@ Q_SIGNALS: void headerChanged(); void footerChanged(); void overlayChanged(); + // 2.3 (Qt 5.10) /*Q_REVISION(3)*/ void menuBarChanged(); private: |