diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2013-04-16 10:08:06 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-16 19:45:11 +0200 |
| commit | 0d1ab4e66797c57d31c8b56319219f4248a7c029 (patch) | |
| tree | 1ff269a8d3710b397f421ac92a3b2cbac485acb7 /src/plugins/platforms/qnx | |
| parent | b4ce49287f9f8407e89f1e4485cc166368306c77 (diff) | |
[QNX] Fix build/runtime if QT_NO_OPENGL defined
Change-Id: I38d511ac0a53b65abfe47baaa6333629df5b578d
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/plugins/platforms/qnx')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxwindow.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/qnx/qqnxwindow.cpp b/src/plugins/platforms/qnx/qqnxwindow.cpp index f1bebee9b2..a351ec865a 100644 --- a/src/plugins/platforms/qnx/qqnxwindow.cpp +++ b/src/plugins/platforms/qnx/qqnxwindow.cpp @@ -172,6 +172,7 @@ void QQnxWindow::setGeometry(const QRect &rect) { const QRect oldGeometry = setGeometryHelper(rect); +#if !defined(QT_NO_OPENGL) // If this is an OpenGL window we need to request that the GL context updates // the EGLsurface on which it is rendering. The surface will be recreated the // next time QQnxGLContext::makeCurrent() is called. @@ -184,6 +185,7 @@ void QQnxWindow::setGeometry(const QRect &rect) if (m_platformOpenGLContext != 0 && bufferSize() != rect.size()) m_platformOpenGLContext->requestSurfaceChange(); } +#endif // Send a geometry change event to Qt (triggers resizeEvent() in QWindow/QWidget). @@ -353,13 +355,12 @@ void QQnxWindow::setBufferSize(const QSize &size) // Create window buffers if they do not exist if (m_bufferSize.isEmpty()) { + val[0] = m_screen->nativeFormat(); #if !defined(QT_NO_OPENGL) // Get pixel format from EGL config if using OpenGL; // otherwise inherit pixel format of window's screen if (m_platformOpenGLContext != 0) { val[0] = platformWindowFormatToNativeFormat(m_platformOpenGLContext->format()); - } else { - val[0] = m_screen->nativeFormat(); } #endif |