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

 Conflicts:
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/xcb/qxcbintegration.cpp

 Conflicts git missed:
	src/plugins/platforms/qnx/qqnxglcontext.cpp

Change-Id: I0582cdc9e66e43efe79038b9c43d4f9572ac88fc

1 files changed, 12 insertions, 1 deletions

diff --git a/src/plugins/platforms/qnx/qqnxglcontext.cpp b/src/plugins/platforms/qnx/qqnxglcontext.cpp
index d4493943e2..1d030ba1aa 100644
--- a/src/plugins/platforms/qnx/qqnxglcontext.cpp
+++ b/src/plugins/platforms/qnx/qqnxglcontext.cpp
@@ -38,6 +38,7 @@
 ****************************************************************************/
 
 #include "qqnxglcontext.h"
+#include "qqnxintegration.h"
 #include "qqnxscreen.h"
 #include "qqnxeglwindow.h"
 
@@ -59,8 +60,18 @@ QT_BEGIN_NAMESPACE
 
 EGLDisplay QQnxGLContext::ms_eglDisplay = EGL_NO_DISPLAY;
 
+static QEGLPlatformContext::Flags makeFlags()
+{
+    QEGLPlatformContext::Flags result = 0;
+
+    if (!QQnxIntegration::instance()->options().testFlag(QQnxIntegration::SurfacelessEGLContext))
+        result |= QEGLPlatformContext::NoSurfaceless;
+
+    return result;
+}
+
 QQnxGLContext::QQnxGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share)
-    : QEGLPlatformContext(format, share, ms_eglDisplay)
+    : QEGLPlatformContext(format, share, ms_eglDisplay, 0, QVariant(), makeFlags())
 {
 }