diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 09:11:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 09:11:15 (GMT) |
| commit | 0d4e512c2dd9a13aa19cbd6d28209f2dc00a0cf8 (patch) | |
| tree | ab5d82aee1b4a25c5ac6457531069a150f925b50 /src | |
| parent | faaaff5257c105860f58a4ad3df531b36e27627d (diff) | |
| parent | ecb0e303c275d379269ab570d91670b27df2c6b7 (diff) | |
| download | Qt-0d4e512c2dd9a13aa19cbd6d28209f2dc00a0cf8.zip Qt-0d4e512c2dd9a13aa19cbd6d28209f2dc00a0cf8.tar.gz Qt-0d4e512c2dd9a13aa19cbd6d28209f2dc00a0cf8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Change the ifdef for resolving function ptrs to match declaration
Diffstat (limited to 'src')
| -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 498245c..6f215cc 100644 --- a/src/gui/egl/qegl.cpp +++ b/src/gui/egl/qegl.cpp @@ -556,7 +556,7 @@ EGLDisplay QEgl::display() } // Resolve the egl extension function pointers: -#if !defined(EGL_KHR_image) && !defined(EGL_KHR_image_base) +#if (defined(EGL_KHR_image) || defined(EGL_KHR_image_base)) && !defined(EGL_EGLEXT_PROTOTYPES) if (QEgl::hasExtension("EGL_KHR_image") || QEgl::hasExtension("EGL_KHR_image_base")) { eglCreateImageKHR = (_eglCreateImageKHR) eglGetProcAddress("eglCreateImageKHR"); eglDestroyImageKHR = (_eglDestroyImageKHR) eglGetProcAddress("eglDestroyImageKHR"); |