Fixed platform plugin for "nogl" building

[profile/ivi/qtwayland.git] / src / plugins / platforms / wayland / gl_integration / gl_integration.pri

diff --git a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
index 20c3aa0..d7e268a 100644 (file)
--- a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
+++ b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
@@ -1,24 +1,24 @@
-contains(QT_CONFIG, opengl) {
+QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
+contains(QT_CONFIG, opengl):!equals(QT_WAYLAND_GL_CONFIG, nogl) {
+
     DEFINES += QT_WAYLAND_GL_SUPPORT
-    QT += opengl
 
-HEADERS += \
-    $$PWD/qwaylandglintegration.h
+    HEADERS += \
+        $$PWD/qwaylandglintegration.h
 
-SOURCES += \
-    $$PWD/qwaylandglintegration.cpp
+    SOURCES += \
+        $$PWD/qwaylandglintegration.cpp
 
-    QT_WAYLAND_GL_CONFIG = $$(QT_WAYLAND_GL_CONFIG)
     contains(QT_CONFIG, opengles2) {
-        isEqual(QT_WAYLAND_GL_CONFIG, wayland_egl) {
-            QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
-            CONFIG += wayland_egl
+        isEqual(QT_WAYLAND_GL_CONFIG, xcomposite_egl) {
+            QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
+            CONFIG += xcomposite_egl
         } else:isEqual(QT_WAYLAND_GL_CONFIG,readback) {
             QT_WAYLAND_GL_INTEGRATION = readback_egl
             CONFIG += readback_egl
         } else {
-            QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
-            CONFIG += xcomposite_egl
+            QT_WAYLAND_GL_INTEGRATION = $$QT_WAYLAND_GL_CONFIG
+            CONFIG += wayland_egl
         }
     } else:mac {
         QT_WAYLAND_GL_INTEGRATION = readback_cgl