From b15a97bb88bd5b0312033a39e3e50d6aee31a503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Mon, 31 Mar 2014 13:20:39 +0200 Subject: [PATCH] Properly remove KWIN_BUILD_OXYGEN Left over from splitting, caused Aurorae to be the default deco. --- config-kwin.h.cmake | 1 - decorations.cpp | 3 --- 2 files changed, 4 deletions(-) diff --git a/config-kwin.h.cmake b/config-kwin.h.cmake index 951198ab36..7cf3c97e95 100644 --- a/config-kwin.h.cmake +++ b/config-kwin.h.cmake @@ -4,7 +4,6 @@ #cmakedefine KWIN_BUILD_SCREENEDGES 1 #cmakedefine KWIN_BUILD_KAPPMENU 1 #cmakedefine KWIN_BUILD_ACTIVITIES 1 -#cmakedefine KWIN_BUILD_OXYGEN 1 #define KWIN_NAME "${KWIN_NAME}" #define KWIN_CONFIG "${KWIN_NAME}rc" #define KWIN_VERSION_STRING "${KDE4WORKSPACE_VERSION}" diff --git a/decorations.cpp b/decorations.cpp index b15b733691..2e66f18a3b 100644 --- a/decorations.cpp +++ b/decorations.cpp @@ -40,9 +40,6 @@ DecorationPlugin::DecorationPlugin(QObject *parent) , m_disabled(false) { defaultPlugin = QStringLiteral("Oxygen"); -#ifndef KWIN_BUILD_OXYGEN - defaultPlugin = QStringLiteral("aurorae"); -#endif #ifdef KWIN_BUILD_DECORATIONS loadPlugin(QString()); // load the plugin specified in cfg file connect(factory(), &KDecorationFactory::recreateDecorations, this, &DecorationPlugin::recreateDecorations);