diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2016-05-20 13:40:07 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2016-06-15 08:07:32 +0000 |
| commit | a0c54d6435edd23a7eaacef73b074475730ec208 (patch) | |
| tree | 36e08f755563c82f3a03cc878f9fc0f3667b6f6c /src/compositor/extensions/qwaylandxdgshell.cpp | |
| parent | 5fbb2043a1be8b14e70335c2b2db77702e52fa10 (diff) | |
Add QML popup support for xdg_shell
Change-Id: I5b35ff3b1c6c2dc884b52e6f077c0f2bb2db68a2
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Diffstat (limited to 'src/compositor/extensions/qwaylandxdgshell.cpp')
| -rw-r--r-- | src/compositor/extensions/qwaylandxdgshell.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/compositor/extensions/qwaylandxdgshell.cpp b/src/compositor/extensions/qwaylandxdgshell.cpp index 6e3185bde..0b45b21ac 100644 --- a/src/compositor/extensions/qwaylandxdgshell.cpp +++ b/src/compositor/extensions/qwaylandxdgshell.cpp @@ -940,7 +940,7 @@ QWaylandQuickShellIntegration *QWaylandXdgSurface::createIntegration(QWaylandQui * Constructs a QWaylandXdgPopup. */ QWaylandXdgPopup::QWaylandXdgPopup() - : QWaylandCompositorExtensionTemplate<QWaylandXdgPopup>(*new QWaylandXdgPopupPrivate) + : QWaylandShellSurfaceTemplate<QWaylandXdgPopup>(*new QWaylandXdgPopupPrivate) { } @@ -950,7 +950,7 @@ QWaylandXdgPopup::QWaylandXdgPopup() */ QWaylandXdgPopup::QWaylandXdgPopup(QWaylandXdgShell *xdgShell, QWaylandSurface *surface, QWaylandSurface *parentSurface, const QPoint &position, const QWaylandResource &resource) - : QWaylandCompositorExtensionTemplate<QWaylandXdgPopup>(*new QWaylandXdgPopupPrivate) + : QWaylandShellSurfaceTemplate<QWaylandXdgPopup>(*new QWaylandXdgPopupPrivate) { initialize(xdgShell, surface, parentSurface, position, resource); } @@ -1043,7 +1043,7 @@ QPoint QWaylandXdgPopup::position() const */ void QWaylandXdgPopup::initialize() { - QWaylandCompositorExtensionTemplate::initialize(); + QWaylandCompositorExtension::initialize(); } /*! @@ -1081,4 +1081,9 @@ void QWaylandXdgPopup::sendPopupDone() d->send_popup_done(); } +QWaylandQuickShellIntegration *QWaylandXdgPopup::createIntegration(QWaylandQuickShellSurfaceItem *item) +{ + return new QtWayland::XdgPopupIntegration(item); +} + QT_END_NAMESPACE |