kwin: drop support for build without decoration support

diff --git a/kwin/CMakeLists.txt b/kwin/CMakeLists.txt
index fabe8ed..c092702 100644 (file)
--- a/kwin/CMakeLists.txt
+++ b/kwin/CMakeLists.txt
@@ -1,7 +1,6 @@
 ########### configure tests ###############
 INCLUDE(CMakeDependentOption)
 
-OPTION(KWIN_BUILD_DECORATIONS "Enable building of KWin decorations." ON)
 OPTION(KWIN_BUILD_OXYGEN "Enable building of default decoration Oxygen" ON)
 OPTION(KWIN_BUILD_KCMS "Enable building of KWin configuration modules." ON)
 OPTION(KWIN_BUILD_TABBOX "Enable building of KWin Tabbox functionality" ON)
@@ -10,8 +9,6 @@ OPTION(KWIN_BUILD_KAPPMENU "Enable building of KWin with application menu suppor
 OPTION(KWIN_BUILD_XRENDER_COMPOSITING "Enable building of KWin with XRender Compositing support" ON)
 OPTION(KWIN_BUILD_OPENGL_1_COMPOSITING "Enable support for OpenGL 1.x, automatically disabled when building for OpenGL ES 2.0" ON)
 
-cmake_dependent_option(KWIN_BUILD_KAPPMENU "Build without appmenu support" ON "KWIN_BUILD_DECORATIONS" FALSE)
-
 # KWIN_HAVE_XRENDER_COMPOSITING - whether XRender-based compositing support is available: may be disabled
 if( KWIN_BUILD_XRENDER_COMPOSITING )
     set( KWIN_HAVE_XRENDER_COMPOSITING 1 )
@@ -56,9 +53,7 @@ if(KWIN_BUILD_KCMS)
     add_subdirectory( kcmkwin )
 endif()
 
-if( KWIN_BUILD_DECORATIONS )
-    add_subdirectory( clients )
-endif()
+add_subdirectory( clients )
 add_subdirectory( data )
 
 add_subdirectory( effects )

diff --git a/kwin/config-kwin.h.cmake b/kwin/config-kwin.h.cmake
index 9caa2be..8a727f4 100644 (file)
--- a/kwin/config-kwin.h.cmake
+++ b/kwin/config-kwin.h.cmake
@@ -1,4 +1,3 @@
-#cmakedefine KWIN_BUILD_DECORATIONS 1
 #cmakedefine KWIN_BUILD_TABBOX 1
 #cmakedefine KWIN_BUILD_DESKTOPCHANGEOSD 1
 #cmakedefine KWIN_BUILD_SCREENEDGES 1

diff --git a/kwin/decorations.cpp b/kwin/decorations.cpp
index c2fa508..1fbc219 100644 (file)
--- a/kwin/decorations.cpp
+++ b/kwin/decorations.cpp
@@ -42,11 +42,7 @@ DecorationPlugin::DecorationPlugin(QObject *parent)
 #ifndef KWIN_BUILD_OXYGEN
     defaultPlugin = "kwin3_aurorae";
 #endif
-#ifdef KWIN_BUILD_DECORATIONS
     loadPlugin("");   // load the plugin specified in cfg file
-#else
-    setDisabled(true);
-#endif
 }
 
 DecorationPlugin::~DecorationPlugin()

diff --git a/kwin/options.cpp b/kwin/options.cpp
index 52b082a..b556130 100644 (file)
--- a/kwin/options.cpp
+++ b/kwin/options.cpp
@@ -861,13 +861,7 @@ void Options::syncFromKcfgc()
     setRollOverDesktops(m_settings->rollOverDesktops());
     setLegacyFullscreenSupport(m_settings->legacyFullscreenSupport());
     setFocusStealingPreventionLevel(m_settings->focusStealingPreventionLevel());
-
-#ifdef KWIN_BUILD_DECORATIONS
     setPlacement(m_settings->placement());
-#else
-    setPlacement(Placement::Maximizing);
-#endif
-
     setAutoRaise(m_settings->autoRaise());
     setAutoRaiseInterval(m_settings->autoRaiseInterval());
     setDelayFocusInterval(m_settings->delayFocusInterval());