diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-26 01:05:17 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 01:05:17 +0100 |
| commit | df015bd2e40e7654b2515996d5bd82469542581a (patch) | |
| tree | a36b7e9b2c9a7ccc1158d004c7b4a325200bb261 /src/imports | |
| parent | f72d63866d3f5820865fcd309b649dc9932518ee (diff) | |
| parent | 0e2a950895805457a45abe860bc91a7cc4ba405e (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
Change-Id: Ie45a13d3c866d0503e6e31b2a53b70f3420c5066
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/compositor/compositor.pro | 2 | ||||
| -rw-r--r-- | src/imports/compositor/qwaylandquickcompositorplugin.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/imports/compositor/compositor.pro b/src/imports/compositor/compositor.pro index a97f90f48..26cbe4744 100644 --- a/src/imports/compositor/compositor.pro +++ b/src/imports/compositor/compositor.pro @@ -15,6 +15,8 @@ COMPOSITOR_QML_FILES += \ WaylandCursorItem.qml \ qmldir +DEFINES += QT_WAYLAND_COMPOSITOR_QUICK + # Create the resource file GENERATED_RESOURCE_FILE = $$OUT_PWD/compositor.qrc diff --git a/src/imports/compositor/qwaylandquickcompositorplugin.cpp b/src/imports/compositor/qwaylandquickcompositorplugin.cpp index 4444c953b..f181decf7 100644 --- a/src/imports/compositor/qwaylandquickcompositorplugin.cpp +++ b/src/imports/compositor/qwaylandquickcompositorplugin.cpp @@ -144,6 +144,7 @@ public: qmlRegisterUncreatableType<QWaylandXdgShellV5>(uri, 1, 0, "XdgShellV5Base", QObject::tr("Cannot create instance of XdgShellV5Base")); qmlRegisterType<QWaylandXdgShellV5QuickExtension>(uri, 1, 0, "XdgShellV5"); qmlRegisterType<QWaylandXdgSurfaceV5>(uri, 1, 0, "XdgSurfaceV5"); + qmlRegisterType<QWaylandXdgPopupV5>(uri, 1, 0, "XdgPopupV5"); qmlRegisterType<QWaylandTextInputManagerQuickExtension>(uri, 1, 0, "TextInputManager"); } }; |