Fix compilation with nogl config, and silence compiler warning.
authorSamuel Rødal <samuel.rodal@nokia.com>
Wed, 22 Jun 2011 14:43:56 +0000 (16:43 +0200)
committerSamuel Rødal <samuel.rodal@nokia.com>
Wed, 22 Jun 2011 14:44:20 +0000 (16:44 +0200)
src/qt-compositor/wayland_wrapper/wlcompositor.cpp

index b95eea8..49003ea 100644 (file)
@@ -180,7 +180,9 @@ Compositor::Compositor(WaylandCompositor *qt_compositor)
     , m_pointerFocusSurface(0)
     , m_keyFocusSurface(0)
     , m_directRenderSurface(0)
+#if defined (QT_COMPOSITOR_WAYLAND_GL)
     , m_graphics_hw_integration(0)
+#endif
 {
     compositor = this;
 
@@ -386,6 +388,8 @@ bool Compositor::setDirectRenderSurface(Surface *surface)
         m_directRenderSurface = surface;
         return true;
     }
+#else
+    Q_UNUSED(surface);
 #endif
     return false;
 }