From 21c8385105dde242384b5ce05bc953a9995403f4 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@digia.com>
Date: Fri, 4 Jul 2014 10:54:57 +0200
Subject: [PATCH] Windows: Fix build with QT_NO_OPENGL

Fixes compiler breakage introduced in 39e06078258393f.

Change-Id: I39813018915a70b848ca9377089e262952715545
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
---
 src/plugins/platforms/windows/qwindowswindow.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
index 18b4cc85cce..7d0b00b3125 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
@@ -956,10 +956,12 @@ void QWindowsWindow::destroyWindow()
         if (hasMouseCapture())
             setMouseGrabEnabled(false);
         setDropSiteEnabled(false);
+#ifndef QT_NO_OPENGL
         if (m_surface) {
             m_data.staticOpenGLContext->destroyWindowSurface(m_surface);
             m_surface = 0;
         }
+#endif
 #ifdef Q_OS_WINCE
         if ((m_windowState & Qt::WindowFullScreen) && !m_previouslyHidden) {
             HWND handle = FindWindow(L"HHTaskBar", L"");
@@ -2287,10 +2289,14 @@ void QWindowsWindow::setCustomMargins(const QMargins &newCustomMargins)
 
 void *QWindowsWindow::surface(void *nativeConfig)
 {
+#ifdef QT_NO_OPENGL
+    return 0;
+#else
     if (!m_surface)
         m_surface = m_data.staticOpenGLContext->createWindowSurface(m_data.hwnd, nativeConfig);
 
     return m_surface;
+#endif
 }
 
 QT_END_NAMESPACE