diff options
| author | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-16 00:12:15 (GMT) |
|---|---|---|
| committer | Justin McPherson <justin.mcpherson@nokia.com> | 2010-04-16 00:12:15 (GMT) |
| commit | 655088bc1942698ee060ca5237a4220365e49ee1 (patch) | |
| tree | 908437dbe06f9639534bc3546a9f3fe619d53449 /src/opengl/qgl.h | |
| parent | 06d71fb79ad850c62a1b95fbeec607dfc4220489 (diff) | |
| parent | 07f724cd5abd0548fb32ed3469bde113daf028c4 (diff) | |
| download | Qt-655088bc1942698ee060ca5237a4220365e49ee1.zip Qt-655088bc1942698ee060ca5237a4220365e49ee1.tar.gz Qt-655088bc1942698ee060ca5237a4220365e49ee1.tar.bz2 | |
Merge branch '4.7' of ../../qt/4.7 into 4.7
Conflicts:
configure
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 64f54a3..b1e2ede 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -376,7 +376,7 @@ protected: #if defined(Q_WS_WIN) virtual int choosePixelFormat(void* pfd, HDC pdc); #endif -#if defined(Q_WS_X11) && !defined(QT_OPENGL_ES) +#if defined(Q_WS_X11) && defined(QT_NO_EGL) virtual void* tryVisual(const QGLFormat& f, int bufDepth = 1); virtual void* chooseVisual(); #endif |