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

Remove superfluous setter / getter for QWindowFormat in QWindow.

Browse Source
This commit is contained in:
Samuel Rødal 2011-05-23 09:52:14 +02:00
parent 2fb3c22f37
commit c5d1f23942
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui/kernel/qwindow.cpp
View File

@ -388,17 +388,6 @@ QWindowContext * QWindow::glContext() const
return d->glContext;
}
void QWindow::setRequestFormat(const QWindowFormat &format)
{
Q_D(QWindow);
d->requestedFormat = format;
}
QWindowFormat QWindow::format() const
{
return QWindowFormat();
}
void QWindow::destroy()
{
Q_D(QWindow);

3
src/gui/kernel/qwindow.h
View File

@ -136,9 +136,6 @@ public:
QWindowContext *glContext() const;
void setRequestFormat(const QWindowFormat &format);
QWindowFormat format() const;
void destroy();
QPlatformWindow *handle() const;

2
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
View File

@ -56,7 +56,7 @@ QWaylandXCompositeGLXContext::QWaylandXCompositeGLXContext(QWaylandXCompositeGLX
, mWindow(window)
, mBuffer(0)
, mXWindow(0)
, mConfig(qglx_findConfig(glxIntegration->xDisplay(),glxIntegration->screen(),window->window()->format()))
, mConfig(qglx_findConfig(glxIntegration->xDisplay(),glxIntegration->screen(),window->window()->requestedWindowFormat()))
, mWaitingForSyncCallback(false)
{
XVisualInfo *visualInfo = glXGetVisualFromFBConfig(glxIntegration->xDisplay(),mConfig);