From 116db644615c84f8d59b4e4b9c074b2167dd9a2c Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Tue, 15 Dec 2015 13:50:08 +0100 Subject: Expose the actual type of QQuickApplicationWindow::overlay() Change-Id: I4fdff4049d469781ad6324a0d85cc519bd95a038 Reviewed-by: Mitch Curtis Reviewed-by: J-P Nurmi --- src/templates/qquickapplicationwindow.cpp | 2 +- src/templates/qquickapplicationwindow_p.h | 5 +++-- src/templates/qquickoverlay_p.h | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/templates') diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp index 4eed256e..f21a1a63 100644 --- a/src/templates/qquickapplicationwindow.cpp +++ b/src/templates/qquickapplicationwindow.cpp @@ -345,7 +345,7 @@ QQuickItem *QQuickApplicationWindow::activeFocusControl() const \sa Popup */ -QQuickItem *QQuickApplicationWindow::overlay() const +QQuickOverlay *QQuickApplicationWindow::overlay() const { QQuickApplicationWindowPrivate *d = const_cast(d_func()); if (!d->overlay) { diff --git a/src/templates/qquickapplicationwindow_p.h b/src/templates/qquickapplicationwindow_p.h index 4d207a08..bfeebaff 100644 --- a/src/templates/qquickapplicationwindow_p.h +++ b/src/templates/qquickapplicationwindow_p.h @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE +class QQuickOverlay; class QQuickApplicationWindowPrivate; class QQuickApplicationWindowAttached; class QQuickApplicationWindowAttachedPrivate; @@ -66,7 +67,7 @@ class Q_LABSTEMPLATES_EXPORT QQuickApplicationWindow : public QQuickWindowQmlImp Q_PROPERTY(QQuickItem *activeFocusControl READ activeFocusControl NOTIFY activeFocusControlChanged FINAL) Q_PROPERTY(QQuickItem *header READ header WRITE setHeader NOTIFY headerChanged FINAL) Q_PROPERTY(QQuickItem *footer READ footer WRITE setFooter NOTIFY footerChanged FINAL) - Q_PROPERTY(QQuickItem *overlay READ overlay CONSTANT FINAL) + Q_PROPERTY(QQuickOverlay *overlay READ overlay CONSTANT FINAL) Q_PROPERTY(QFont font READ font WRITE setFont RESET resetFont NOTIFY fontChanged) Q_CLASSINFO("DefaultProperty", "data") @@ -85,7 +86,7 @@ public: QQuickItem *footer() const; void setFooter(QQuickItem *footer); - QQuickItem *overlay() const; + QQuickOverlay *overlay() const; QFont font() const; void setFont(const QFont &); diff --git a/src/templates/qquickoverlay_p.h b/src/templates/qquickoverlay_p.h index d63d78e7..3f13e845 100644 --- a/src/templates/qquickoverlay_p.h +++ b/src/templates/qquickoverlay_p.h @@ -49,12 +49,13 @@ // #include +#include QT_BEGIN_NAMESPACE class QQuickOverlayPrivate; -class QQuickOverlay : public QQuickItem +class Q_LABSTEMPLATES_EXPORT QQuickOverlay : public QQuickItem { Q_OBJECT -- cgit v1.2.3