diff options
author | Liang Qi <liang.qi@qt.io> | 2019-06-20 10:44:01 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-06-20 10:44:01 +0200 |
commit | 993863c4527f0565a77d7728446f954732a3c2b8 (patch) | |
tree | 3d3071ea8d30dbef5df7f212f4ece5cb20ee5292 | |
parent | b90a57a66f0862d8953d0b858d4e11007172cc79 (diff) | |
download | qtwayland-993863c4527f0565a77d7728446f954732a3c2b8.tar.gz |
Compositor: some parts depends on opengl feature instead of module
This amends 8663de3fa789d8b8e10c5580b37f6eb3beac9ed6.
Task-number: QTBUG-76439
Change-Id: If62252fb63c3261dfd23574830f0f60b99c1d854
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
-rw-r--r-- | examples/wayland/wayland.pro | 4 | ||||
-rw-r--r-- | src/compositor/compositor_api/compositor_api.pri | 2 | ||||
-rw-r--r-- | src/compositor/extensions/extensions.pri | 2 | ||||
-rw-r--r-- | src/imports/imports.pro | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro index eeb962eb..2b7f992e 100644 --- a/examples/wayland/wayland.pro +++ b/examples/wayland/wayland.pro @@ -1,7 +1,7 @@ requires(qtHaveModule(waylandcompositor)) TEMPLATE=subdirs -qtHaveModule(opengl) { +qtConfig(opengl) { SUBDIRS += \ qwindow-compositor \ minimal-cpp @@ -20,7 +20,7 @@ qtHaveModule(quick) { SUBDIRS += \ custom-extension - qtHaveModule(opengl) { + qtConfig(opengl) { SUBDIRS += \ server-buffer \ texture-sharing diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri index 49d0de41..9c44d0ec 100644 --- a/src/compositor/compositor_api/compositor_api.pri +++ b/src/compositor/compositor_api/compositor_api.pri @@ -80,7 +80,7 @@ qtHaveModule(quick) { compositor_api/qwaylandquickitem.h \ compositor_api/qwaylandquickitem_p.h - qtHaveModule(opengl) { + qtConfig(opengl) { SOURCES += \ compositor_api/qwaylandquickhardwarelayer.cpp HEADERS += \ diff --git a/src/compositor/extensions/extensions.pri b/src/compositor/extensions/extensions.pri index 206bde20..027ea114 100644 --- a/src/compositor/extensions/extensions.pri +++ b/src/compositor/extensions/extensions.pri @@ -85,7 +85,7 @@ qtHaveModule(quick) { extensions/qwaylandxdgshellv6integration.cpp \ extensions/qwaylandxdgshellintegration.cpp \ - qtHaveModule(opengl) { + qtConfig(opengl) { WAYLANDSERVERSOURCES += \ ../extensions/qt-texture-sharing-unstable-v1.xml diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 1fced3df..4ff506c6 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -4,7 +4,7 @@ qtHaveModule(quick): { SUBDIRS += \ compositor - qtHaveModule(opengl): { + qtConfig(opengl): { SUBDIRS += \ texture-sharing \ texture-sharing-extension |