From 6ea636b0bd73f067c08217aa4e0ccc3f0209ede0 Mon Sep 17 00:00:00 2001
From: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
Date: Thu, 7 May 2015 19:00:11 +0200
Subject: Create contexts and pbuffers with the correct screen in QOpenGLWidget

It won't be functional otherwise with GLX when the QOpenGLWidget is targeting
a separate X screen.

Change-Id: Ibe5b89023f833039bb67d94b78b173de2e021ac9
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
---
 src/widgets/kernel/qopenglwidget.cpp | 2 ++
 src/widgets/kernel/qwidget.cpp       | 1 +
 2 files changed, 3 insertions(+)

(limited to 'src/widgets')

diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp
index d4d23604a3..b8df25b38f 100644
--- a/src/widgets/kernel/qopenglwidget.cpp
+++ b/src/widgets/kernel/qopenglwidget.cpp
@@ -739,6 +739,7 @@ void QOpenGLWidgetPrivate::initialize()
     QScopedPointer<QOpenGLContext> ctx(new QOpenGLContext);
     ctx->setShareContext(shareContext);
     ctx->setFormat(requestedFormat);
+    ctx->setScreen(shareContext->screen());
     if (!ctx->create()) {
         qWarning("QOpenGLWidget: Failed to create context");
         return;
@@ -762,6 +763,7 @@ void QOpenGLWidgetPrivate::initialize()
     // in QQuickWidget, use a dedicated QOffscreenSurface.
     surface = new QOffscreenSurface;
     surface->setFormat(ctx->format());
+    surface->setScreen(ctx->screen());
     surface->create();
 
     if (!ctx->makeCurrent(surface)) {
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index b2ea83c991..c7b141e700 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -12074,6 +12074,7 @@ QOpenGLContext *QWidgetPrivate::shareContext() const
         QOpenGLContext *ctx = new QOpenGLContext;
         ctx->setShareContext(qt_gl_global_share_context());
         ctx->setFormat(extra->topextra->window->format());
+        ctx->setScreen(extra->topextra->window->screen());
         ctx->create();
         that->extra->topextra->shareContext = ctx;
     }
-- 
cgit v1.2.3