diff options
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: |