diff options
| author | Inho Lee <inho.lee@qt.io> | 2020-04-20 12:46:56 +0200 |
|---|---|---|
| committer | Inho Lee <inho.lee@qt.io> | 2020-04-23 07:12:04 +0200 |
| commit | 28e7d940c42c47cf039522709883ae3de9f4fb88 (patch) | |
| tree | cbc79b2b133cd902945862ee09b8a96529fbc7c5 | |
| parent | 056a6b764600ce5762d0823fed74eda3ece6de47 (diff) | |
Fix build error for -no-opengl
Task-number: QTBUG-83653
Change-Id: I604562fdc96c250eabba08d7fa8a9ec8f21cbbd1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| -rw-r--r-- | src/compositor/configure.json | 2 | ||||
| -rw-r--r-- | src/compositor/extensions/extensions.pri | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/compositor/configure.json b/src/compositor/configure.json index 42df2ddf0..c5b0f03ed 100644 --- a/src/compositor/configure.json +++ b/src/compositor/configure.json @@ -265,7 +265,7 @@ "wayland-compositor-quick": { "label": "QtQuick integration for wayland compositor", "purpose": "Allows QtWayland compositor types to be used with QtQuick", - "condition": "features.wayland-server && module.quick && features.opengl", + "condition": "features.wayland-server && module.quick", "output": [ "publicFeature" ] } }, diff --git a/src/compositor/extensions/extensions.pri b/src/compositor/extensions/extensions.pri index 06e3ef9ee..64b1439bf 100644 --- a/src/compositor/extensions/extensions.pri +++ b/src/compositor/extensions/extensions.pri @@ -8,7 +8,6 @@ WAYLANDSERVERSOURCES += \ ../extensions/touch-extension.xml \ ../extensions/qt-key-unstable-v1.xml \ ../extensions/qt-windowmanager.xml \ - ../extensions/qt-texture-sharing-unstable-v1.xml \ ../3rdparty/protocol/text-input-unstable-v2.xml \ ../3rdparty/protocol/viewporter.xml \ ../3rdparty/protocol/scaler.xml \ @@ -75,6 +74,8 @@ SOURCES += \ extensions/qwaylandivisurface.cpp \ qtHaveModule(quick) { + QT += quick quick-private + HEADERS += \ extensions/qwaylandquickshellintegration.h \ extensions/qwaylandquickshellsurfaceitem.h \ @@ -97,6 +98,9 @@ qtHaveModule(quick) { extensions/qwaylandxdgshellintegration.cpp \ qtConfig(opengl) { + WAYLANDSERVERSOURCES += \ + ../extensions/qt-texture-sharing-unstable-v1.xml + HEADERS += \ extensions/qwltexturesharingextension_p.h |