whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[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>
bb10
Andreas Holzammer 2013-04-16 10:08:06 +02:00 committed by The Qt Project
parent b4ce49287f
commit 0d1ab4e667
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/platforms/qnx/qqnxwindow.cpp
View File

@ -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