2 files changed, 12 insertions, 9 deletions
diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
index 8c41773f06..f8efd105bc 100644
--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
@@ -172,6 +172,17 @@ bool q_reduceConfigAttributes(QVector<EGLint> *configAttributes)
         return true;
     }
 
+    i = configAttributes->indexOf(EGL_DEPTH_SIZE);
+    if (i >= 0) {
+        if (configAttributes->at(i + 1) >= 32)
+            configAttributes->replace(i + 1, 24);
+        else if (configAttributes->at(i + 1) > 1)
+            configAttributes->replace(i + 1, 1);
+        else
+            configAttributes->remove(i, 2);
+        return true;
+    }
+
     i = configAttributes->indexOf(EGL_ALPHA_SIZE);
     if (i >= 0) {
         configAttributes->remove(i,2);
@@ -195,14 +206,6 @@ bool q_reduceConfigAttributes(QVector<EGLint> *configAttributes)
         return true;
     }
 
-    i = configAttributes->indexOf(EGL_DEPTH_SIZE);
-    if (i >= 0) {
-        if (configAttributes->at(i + 1) > 1)
-            configAttributes->replace(i + 1, 1);
-        else
-            configAttributes->remove(i, 2);
-        return true;
-    }
 #ifdef EGL_BIND_TO_TEXTURE_RGB
     i = configAttributes->indexOf(EGL_BIND_TO_TEXTURE_RGB);
     if (i >= 0) {
diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
index bd7254b73a..6a3bc25418 100644
--- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
+++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp
@@ -447,7 +447,7 @@ QFunctionPointer QEGLPlatformContext::getProcAddress(const char *procName)
 {
     eglBindAPI(m_api);
     QFunctionPointer proc = (QFunctionPointer) eglGetProcAddress(procName);
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_INTEGRITY)
     if (!proc)
         proc = (QFunctionPointer) dlsym(RTLD_DEFAULT, procName);
 #endif