Merge branch 'KDE/4.11'

Conflicts:
	kwin/egl_wayland_backend.cpp
	kwin/eglonxbackend.cpp
	kwin/glxbackend.cpp
	kwin/scene_opengl.cpp
	plasma/generic/wallpapers/color/plasma-wallpaper-color.desktop
	plasma/generic/wallpapers/image/plasma-wallpaper-image.desktop

egl_wayland_backend.cpp

@@ -81,6 +81,7 @@ EglWaylandBackend::EglWaylandBackend()
 EglWaylandBackend::~EglWaylandBackend()
 {
     cleanupGL();
+    checkGLError("Cleanup");
     doneCurrent();
     eglDestroyContext(m_display, m_context);
     eglDestroySurface(m_display, m_surface);

eglonxbackend.cpp

@@ -51,6 +51,7 @@ EglOnXBackend::~EglOnXBackend()
         m_overlayWindow->destroy();
     }
     cleanupGL();
+    checkGLError("Cleanup");
     doneCurrent();
     eglDestroyContext(dpy, ctx);
     eglDestroySurface(dpy, surface);

glxbackend.cpp

@@ -61,6 +61,7 @@ GlxBackend::~GlxBackend()
     // TODO: cleanup in error case
     // do cleanup after initBuffer()
     cleanupGL();
+    checkGLError("Cleanup");
     doneCurrent();
 
     if (ctx)
@@ -73,7 +74,6 @@ GlxBackend::~GlxBackend()
         XDestroyWindow(display(), window);
 
     overlayWindow()->destroy();
-    checkGLError("Cleanup");
     delete m_overlayWindow;
 }
 

scene_opengl.cpp

@@ -184,13 +184,12 @@ SceneOpenGL::SceneOpenGL(Workspace* ws, OpenGLBackend *backend)
 
 SceneOpenGL::~SceneOpenGL()
 {
+    // do cleanup after initBuffer()
+    SceneOpenGL::EffectFrame::cleanup();
     if (init_ok) {
         // backend might be still needed for a different scene
         delete m_backend;
     }
-    // do cleanup after initBuffer()
-    SceneOpenGL::EffectFrame::cleanup();
-    checkGLError("Cleanup");
 }
 
 SceneOpenGL *SceneOpenGL::createScene()