Output a friendly warning when makeCurrent fails

Change-Id: Ife582717b4abc657120b98366fe6e6dc5efc7586
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>

diff --git a/src/quick/items/qquickwindowmanager.cpp b/src/quick/items/qquickwindowmanager.cpp
index a07efea..ca9c73c 100644 (file)
--- a/src/quick/items/qquickwindowmanager.cpp
+++ b/src/quick/items/qquickwindowmanager.cpp
@@ -335,7 +335,8 @@ void QQuickRenderThreadSingleContextWindowManager::initialize()
     // Pick up the surface format from one of them
     gl->setFormat(win->requestedFormat());
     gl->create();
-    gl->makeCurrent(win);
+    if (!gl->makeCurrent(win))
+        qWarning("QQuickCanvas: makeCurrent() failed...");
 
     Q_ASSERT(!sg->isReady());
     sg->initialize(gl);
@@ -1144,7 +1145,8 @@ void QQuickTrivialWindowManager::renderCanvas(QQuickCanvas *canvas)
         gl = new QOpenGLContext();
         gl->setFormat(canvas->requestedFormat());
         gl->create();
-        gl->makeCurrent(canvas);
+        if (!gl->makeCurrent(canvas))
+            qWarning("QQuickCanvas: makeCurrent() failed...");
         sg->initialize(gl);
     } else {
         gl->makeCurrent(canvas);