From: Samuel Rødal <samuel.rodal@nokia.com>
Date: Thu, 24 May 2012 10:15:25 +0000 (+0200)
Subject: Check ThreadedOpenGL support before enabling threaded renderer.
X-Git-Tag: 071012131707~309
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a3ff88f851771e52d119fab90c0254de6950585;p=profile%2Fivi%2Fqtdeclarative.git

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>
---

diff --git a/src/quick/items/qquickwindowmanager.cpp b/src/quick/items/qquickwindowmanager.cpp
index f584209..392085a 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())