diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-19 19:19:22 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-12-19 18:35:13 +0000 |
| commit | 3dde45b6d10031f099b11425976b805d285ecbbf (patch) | |
| tree | 6877d0aa06d7082941fdd8bf130fbd34736efd9d /src | |
| parent | 27a7cb2b36a2e23845f3b91c55b6254681f40545 (diff) | |
QQuickApplicationWindowAttached: give full access to the overlay
Change-Id: I704bec5ff8f59bebe100ebc19f322b0b556d2586
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/templates/qquickapplicationwindow.cpp | 2 | ||||
| -rw-r--r-- | src/templates/qquickapplicationwindow_p.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp index db451810..d2625a7b 100644 --- a/src/templates/qquickapplicationwindow.cpp +++ b/src/templates/qquickapplicationwindow.cpp @@ -567,7 +567,7 @@ QQuickItem *QQuickApplicationWindowAttached::footer() const This attached property holds the window overlay item. The property can be attached to any item. The value is \c null if the item is not in an ApplicationWindow. */ -QQuickItem *QQuickApplicationWindowAttached::overlay() const +QQuickOverlay *QQuickApplicationWindowAttached::overlay() const { Q_D(const QQuickApplicationWindowAttached); return d->window ? d->window->overlay() : Q_NULLPTR; diff --git a/src/templates/qquickapplicationwindow_p.h b/src/templates/qquickapplicationwindow_p.h index bfeebaff..0218b3c7 100644 --- a/src/templates/qquickapplicationwindow_p.h +++ b/src/templates/qquickapplicationwindow_p.h @@ -120,7 +120,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickApplicationWindowAttached : public QObject Q_PROPERTY(QQuickItem *activeFocusControl READ activeFocusControl NOTIFY activeFocusControlChanged FINAL) Q_PROPERTY(QQuickItem *header READ header NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer NOTIFY footerChanged FINAL) - Q_PROPERTY(QQuickItem *overlay READ overlay NOTIFY overlayChanged FINAL) + Q_PROPERTY(QQuickOverlay *overlay READ overlay NOTIFY overlayChanged FINAL) public: explicit QQuickApplicationWindowAttached(QObject *parent = Q_NULLPTR); @@ -130,7 +130,7 @@ public: QQuickItem *activeFocusControl() const; QQuickItem *header() const; QQuickItem *footer() const; - QQuickItem *overlay() const; + QQuickOverlay *overlay() const; Q_SIGNALS: void windowChanged(); |