diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-02 00:16:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-02 00:16:28 (GMT) |
| commit | 5fa83d8e2ad78272a1013c45387adffb5e551357 (patch) | |
| tree | 49f0362e1bbf03f668077dfc18a66342bb03ac39 /src/gui | |
| parent | 7274f7f9cc21beeddb01adadc7eb79ed61459802 (diff) | |
| parent | 5a024622db5dd7d9fb23202500da13813c28224b (diff) | |
| download | Qt-5fa83d8e2ad78272a1013c45387adffb5e551357.zip Qt-5fa83d8e2ad78272a1013c45387adffb5e551357.tar.gz Qt-5fa83d8e2ad78272a1013c45387adffb5e551357.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix desktopservices demo missing icon in Symbian
Fix path removal from target in Symbian builds
Fix compilation errors in tst_qfileinfo
Symbian (installation) docs.
Make 'make sis' recursive again.
Fix libinfix usage
Make symbian-resource files aware of libInfix configure feature
Update symbian def files for 4.7
Correction to EGL stub implementation
Fix 'make sis' when media services is disabled and multimedia is not
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/egl/qegl_p.h | 6 | ||||
| -rw-r--r-- | src/gui/egl/qegl_stub.cpp | 8 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h index 6c562ef..4fc1338 100644 --- a/src/gui/egl/qegl_p.h +++ b/src/gui/egl/qegl_p.h @@ -154,7 +154,13 @@ QT_BEGIN_NAMESPACE // Declare/define the bits of EGL_KHR_image_base we need: #if !defined(EGL_KHR_image) && !defined(EGL_KHR_image_base) +#ifdef Q_OS_SYMBIAN +//symbian version of eglext.h differs from the khronos reference +typedef int EGLImageKHR; +#else typedef void *EGLImageKHR; +#endif + #define EGL_NO_IMAGE_KHR ((EGLImageKHR)0) #define EGL_IMAGE_PRESERVED_KHR 0x30D2 #define EGL_KHR_image_base diff --git a/src/gui/egl/qegl_stub.cpp b/src/gui/egl/qegl_stub.cpp index 0bd3451..86a7aab 100644 --- a/src/gui/egl/qegl_stub.cpp +++ b/src/gui/egl/qegl_stub.cpp @@ -183,14 +183,6 @@ int QEglContext::configAttrib(int name) const return 0; } -typedef EGLImageKHR (EGLAPIENTRY *_eglCreateImageKHR)(EGLDisplay, EGLContext, EGLenum, EGLClientBuffer, const EGLint*); -typedef EGLBoolean (EGLAPIENTRY *_eglDestroyImageKHR)(EGLDisplay, EGLImageKHR); - -// Defined in qegl.cpp: -static _eglCreateImageKHR qt_eglCreateImageKHR = 0; -static _eglDestroyImageKHR qt_eglDestroyImageKHR = 0; - - EGLDisplay QEgl::display() { NOEGL |