diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-31 15:33:12 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-31 15:33:12 (GMT) |
commit | 73fc68802d8c0c8d3d499b279782ce270f1c5bc6 (patch) | |
tree | 8cd7f54bc06864a741f0a2fd34412124c53e5953 /src/opengl | |
parent | 9e4ded47bc9e3fed3ee2a15e572603bb3f7b48fc (diff) | |
parent | 570f8970bea646055583671397c3d2706ac45004 (diff) | |
download | Qt-73fc68802d8c0c8d3d499b279782ce270f1c5bc6.zip Qt-73fc68802d8c0c8d3d499b279782ce270f1c5bc6.tar.gz Qt-73fc68802d8c0c8d3d499b279782ce270f1c5bc6.tar.bz2 |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/gui/text/qtextengine.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/plugins/phonon/mmf/mmf.pro
src/plugins/s60/5_0/5_0.pro
tests/auto/qtextlayout/tst_qtextlayout.cpp
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/qgl_symbian.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/opengl/qgl_symbian.cpp b/src/opengl/qgl_symbian.cpp index 91904d0..86176c9 100644 --- a/src/opengl/qgl_symbian.cpp +++ b/src/opengl/qgl_symbian.cpp @@ -183,9 +183,7 @@ bool QGLContext::chooseContext(const QGLContext* shareContext) // almost same as d->ownsEglContext = true; d->eglContext->setApi(QEgl::OpenGL); - QGraphicsSystemEx *ex = QApplicationPrivate::graphicsSystem()->platformExtension(); - QSymbianGraphicsSystemEx *symex = static_cast<QSymbianGraphicsSystemEx*>(ex); - if (symex && !symex->hasBCM2727()) { + if (!QSymbianGraphicsSystemEx::hasBCM2727()) { // Most likely we have hw support for multisampling // so let's enable it. d->glFormat.setSampleBuffers(1); |