Merge branch 'Plasma/5.0'

2014-07-22 13:22:48 +02:00 · 2014-07-22 13:22:48 +02:00 · 1e9b02411e
parent aa7f9f26f6 7f3b349ab3
commit 1e9b02411e
1 changed files with 2 additions and 0 deletions
--- a/libkwineffects/kwinglplatform.cpp
+++ b/libkwineffects/kwinglplatform.cpp
@ -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;
    }
 }