diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-07 15:53:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-07 15:53:28 (GMT) |
| commit | 2dde31f712b5952838d867966d99565e1c7c825d (patch) | |
| tree | eccd6c518a81c696cc02bc738321a3b2d3f44a64 /src/opengl/qgl.cpp | |
| parent | 7a5bca82738e6b782047e50a813972eccd928307 (diff) | |
| parent | f8e08419c78e94d32273c8b039dd48dc9d5e3433 (diff) | |
| download | Qt-2dde31f712b5952838d867966d99565e1c7c825d.zip Qt-2dde31f712b5952838d867966d99565e1c7c825d.tar.gz Qt-2dde31f712b5952838d867966d99565e1c7c825d.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Reset the GL stencil mask, op and function in resetGLState().
Fix performance regression in _q_polishItems.
Fixed indentation and typo.
Fixed bug in boxes demo occuring with certain OpenGL drivers.
Remove unnecessary call to QWidget::setAttribute().
Avoid a deep copy of QImage::bits() in the png writer
Diffstat (limited to 'src/opengl/qgl.cpp')
| -rw-r--r-- | src/opengl/qgl.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index c3e4a2e..4a79427 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -4952,8 +4952,6 @@ void QGLWidgetPrivate::initContext(QGLContext *context, const QGLWidget* shareWi if (!glcx) glcx = new QGLContext(QGLFormat::defaultFormat(), q); - - q->setAttribute(Qt::WA_NoSystemBackground); } #if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS) |