AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Retain ABI and API compatibility when Qt is built with EGL.

Browse Source 
Author: Felix Geyer <debfx-pkg@fobos.de>

Merge-request: 1230
Reviewed-by: ossi

(cherry picked from commit dcbd920daf92d80302633f73dd8324437005a10e)

Change-Id: I8d2dc64a2785b4940d06c9493a3ba0f96a487f9b
Reviewed-on: http://codereview.qt-project.org/4569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
Michał Zając 2011-05-13 10:39:34 +02:00 committed by Qt by Nokia
parent 80cc17c78b
commit 93fde87898
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/opengl/qgl.h
View File

@ -407,7 +407,7 @@ protected:
#if defined(Q_WS_WIN)
virtual int choosePixelFormat(void* pfd, HDC pdc);
#endif
#if defined(Q_WS_X11) && defined(QT_NO_EGL)
#if defined(Q_WS_X11)
virtual void* tryVisual(const QGLFormat& f, int bufDepth = 1);
virtual void* chooseVisual();
#endif

14
src/opengl/qgl_x11egl.cpp
View File

@ -257,6 +257,20 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
return true;
}
void *QGLContext::chooseVisual()
{
qFatal("QGLContext::chooseVisual - this method must not be called as Qt is built with EGL support");
return 0;
}
void *QGLContext::tryVisual(const QGLFormat& f, int bufDepth)
{
Q_UNUSED(f);
Q_UNUSED(bufDepth);
qFatal("QGLContext::tryVisual - this method must not be called as Qt is built with EGL support");
return 0;
}
void QGLWidget::resizeEvent(QResizeEvent *)
{
Q_D(QGLWidget);