Make it possible to build Qt-Compositor without gl support

even when Qt is built with QtOpenGL

diff --git a/src/qt-compositor/hardware_integration/hardware_integration.pri b/src/qt-compositor/hardware_integration/hardware_integration.pri
index a988c20..004c05f 100644 (file)
--- a/src/qt-compositor/hardware_integration/hardware_integration.pri
+++ b/src/qt-compositor/hardware_integration/hardware_integration.pri
@@ -1,4 +1,6 @@
-contains(QT_CONFIG, opengl) {
+QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
+
+contains(QT_CONFIG, opengl):!isEqual(QT_WAYLAND_GL_CONFIG,nogl) {
     HEADERS += \
         $$PWD/graphicshardwareintegration.h
 
@@ -8,7 +10,6 @@ contains(QT_CONFIG, opengl) {
     DEFINES += QT_COMPOSITOR_WAYLAND_GL
     QT += opengl
 
-    QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
     isEqual(QT_WAYLAND_GL_CONFIG, custom) {
         QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
     } else {