Merge branch 'Plasma/5.0'

This commit is contained in:
Martin Gräßlin 2014-07-22 13:22:48 +02:00
commit 1e9b02411e

View file

@ -840,10 +840,12 @@ void GLPlatform::detect(OpenGLPlatformInterface platformInterface)
if (isVirtualBox()) {
m_virtualMachine = true;
m_recommendedCompositor = OpenGL2Compositing;
}
if (isVMware()) {
m_virtualMachine = true;
m_recommendedCompositor = OpenGL2Compositing;
}
}