diff options
| author | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-16 15:36:03 +0300 |
|---|---|---|
| committer | Jyri Tahtela <jyri.tahtela@nokia.com> | 2011-05-16 15:36:03 +0300 |
| commit | 82639818e567922e0255af039b9c397d13e4d9b7 (patch) | |
| tree | 6a6746acc321e21f546023a740b53b59297d64eb /src/opengl/qgl.h | |
| parent | 1eea52e5b18ef2167d375285e3838bd7883cfd7d (diff) | |
| parent | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff) | |
| download | qt4-tools-82639818e567922e0255af039b9c397d13e4d9b7.tar.gz | |
Merge remote-tracking branch 'qt/4.8'
Diffstat (limited to 'src/opengl/qgl.h')
| -rw-r--r-- | src/opengl/qgl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index eb877c9a6f..1f4eda3edd 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -401,7 +401,7 @@ protected: #if defined(Q_WS_WIN) virtual int choosePixelFormat(void* pfd, HDC pdc); #endif -#if defined(Q_WS_X11) && defined(QT_NO_EGL) +#if defined(Q_WS_X11) virtual void* tryVisual(const QGLFormat& f, int bufDepth = 1); virtual void* chooseVisual(); #endif |