From cf1ab4e3302b513333a278175ea22c636da72cdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Fri, 29 Apr 2011 12:34:22 +0200 Subject: [PATCH] Do not try to load plugin when building without decos --- config-kwin.h.cmake | 1 + plugins.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/config-kwin.h.cmake b/config-kwin.h.cmake index c1a78976c6..263982d2dc 100644 --- a/config-kwin.h.cmake +++ b/config-kwin.h.cmake @@ -1,2 +1,3 @@ /* Define if you have libcaptury */ #cmakedefine HAVE_CAPTURY 1 +#cmakedefine KWIN_BUILD_DECORATIONS 1 diff --git a/plugins.cpp b/plugins.cpp index d31548af1a..4ed12e53f1 100644 --- a/plugins.cpp +++ b/plugins.cpp @@ -20,6 +20,7 @@ along with this program. If not, see . *********************************************************************/ #include "plugins.h" +#include "config-kwin.h" #include #include @@ -35,7 +36,11 @@ PluginMgr::PluginMgr() { defaultPlugin = (QPixmap::defaultDepth() > 8) ? "kwin3_oxygen" : "kwin3_plastik"; +#ifdef KWIN_BUILD_DECORATIONS loadPlugin(""); // load the plugin specified in cfg file +#else + setNoDecoration(true); +#endif } void PluginMgr::error(const QString &error_msg)