diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-08-30 11:28:17 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-08-31 11:01:46 +0000 |
| commit | 19e7fb3911c2032d2bdf05e2d37da0a0967d419a (patch) | |
| tree | b523b77a1750b60cb2ffb949f92674ec87e18d82 /src/quicktemplates2/qquickapplicationwindow_p.h | |
| parent | 4a7365cd6c451e5f56fa145b134f7fa9b6d2199a (diff) | |
Add ApplicationWindow::menuBar
A follow-up commit to 66faa149.
Change-Id: I94c92752d54ae0ca4878da72915b3d83461a4124
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/quicktemplates2/qquickapplicationwindow_p.h')
| -rw-r--r-- | src/quicktemplates2/qquickapplicationwindow_p.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/quicktemplates2/qquickapplicationwindow_p.h b/src/quicktemplates2/qquickapplicationwindow_p.h index 8747e70f..ceab70e6 100644 --- a/src/quicktemplates2/qquickapplicationwindow_p.h +++ b/src/quicktemplates2/qquickapplicationwindow_p.h @@ -74,6 +74,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickApplicationWindow : public QQuickWi 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) 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") public: @@ -108,6 +109,9 @@ public: void setPalette(const QPalette &palette); void resetPalette(); + QQuickItem *menuBar() const; + void setMenuBar(QQuickItem *menuBar); + static QQuickApplicationWindowAttached *qmlAttachedProperties(QObject *object); Q_SIGNALS: @@ -118,6 +122,7 @@ Q_SIGNALS: void fontChanged(); void localeChanged(); Q_REVISION(3) void paletteChanged(); + Q_REVISION(3) void menuBarChanged(); protected: bool isComponentComplete() const; @@ -141,6 +146,7 @@ class Q_QUICKTEMPLATES2_PRIVATE_EXPORT QQuickApplicationWindowAttached : public Q_PROPERTY(QQuickItem *header READ header NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer NOTIFY footerChanged FINAL) Q_PROPERTY(QQuickOverlay *overlay READ overlay NOTIFY overlayChanged FINAL) + Q_PROPERTY(QQuickItem *menuBar READ menuBar NOTIFY menuBarChanged FINAL /*REVISION 3*/) public: explicit QQuickApplicationWindowAttached(QObject *parent = nullptr); @@ -151,6 +157,7 @@ public: QQuickItem *header() const; QQuickItem *footer() const; QQuickOverlay *overlay() const; + QQuickItem *menuBar() const; Q_SIGNALS: void windowChanged(); @@ -159,6 +166,7 @@ Q_SIGNALS: void headerChanged(); void footerChanged(); void overlayChanged(); + /*Q_REVISION(3)*/ void menuBarChanged(); private: Q_DISABLE_COPY(QQuickApplicationWindowAttached) |