From: Pierre Vorhagen <pvorhagen@gmail.com>
Date: Mon, 26 Mar 2012 09:46:55 +0000 (+0200)
Subject: Fixed platform plugin for "nogl" building
X-Git-Tag: TIZEN~103
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6ace81964c8786700aaa82568e7f3a4c35b63172;p=profile%2Fivi%2Fqtwayland.git

Fixed platform plugin for "nogl" building

Change-Id: Ib65990c6895ab32fda62703e6aec9afb39f6256c
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---

diff --git a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
index 4db964c..d7e268a 100644
--- a/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
+++ b/src/plugins/platforms/wayland/gl_integration/gl_integration.pri
@@ -1,13 +1,14 @@
-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
 
-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, xcomposite_egl) {
             QT_WAYLAND_GL_INTEGRATION = xcomposite_egl
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp
index 821ade6..94cb86c 100644
--- a/src/plugins/platforms/wayland/qwaylandintegration.cpp
+++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp
@@ -124,8 +124,7 @@ QPlatformOpenGLContext *QWaylandIntegration::createPlatformOpenGLContext(QOpenGL
 #ifdef QT_WAYLAND_GL_SUPPORT
     return mDisplay->eglIntegration()->createPlatformOpenGLContext(context->format(), context->shareHandle());
 #else
-    Q_UNUSED(glFormat);
-    Q_UNUSED(share);
+    Q_UNUSED(context);
     return 0;
 #endif
 }