From 84c8e4717c70f0f214f84a5c9430dcc024bf2e8b Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 19 Mar 2014 09:55:05 +0100 Subject: Android: Re-enable threaded rendering In Qt 5.2.x, the platform plugin inherited from the EGLFS platform plugin, so calling the super class implementation of hasCapability() would return true for ThreadedOpenGL. Since this link was removed in Qt 5.3, we would return false for all devices, giving us a large performance regression. Task-number: QTBUG-37586 Change-Id: I27758649ee9c0921902787b93be943751c839eb8 Reviewed-by: Paul Olav Tvete Reviewed-by: BogDan Vatra Reviewed-by: Alessandro Portale Reviewed-by: Gunnar Sletta --- src/plugins/platforms/android/qandroidplatformintegration.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/android/qandroidplatformintegration.cpp b/src/plugins/platforms/android/qandroidplatformintegration.cpp index 2cca974b41..9adefd5b2c 100644 --- a/src/plugins/platforms/android/qandroidplatformintegration.cpp +++ b/src/plugins/platforms/android/qandroidplatformintegration.cpp @@ -152,7 +152,8 @@ bool QAndroidPlatformIntegration::hasCapability(Capability cap) const case ThreadedOpenGL: if (needsWorkaround()) return false; - // fall through + else + return true; default: return QPlatformIntegration::hasCapability(cap); } -- cgit v1.2.3