summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/egl/egl.pri1
-rw-r--r--src/gui/egl/qegl.cpp10
-rw-r--r--src/gui/egl/qegl_p.h4
-rw-r--r--src/gui/egl/qegl_stub.cpp12
4 files changed, 25 insertions, 2 deletions
diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri
index 65b1636..bf25438 100644
--- a/src/gui/egl/egl.pri
+++ b/src/gui/egl/egl.pri
@@ -23,6 +23,7 @@ contains(QT_CONFIG, egl): {
}
}
} else:symbian {
+ DEFINES += QT_NO_EGL
SOURCES += egl/qegl_stub.cpp
SOURCES += egl/qeglproperties_stub.cpp
}
diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp
index 0ed95ea..ee19216 100644
--- a/src/gui/egl/qegl.cpp
+++ b/src/gui/egl/qegl.cpp
@@ -333,6 +333,16 @@ bool QEglContext::configAttrib(int name, EGLint *value) const
return eglGetConfigAttrib(display(), cfg, name, value);
}
+void QEglContext::clearError()
+{
+ eglGetError();
+}
+
+EGLint QEglContext::error()
+{
+ return eglGetError();
+}
+
// Retrieve all of the properties on "cfg". If zero, return
// the context's configuration.
QEglProperties QEglContext::configProperties(EGLConfig cfg) const
diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h
index 87ed818..e08e1dd 100644
--- a/src/gui/egl/qegl_p.h
+++ b/src/gui/egl/qegl_p.h
@@ -102,8 +102,8 @@ public:
bool configAttrib(int name, EGLint *value) const;
- static void clearError() { eglGetError(); }
- static EGLint error() { return eglGetError(); }
+ static void clearError();
+ static EGLint error();
static QString errorString(EGLint code);
static EGLDisplay display();
diff --git a/src/gui/egl/qegl_stub.cpp b/src/gui/egl/qegl_stub.cpp
index e280739..0363103 100644
--- a/src/gui/egl/qegl_stub.cpp
+++ b/src/gui/egl/qegl_stub.cpp
@@ -165,6 +165,18 @@ bool QEglContext::configAttrib(int name, EGLint *value) const
return false;
}
+void QEglContext::clearError()
+{
+ NOEGL
+ return;
+}
+
+EGLint QEglContext::error()
+{
+ NOEGL
+ return 0;
+}
+
EGLDisplay QEglContext::display()
{
NOEGL