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 /src | |
| parent | b90a57a66f0862d8953d0b858d4e11007172cc79 (diff) | |
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>
Diffstat (limited to 'src')
| -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 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri index 49d0de414..9c44d0ec1 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 206bde20d..027ea114b 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 1fced3dfd..4ff506c61 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 |