diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-26 06:48:20 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-26 06:48:20 (GMT) |
commit | c72b47737a2318b649ee5f03c8e0022305e2d456 (patch) | |
tree | c192a7faf92980b2372eeb28222c5b5474bb1f5d /src/plugins | |
parent | 69b88e97a02b41f3ffb88cbac09a5096da6c520d (diff) | |
parent | bdd7372edf4cb64177e97ef6087a6ec2a4903225 (diff) | |
download | Qt-c72b47737a2318b649ee5f03c8e0022305e2d456.zip Qt-c72b47737a2318b649ee5f03c8e0022305e2d456.tar.gz Qt-c72b47737a2318b649ee5f03c8e0022305e2d456.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Don't leak objects if QX11GLSharedContexts is instanciated twice
Enable QX11GLWindowSurface using "-graphicssystem x11gl" option
Force full-screen updates for QGLWindowSurface
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/graphicssystems/opengl/main.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/plugins/graphicssystems/opengl/main.cpp b/src/plugins/graphicssystems/opengl/main.cpp index abcfb7f..4c740ca 100644 --- a/src/plugins/graphicssystems/opengl/main.cpp +++ b/src/plugins/graphicssystems/opengl/main.cpp @@ -59,6 +59,9 @@ QStringList QGLGraphicsSystemPlugin::keys() const #if !defined(QT_OPENGL_ES_1) list << QLatin1String("OpenGL2"); #endif +#if defined(Q_WS_X11) && !defined(QT_NO_EGL) + list << QLatin1String("X11GL"); +#endif return list; } @@ -66,18 +69,23 @@ QGraphicsSystem* QGLGraphicsSystemPlugin::create(const QString& system) { if (system.toLower() == QLatin1String("opengl1")) { QGL::setPreferredPaintEngine(QPaintEngine::OpenGL); - return new QGLGraphicsSystem; + return new QGLGraphicsSystem(false); } #if !defined(QT_OPENGL_ES_1) if (system.toLower() == QLatin1String("opengl2")) { QGL::setPreferredPaintEngine(QPaintEngine::OpenGL2); - return new QGLGraphicsSystem; + return new QGLGraphicsSystem(false); } #endif +#if defined(Q_WS_X11) && !defined(QT_NO_EGL) + if (system.toLower() == QLatin1String("x11gl")) + return new QGLGraphicsSystem(true); +#endif + if (system.toLower() == QLatin1String("opengl")) - return new QGLGraphicsSystem; + return new QGLGraphicsSystem(false); return 0; } |