diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-30 16:14:03 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-30 16:14:03 (GMT) |
commit | 570f8970bea646055583671397c3d2706ac45004 (patch) | |
tree | 6e68ed9939ad6ca87ffa17bbfec803b4f3089783 /src/opengl | |
parent | 597117790ad86a1e68526fa7ccd1a38fca2b55f3 (diff) | |
parent | 20dbb967f030041d1dc94b989b0b085ca84baa33 (diff) | |
download | Qt-570f8970bea646055583671397c3d2706ac45004.zip Qt-570f8970bea646055583671397c3d2706ac45004.tar.gz Qt-570f8970bea646055583671397c3d2706ac45004.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QHeaderView test case for VGA Symbian devices.
Fix for BCM2727 chip detection on Symbian
Fix QMenuBar autotest failures for Symbian
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); |