diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-16 08:25:07 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-16 08:25:07 (GMT) |
| commit | 91bf24d44690a643d7cb74ab594da949b9e51e1b (patch) | |
| tree | 2cb20fdccd88afd647cfe9ecd8e97a98a14bb6e1 /src/opengl/qgl.h | |
| parent | a363fad3f45335c6f03108a0ece5472901aa970f (diff) | |
| parent | 7e4a9187bb11b794e45d95d2e9fae026d6b0d07d (diff) | |
| download | Qt-91bf24d44690a643d7cb74ab594da949b9e51e1b.zip Qt-91bf24d44690a643d7cb74ab594da949b9e51e1b.tar.gz Qt-91bf24d44690a643d7cb74ab594da949b9e51e1b.tar.bz2 | |
Merge remote-tracking branch 'origin/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 c57995d..ab88d9c 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 |