--- windowmanagement/kwindowsystem_x11.cpp      (revision 671667)
+++ windowmanagement/kwindowsystem_x11.cpp      (working copy)
@@ -314,7 +314,7 @@ KWindowSystem* KWindowSystem::self()
 }


-KWindowSystemPrivate* const KWindowSystem::s_d_func()
+KWindowSystemPrivate* KWindowSystem::s_d_func()
 {
     return g_kwmInstanceContainer->d;
 }
Index: windowmanagement/kwindowsystem.h
===================================================================
--- windowmanagement/kwindowsystem.h    (revision 671667)
+++ windowmanagement/kwindowsystem.h    (working copy)
@@ -603,7 +603,7 @@ private:
     static void init(int);

     friend class KWindowSystemPrivate;
-    static inline KWindowSystemPrivate* const s_d_func();
+    static KWindowSystemPrivate* s_d_func();
 #endif
 };