Drop workaround for QTBUG-34898

Fixed as of 91e2c5d749e38eed93e91b14151faa549e70080f in
qtdeclarative module. Part of at 5.2.1.
This commit is contained in:
Martin Gräßlin 2014-03-08 14:41:12 +01:00
parent f77fe3ebd9
commit 0d6dfd83a1

View file

@ -751,11 +751,6 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
m_driverVersion = parseVersionString(versionTokens.at(index + 1));
else
m_driverVersion = 0;
if (qgetenv("QT_OPENGL_NO_SANITY_CHECK").isNull()) {
// workaround for QTBUG-34898
m_recommendedCompositor = XRenderCompositing;
}
}
@ -828,10 +823,6 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
} else {
m_recommendedCompositor = OpenGL2Compositing;
}
if (m_chipClass == SandyBridge && m_renderer.contains("Mobile") && qgetenv("QT_OPENGL_NO_SANITY_CHECK").isNull()) {
// workaround for QTBUG-34898
m_recommendedCompositor = XRenderCompositing;
}
}
if (isMesaDriver() && platformInterface == EglPlatformInterface) {