summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-05-25 08:53:24 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-05-25 08:53:24 (GMT)
commitd7d0aaf8bea4e6a5c4c0500a46417d7c788f489a (patch)
treea20acf137c648064d12948be31518a124bff41a7 /src
parent7c471bde498c07f03acc612d5f132b904bc3870e (diff)
downloadQt-d7d0aaf8bea4e6a5c4c0500a46417d7c788f489a.zip
Qt-d7d0aaf8bea4e6a5c4c0500a46417d7c788f489a.tar.gz
Qt-d7d0aaf8bea4e6a5c4c0500a46417d7c788f489a.tar.bz2
Fix compilation of qegl.cpp after the last merge
Diffstat (limited to 'src')
-rw-r--r--src/gui/egl/qegl.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp
index 8b20a9e..671a568 100644
--- a/src/gui/egl/qegl.cpp
+++ b/src/gui/egl/qegl.cpp
@@ -64,7 +64,7 @@ public:
static void ref() { contexts.ref(); }
static void deref() {
if (!contexts.deref()) {
- eglTerminate(QEglContext::display());
+ eglTerminate(QEgl::display());
displayOpen = 0;
}
}
@@ -535,6 +535,7 @@ static _eglDestroyImageKHR qt_eglDestroyImageKHR = 0;
EGLDisplay QEgl::display()
{
+ static EGLDisplay dpy = EGL_NO_DISPLAY;
if (!QEglContextTracker::displayOpened()) {
dpy = eglGetDisplay(nativeDisplay());
QEglContextTracker::setDisplayOpened();