aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2012-05-24 12:15:25 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-24 12:52:43 +0200
commit0a3ff88f851771e52d119fab90c0254de6950585 (patch)
tree9d56fd632c95c5f19155fd87109ae3911aa596a0
parent1e0a741a81cbe7800a15c76caabe6601d2edf39d (diff)
Check ThreadedOpenGL support before enabling threaded renderer.
BufferQueuedOpenGL doesn't necessarily imply threading support. Change-Id: I4ba8e3b9acfd3eb12bb41aa6b644c852ae5fa1c6 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
-rw-r--r--src/quick/items/qquickwindowmanager.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/qquickwindowmanager.cpp b/src/quick/items/qquickwindowmanager.cpp
index f584209e42..392085a40c 100644
--- a/src/quick/items/qquickwindowmanager.cpp
+++ b/src/quick/items/qquickwindowmanager.cpp
@@ -332,7 +332,8 @@ QQuickWindowManager *QQuickWindowManager::instance()
theInstance = QSGContext::createWindowManager();
- bool fancy = QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::BufferQueueingOpenGL);
+ bool fancy = QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::BufferQueueingOpenGL)
+ && QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::ThreadedOpenGL);
if (qmlNoThreadedRenderer())
fancy = false;
else if (qmlForceThreadedRenderer())