1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: Fix build with QT_NO_OPENGL

Browse Source 
Fixes compiler breakage introduced in 39e06078258393f.

Change-Id: I39813018915a70b848ca9377089e262952715545
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
This commit is contained in:
Kai Koehne 2014-07-04 10:54:57 +02:00
parent f01c5cdb8d
commit 21c8385105
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/platforms/windows/qwindowswindow.cpp
View File

@ -956,10 +956,12 @@ void QWindowsWindow::destroyWindow()
if (hasMouseCapture()) if (hasMouseCapture())
setMouseGrabEnabled(false); setMouseGrabEnabled(false);
setDropSiteEnabled(false); setDropSiteEnabled(false);
#ifndef QT_NO_OPENGL
if (m_surface) { if (m_surface) {
m_data.staticOpenGLContext->destroyWindowSurface(m_surface); m_data.staticOpenGLContext->destroyWindowSurface(m_surface);
m_surface = 0; m_surface = 0;
} }
#endif
#ifdef Q_OS_WINCE #ifdef Q_OS_WINCE
if ((m_windowState & Qt::WindowFullScreen) && !m_previouslyHidden) { if ((m_windowState & Qt::WindowFullScreen) && !m_previouslyHidden) {
HWND handle = FindWindow(L"HHTaskBar", L""); HWND handle = FindWindow(L"HHTaskBar", L"");
@ -2287,10 +2289,14 @@ void QWindowsWindow::setCustomMargins(const QMargins &newCustomMargins)
void *QWindowsWindow::surface(void *nativeConfig) void *QWindowsWindow::surface(void *nativeConfig)
{ {
#ifdef QT_NO_OPENGL
return 0;
#else
if (!m_surface) if (!m_surface)
m_surface = m_data.staticOpenGLContext->createWindowSurface(m_data.hwnd, nativeConfig); m_surface = m_data.staticOpenGLContext->createWindowSurface(m_data.hwnd, nativeConfig);
return m_surface; return m_surface;
#endif
} }
QT_END_NAMESPACE QT_END_NAMESPACE