diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 13:25:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 13:25:23 (GMT) |
| commit | 76da3ecd74ad55fe923eb59f10c1f371611642f4 (patch) | |
| tree | 365536eb863759533bed508a20daad71cd70f045 | |
| parent | ad957b76682dfddb2576154f56b5017680819eef (diff) | |
| parent | 48469ecd3f2918d16ccfacb5d65f3a5e0bbfa8d8 (diff) | |
| download | Qt-76da3ecd74ad55fe923eb59f10c1f371611642f4.zip Qt-76da3ecd74ad55fe923eb59f10c1f371611642f4.tar.gz Qt-76da3ecd74ad55fe923eb59f10c1f371611642f4.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:
The Q_WGL define was removed years ago.
| -rw-r--r-- | src/opengl/qgl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index c294e4f..0521bab 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -3447,7 +3447,7 @@ QGLWidget::~QGLWidget() bool doRelease = (glcx && glcx->windowCreated()); #endif delete d->glcx; -#if defined(Q_WGL) +#if defined(Q_WS_WIN) delete d->olcx; #endif #if defined(GLX_MESA_release_buffers) && defined(QGL_USE_MESA_EXT) |