Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	configure
	mkspecs/common/wince/qplatformdefs.h
	src/plugins/platforms/directfb/qdirectfbbackingstore.cpp
	src/plugins/platforms/xcb/qxcbbackingstore.cpp

Change-Id: Ied4d31264a9afca9514b51a7eb1494c28712793c

1 files changed, 6 insertions, 5 deletions

diff --git a/src/plugins/platforms/directfb/qdirectfbglcontext.cpp b/src/plugins/platforms/directfb/qdirectfbglcontext.cpp
index 1136591c78..8018433fb6 100644
--- a/src/plugins/platforms/directfb/qdirectfbglcontext.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbglcontext.cpp
@@ -40,6 +40,7 @@
 #include "qdirectfbglcontext.h"
 
 #include <directfbgl.h>
+#include <dlfcn.h>
 
 #include <QDebug>
 
@@ -80,19 +81,19 @@ void QDirectFbGLContext::doneCurrent()
     m_dfbGlContext->Unlock(m_dfbGlContext);
 }
 
-void *QDirectFbGLContext::getProcAddress(const QString &procName)
+QFunctionPointer QDirectFbGLContext::getProcAddress(const char *procName)
 {
     void *proc;
-    DFBResult result = m_dfbGlContext->GetProcAddress(m_dfbGlContext,qPrintable(procName),&proc);
+    DFBResult result = m_dfbGlContext->GetProcAddress(m_dfbGlContext, procName, &proc);
     if (result == DFB_OK)
-        return proc;
-    return 0;
+        return (QFunctionPointer) proc;
+    return dlsym(RTLD_DEFAULT, procName);
 }
 
 void QDirectFbGLContext::swapBuffers()
 {
 //    m_dfbGlContext->Unlock(m_dfbGlContext); //maybe not in doneCurrent()
-    qDebug() << "Swap buffers";
+    qDebug("Swap buffers");
 }
 
 QPlatformWindowFormat QDirectFbGLContext::platformWindowFormat() const