Merge remote-tracking branch 'origin/5.9' into 5.11

 Conflicts:
	.qmake.conf
	src/corelib/animation/qvariantanimation.cpp
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/corelib/io/qprocess_win.cpp
	src/corelib/json/qjsonarray.cpp
	src/corelib/tools/qsimd_p.h
	src/corelib/tools/qtimezoneprivate_p.h
	src/corelib/xml/qxmlstream_p.h
	src/gui/kernel/qsimpledrag.cpp
	src/gui/kernel/qsimpledrag_p.h
	src/plugins/generic/generic.pro
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/widgets/styles/qmacstyle_mac.mm
	tests/auto/concurrent/qtconcurrentmap/BLACKLIST
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qmessagebox/BLACKLIST

Change-Id: I508d686cf20f7f8cc6a7119b9bc7c3bbb505c58e

1 files changed, 16 insertions, 190 deletions

diff --git a/src/plugins/platforms/qnx/qqnxglcontext.cpp b/src/plugins/platforms/qnx/qqnxglcontext.cpp
index d35a4f0bba..d4493943e2 100644
--- a/src/plugins/platforms/qnx/qqnxglcontext.cpp
+++ b/src/plugins/platforms/qnx/qqnxglcontext.cpp
@@ -59,117 +59,13 @@ QT_BEGIN_NAMESPACE
 
 EGLDisplay QQnxGLContext::ms_eglDisplay = EGL_NO_DISPLAY;
 
-QQnxGLContext::QQnxGLContext(QOpenGLContext *glContext)
-    : QPlatformOpenGLContext(),
-      m_glContext(glContext),
-      m_currentEglSurface(EGL_NO_SURFACE)
+QQnxGLContext::QQnxGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share)
+    : QEGLPlatformContext(format, share, ms_eglDisplay)
 {
-    qGLContextDebug();
-    QSurfaceFormat format = m_glContext->format();
-
-    // Set current rendering API
-    EGLBoolean eglResult = eglBindAPI(EGL_OPENGL_ES_API);
-    if (Q_UNLIKELY(eglResult != EGL_TRUE))
-        qFatal("QQNX: failed to set EGL API, err=%d", eglGetError());
-
-    // Get colour channel sizes from window format
-    int alphaSize = format.alphaBufferSize();
-    int redSize = format.redBufferSize();
-    int greenSize = format.greenBufferSize();
-    int blueSize = format.blueBufferSize();
-
-    // Check if all channels are don't care
-    if (alphaSize == -1 && redSize == -1 && greenSize == -1 && blueSize == -1) {
-        // Set colour channels based on depth of window's screen
-        QQnxScreen *screen = static_cast<QQnxScreen*>(glContext->screen()->handle());
-        int depth = screen->depth();
-        if (depth == 32) {
-            // SCREEN_FORMAT_RGBA8888
-            alphaSize = 8;
-            redSize = 8;
-            greenSize = 8;
-            blueSize = 8;
-        } else {
-            // SCREEN_FORMAT_RGB565
-            alphaSize = 0;
-            redSize = 5;
-            greenSize = 6;
-            blueSize = 5;
-        }
-    } else {
-        // Choose best match based on supported pixel formats
-        if (alphaSize <= 0 && redSize <= 5 && greenSize <= 6 && blueSize <= 5) {
-            // SCREEN_FORMAT_RGB565
-            alphaSize = 0;
-            redSize = 5;
-            greenSize = 6;
-            blueSize = 5;
-        } else {
-            // SCREEN_FORMAT_RGBA8888
-            alphaSize = 8;
-            redSize = 8;
-            greenSize = 8;
-            blueSize = 8;
-        }
-    }
-
-    // Update colour channel sizes in window format
-    format.setAlphaBufferSize(alphaSize);
-    format.setRedBufferSize(redSize);
-    format.setGreenBufferSize(greenSize);
-    format.setBlueBufferSize(blueSize);
-
-    // Select EGL config based on requested window format
-    m_eglConfig = q_configFromGLFormat(ms_eglDisplay, format);
-    if (Q_UNLIKELY(m_eglConfig == 0))
-        qFatal("QQnxGLContext: failed to find EGL config");
-
-    QQnxGLContext *glShareContext = static_cast<QQnxGLContext*>(m_glContext->shareHandle());
-    m_eglShareContext = glShareContext ? glShareContext->m_eglContext : EGL_NO_CONTEXT;
-
-    m_eglContext = eglCreateContext(ms_eglDisplay, m_eglConfig, m_eglShareContext,
-                                    contextAttrs(format));
-    if (Q_UNLIKELY(m_eglContext == EGL_NO_CONTEXT)) {
-        checkEGLError("eglCreateContext");
-        qFatal("QQnxGLContext: failed to create EGL context, err=%d", eglGetError());
-    }
-
-    // Query/cache window format of selected EGL config
-    m_windowFormat = q_glFormatFromConfig(ms_eglDisplay, m_eglConfig);
 }
 
 QQnxGLContext::~QQnxGLContext()
 {
-    qGLContextDebug();
-
-    // Cleanup EGL context if it exists
-    if (m_eglContext != EGL_NO_CONTEXT)
-        eglDestroyContext(ms_eglDisplay, m_eglContext);
-}
-
-EGLenum QQnxGLContext::checkEGLError(const char *msg)
-{
-    static const char *errmsg[] =
-    {
-        "EGL function succeeded",
-        "EGL is not initialized, or could not be initialized, for the specified display",
-        "EGL cannot access a requested resource",
-        "EGL failed to allocate resources for the requested operation",
-        "EGL fail to access an unrecognized attribute or attribute value was passed in an attribute list",
-        "EGLConfig argument does not name a valid EGLConfig",
-        "EGLContext argument does not name a valid EGLContext",
-        "EGL current surface of the calling thread is no longer valid",
-        "EGLDisplay argument does not name a valid EGLDisplay",
-        "EGL arguments are inconsistent",
-        "EGLNativePixmapType argument does not refer to a valid native pixmap",
-        "EGLNativeWindowType argument does not refer to a valid native window",
-        "EGL one or more argument values are invalid",
-        "EGLSurface argument does not name a valid surface configured for rendering",
-        "EGL power management event has occurred",
-    };
-    EGLenum error = eglGetError();
-    fprintf(stderr, "%s: %s\n", msg, errmsg[error - EGL_SUCCESS]);
-    return error;
 }
 
 void QQnxGLContext::initializeContext()
@@ -178,16 +74,12 @@ void QQnxGLContext::initializeContext()
 
     // Initialize connection to EGL
     ms_eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-    if (Q_UNLIKELY(ms_eglDisplay == EGL_NO_DISPLAY)) {
-        checkEGLError("eglGetDisplay");
-        qFatal("QQnxGLContext: failed to obtain EGL display");
-    }
+    if (Q_UNLIKELY(ms_eglDisplay == EGL_NO_DISPLAY))
+        qFatal("QQnxGLContext: failed to obtain EGL display: %x", eglGetError());
 
     EGLBoolean eglResult = eglInitialize(ms_eglDisplay, 0, 0);
-    if (Q_UNLIKELY(eglResult != EGL_TRUE)) {
-        checkEGLError("eglInitialize");
+    if (Q_UNLIKELY(eglResult != EGL_TRUE))
         qFatal("QQnxGLContext: failed to initialize EGL display, err=%d", eglGetError());
-    }
 }
 
 void QQnxGLContext::shutdownContext()
@@ -198,98 +90,32 @@ void QQnxGLContext::shutdownContext()
     eglTerminate(ms_eglDisplay);
 }
 
-bool QQnxGLContext::makeCurrent(QPlatformSurface *surface)
+EGLSurface QQnxGLContext::eglSurfaceForPlatformSurface(QPlatformSurface *surface)
 {
-    qGLContextDebug();
-
-    Q_ASSERT(surface->surface()->surfaceType() == QSurface::OpenGLSurface);
-
-    // Set current rendering API
-    EGLBoolean eglResult = eglBindAPI(EGL_OPENGL_ES_API);
-    if (Q_UNLIKELY(eglResult != EGL_TRUE))
-        qFatal("QQnxGLContext: failed to set EGL API, err=%d", eglGetError());
-
-    QQnxEglWindow *platformWindow = dynamic_cast<QQnxEglWindow*>(surface);
-    if (!platformWindow)
-        return false;
-
-    platformWindow->setPlatformOpenGLContext(this);
-
-    if (m_currentEglSurface == EGL_NO_SURFACE || m_currentEglSurface != platformWindow->getSurface()) {
-        m_currentEglSurface = platformWindow->getSurface();
-        doneCurrent();
-    }
-
-    eglResult = eglMakeCurrent(ms_eglDisplay, m_currentEglSurface, m_currentEglSurface, m_eglContext);
-    if (eglResult != EGL_TRUE) {
-        checkEGLError("eglMakeCurrent");
-        qWarning("QQNX: failed to set current EGL context, err=%d", eglGetError());
-        return false;
-    }
-    return (eglResult == EGL_TRUE);
+    QQnxEglWindow *window = static_cast<QQnxEglWindow *>(surface);
+    window->ensureInitialized(this);
+    return window->surface();
 }
 
-void QQnxGLContext::doneCurrent()
+bool QQnxGLContext::makeCurrent(QPlatformSurface *surface)
 {
     qGLContextDebug();
-
-    // set current rendering API
-    EGLBoolean eglResult = eglBindAPI(EGL_OPENGL_ES_API);
-    if (Q_UNLIKELY(eglResult != EGL_TRUE))
-        qFatal("QQNX: failed to set EGL API, err=%d", eglGetError());
-
-    // clear curent EGL context and unbind EGL surface
-    eglResult = eglMakeCurrent(ms_eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-    if (Q_UNLIKELY(eglResult != EGL_TRUE))
-        qFatal("QQNX: failed to clear current EGL context, err=%d", eglGetError());
+    return QEGLPlatformContext::makeCurrent(surface);
 }
 
 void QQnxGLContext::swapBuffers(QPlatformSurface *surface)
 {
     qGLContextDebug();
-    QQnxEglWindow *platformWindow = dynamic_cast<QQnxEglWindow*>(surface);
-    if (!platformWindow)
-        return;
-
-    platformWindow->swapEGLBuffers();
-}
 
-QFunctionPointer QQnxGLContext::getProcAddress(const char *procName)
-{
-    qGLContextDebug();
+    QEGLPlatformContext::swapBuffers(surface);
 
-    // Set current rendering API
-    EGLBoolean eglResult = eglBindAPI(EGL_OPENGL_ES_API);
-    if (Q_UNLIKELY(eglResult != EGL_TRUE))
-        qFatal("QQNX: failed to set EGL API, err=%d", eglGetError());
-
-    // Lookup EGL extension function pointer
-    QFunctionPointer result = static_cast<QFunctionPointer>(eglGetProcAddress(procName));
-    if (!result)
-        result = reinterpret_cast<QFunctionPointer>(dlsym(RTLD_DEFAULT, procName));
-    return result;
-}
-
-bool QQnxGLContext::isSharing() const
-{
-    return m_eglShareContext != EGL_NO_CONTEXT;
-}
-
-EGLDisplay QQnxGLContext::getEglDisplay() {
-    return ms_eglDisplay;
+    QQnxEglWindow *platformWindow = static_cast<QQnxEglWindow*>(surface);
+    platformWindow->windowPosted();
 }
 
-EGLint *QQnxGLContext::contextAttrs(const QSurfaceFormat &format)
+void QQnxGLContext::doneCurrent()
 {
-    qGLContextDebug();
-
-    // Choose EGL settings based on OpenGL version
-#if defined(QT_OPENGL_ES_2)
-    static EGLint attrs[] = { EGL_CONTEXT_CLIENT_VERSION, format.version().first, EGL_NONE };
-    return attrs;
-#else
-    return 0;
-#endif
+    QEGLPlatformContext::doneCurrent();
 }
 
 QT_END_NAMESPACE