From b92615d040cd559faed28b5a310100c2ba19f220 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Jul 2011 11:07:55 +0200 Subject: [PATCH] recognize QT_WAYLAND_GL_CONFIG also as a qmake variable unlike an environment variable set only for the time being, this actually survives automated rebuilds of makefiles --- src/qt-compositor/hardware_integration/hardware_integration.pri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt-compositor/hardware_integration/hardware_integration.pri b/src/qt-compositor/hardware_integration/hardware_integration.pri index 004c05f..f5a1568 100644 --- a/src/qt-compositor/hardware_integration/hardware_integration.pri +++ b/src/qt-compositor/hardware_integration/hardware_integration.pri @@ -1,4 +1,4 @@ -QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG) +isEmpty(QT_WAYLAND_GL_CONFIG):QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG) contains(QT_CONFIG, opengl):!isEqual(QT_WAYLAND_GL_CONFIG,nogl) { HEADERS += \ -- 2.7.4