diff options
| -rw-r--r-- | src/imports/templates/qtlabstemplatesplugin.cpp | 2 | ||||
| -rw-r--r-- | src/templates/qquickapplicationwindow.cpp | 2 | ||||
| -rw-r--r-- | src/templates/qquickapplicationwindow_p.h | 5 | ||||
| -rw-r--r-- | src/templates/qquickoverlay_p.h | 3 | ||||
| -rw-r--r-- | tests/auto/applicationwindow/tst_applicationwindow.cpp | 1 | ||||
| -rw-r--r-- | tests/auto/menu/tst_menu.cpp | 1 |
6 files changed, 10 insertions, 4 deletions
diff --git a/src/imports/templates/qtlabstemplatesplugin.cpp b/src/imports/templates/qtlabstemplatesplugin.cpp index 41e572d2..76698b90 100644 --- a/src/imports/templates/qtlabstemplatesplugin.cpp +++ b/src/imports/templates/qtlabstemplatesplugin.cpp @@ -52,6 +52,7 @@ #include <QtLabsTemplates/private/qquicklabel_p.h> #include <QtLabsTemplates/private/qquickmenu_p.h> #include <QtLabsTemplates/private/qquickmenuitem_p.h> +#include <QtLabsTemplates/private/qquickoverlay_p.h> #include <QtLabsTemplates/private/qquickpageindicator_p.h> #include <QtLabsTemplates/private/qquickpane_p.h> #include <QtLabsTemplates/private/qquickpopup_p.h> @@ -103,6 +104,7 @@ void QtLabsTemplatesPlugin::registerTypes(const char *uri) qmlRegisterType<QQuickLabel>(uri, 1, 0, "Label"); qmlRegisterType<QQuickMenu>(uri, 1, 0, "Menu"); qmlRegisterType<QQuickMenuItem>(uri, 1, 0, "MenuItem"); + qmlRegisterType<QQuickOverlay>(); qmlRegisterType<QQuickPageIndicator>(uri, 1, 0, "PageIndicator"); qmlRegisterType<QQuickPane>(uri, 1, 0, "Pane"); qmlRegisterType<QQuickPopup>(uri, 1, 0, "Popup"); 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<QQuickApplicationWindowPrivate *>(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 <QtQuick/qquickitem.h> +#include <QtLabsTemplates/private/qquickabstractbutton_p.h> QT_BEGIN_NAMESPACE class QQuickOverlayPrivate; -class QQuickOverlay : public QQuickItem +class Q_LABSTEMPLATES_EXPORT QQuickOverlay : public QQuickItem { Q_OBJECT diff --git a/tests/auto/applicationwindow/tst_applicationwindow.cpp b/tests/auto/applicationwindow/tst_applicationwindow.cpp index 10360c4f..63d0acff 100644 --- a/tests/auto/applicationwindow/tst_applicationwindow.cpp +++ b/tests/auto/applicationwindow/tst_applicationwindow.cpp @@ -42,6 +42,7 @@ #include <QtQuick/qquickview.h> #include <QtQuick/private/qquickitem_p.h> #include <QtLabsTemplates/private/qquickapplicationwindow_p.h> +#include <QtLabsTemplates/private/qquickoverlay_p.h> #include <QtLabsTemplates/private/qquickcontrol_p.h> #include <QtLabsTemplates/private/qquicklabel_p.h> #include <QtLabsTemplates/private/qquicktextarea_p.h> diff --git a/tests/auto/menu/tst_menu.cpp b/tests/auto/menu/tst_menu.cpp index a395e43e..3a2d9c61 100644 --- a/tests/auto/menu/tst_menu.cpp +++ b/tests/auto/menu/tst_menu.cpp @@ -46,6 +46,7 @@ #include "../shared/visualtestutil.h" #include <QtLabsTemplates/private/qquickapplicationwindow_p.h> +#include <QtLabsTemplates/private/qquickoverlay_p.h> #include <QtLabsTemplates/private/qquickbutton_p.h> #include <QtLabsTemplates/private/qquickmenu_p.h> #include <QtLabsTemplates/private/qquickmenuitem_p.h> |