From 1aff9845e814a52eb462974c19c5e10bada6ef7f Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B8rgen=20Lind?= Date: Mon, 11 Apr 2011 15:37:36 +0200 Subject: [PATCH] Make it possible to build Qt-Compositor without gl support even when Qt is built with QtOpenGL --- src/qt-compositor/hardware_integration/hardware_integration.pri | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/qt-compositor/hardware_integration/hardware_integration.pri b/src/qt-compositor/hardware_integration/hardware_integration.pri index a988c20..004c05f 100644 --- 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 { -- 2.7.4