diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 06:45:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 06:45:52 (GMT) |
| commit | ecb0e303c275d379269ab570d91670b27df2c6b7 (patch) | |
| tree | 06db690aaddc60c6f9bc66d99a484248096cf1af | |
| parent | af60a29d79bca27dde9441b6b8fc0eae185f08d5 (diff) | |
| parent | c147617c3f33872a412318d9cd660e5391229619 (diff) | |
| download | Qt-ecb0e303c275d379269ab570d91670b27df2c6b7.zip Qt-ecb0e303c275d379269ab570d91670b27df2c6b7.tar.gz Qt-ecb0e303c275d379269ab570d91670b27df2c6b7.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
| -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"); |