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

Conflicts:
	src/plugins/platforms/xcb/qxcbintegration.cpp

Change-Id: I2d71d06a55f730df19ace0dd3304238584a0497f

3 files changed, 23 insertions, 0 deletions

diff --git a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.h b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.h
index 719d2ace90..926e5e22df 100644
--- a/src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.h
+++ b/src/plugins/platforms/xcb/gl_integrations/qxcbglintegration.h
@@ -60,6 +60,7 @@ public:
     virtual bool initialize(QXcbConnection *connection) = 0;
 
     virtual bool supportsThreadedOpenGL() const { return false; }
+    virtual bool supportsSwitchableWidgetComposition()  const { return true; }
     virtual bool handleXcbEvent(xcb_generic_event_t *event, uint responseType);
 
     virtual QXcbWindow *createWindow(QWindow *window) const = 0;
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
index f97c01f390..77cbdd5fba 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.cpp
@@ -224,5 +224,26 @@ bool QXcbGlxIntegration::supportsThreadedOpenGL() const
     return QGLXContext::supportsThreading();
 }
 
+bool QXcbGlxIntegration::supportsSwitchableWidgetComposition() const
+{
+    static bool vendorChecked = false;
+    static bool isSwitchableWidgetCompositionAvailable = true;
+    if (!vendorChecked) {
+        vendorChecked = true;
+        Display *display = glXGetCurrentDisplay();
+#ifdef XCB_USE_XLIB
+        if (!display)
+            display = static_cast<Display *>(m_connection->xlib_display());
+#endif
+        const char *glxvendor = glXGetClientString(display, GLX_VENDOR);
+        if (glxvendor) {
+            if (!strcmp(glxvendor, "Parallels Inc"))
+                isSwitchableWidgetCompositionAvailable = false;
+        }
+    }
+
+    return isSwitchableWidgetCompositionAvailable;
+}
+
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h
index 77d3bc55e1..8f04db31b2 100644
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h
@@ -60,6 +60,7 @@ public:
     QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const Q_DECL_OVERRIDE;
 
     virtual bool supportsThreadedOpenGL() const Q_DECL_OVERRIDE;
+    virtual bool supportsSwitchableWidgetComposition() const Q_DECL_OVERRIDE;
 
 private:
     QXcbConnection *m_connection;