diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-07-04 10:54:57 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2014-07-04 11:02:36 +0200 |
| commit | 21c8385105dde242384b5ce05bc953a9995403f4 (patch) | |
| tree | 77d5d3b8cf36ef53b6bf21c93e02c4e8c8c86ac7 /src | |
| parent | f01c5cdb8d26cbb51c26d7fc4f872e82f70e15e4 (diff) | |
Windows: Fix build with QT_NO_OPENGL
Fixes compiler breakage introduced in 39e06078258393f.
Change-Id: I39813018915a70b848ca9377089e262952715545
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowswindow.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp index 18b4cc85cc..7d0b00b312 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 |