aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickwindowmanager.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2012-01-26 16:46:04 +0100
committerQt by Nokia <qt-info@nokia.com>2012-01-27 09:55:44 +0100
commit6ca82a4130cebf1e1b6d7599a72b339bb3a2dada (patch)
treeb09acd44a38ece30b396e96c9f794591aa0835da /src/quick/items/qquickwindowmanager.cpp
parentcd9103f7f2514b6380aa460ac9d6454e132be307 (diff)
Output a friendly warning when makeCurrent fails
Change-Id: Ife582717b4abc657120b98366fe6e6dc5efc7586 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'src/quick/items/qquickwindowmanager.cpp')
-rw-r--r--src/quick/items/qquickwindowmanager.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/items/qquickwindowmanager.cpp b/src/quick/items/qquickwindowmanager.cpp
index a07efeaeb3..ca9c73cbc0 100644
--- 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);