recognize QT_WAYLAND_GL_CONFIG also as a qmake variable
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 20 Jul 2011 09:07:55 +0000 (11:07 +0200)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>
Wed, 20 Jul 2011 09:07:55 +0000 (11:07 +0200)
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

index 004c05f..f5a1568 100644 (file)
@@ -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 += \