diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-18 13:24:41 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-03-18 13:24:41 (GMT) |
| commit | 1f8703d6faf855a96de0403f5926062bd2e2b3ee (patch) | |
| tree | d27a75ff167c70bf8902bcde140632551e8cec79 /src/gui/egl | |
| parent | 349d2dd29cd6f4c90c1890e3f56850883f5ac07d (diff) | |
| parent | 6dcdab8d9ee66f420a525400d873cfccf78c7003 (diff) | |
| download | Qt-1f8703d6faf855a96de0403f5926062bd2e2b3ee.zip Qt-1f8703d6faf855a96de0403f5926062bd2e2b3ee.tar.gz Qt-1f8703d6faf855a96de0403f5926062bd2e2b3ee.tar.bz2 | |
Merge remote branch 'qt/4.7' into lighthouse-4.7
Diffstat (limited to 'src/gui/egl')
| -rw-r--r-- | src/gui/egl/qegl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp index cc331fa..407b524 100644 --- a/src/gui/egl/qegl.cpp +++ b/src/gui/egl/qegl.cpp @@ -60,7 +60,7 @@ static QEglContext * volatile currentVGContext = 0; QEglContext::QEglContext() : apiType(QEgl::OpenGL) , ctx(EGL_NO_CONTEXT) - , cfg(0) + , cfg(QEGL_NO_CONFIG) , currentSurface(EGL_NO_SURFACE) , current(false) , ownsContext(true) |