From 67651e12bbbb8047fa3582c10be1b4fed144a693 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Mon, 14 Nov 2011 21:19:53 +0100 Subject: [PATCH] git rid of the shortcuts dialog on reduced functionality builds --- CMakeLists.txt | 1 + applet.cpp | 2 ++ config-plasma.h.cmake | 1 + 3 files changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 68c7307ae..fd86df12c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) set(PLASMA_NO_SOLID TRUE) set(PLASMA_NO_KIO TRUE) set(PLASMA_NO_KUTILS TRUE) + set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE) endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) include_directories(${CMAKE_CURRENT_SOURCE_DIR} diff --git a/applet.cpp b/applet.cpp index c99cdecaa..99671b62d 100644 --- a/applet.cpp +++ b/applet.cpp @@ -2035,6 +2035,7 @@ void AppletPrivate::addStandardConfigurationPages(KConfigDialog *dialog) void AppletPrivate::addGlobalShortcutsPage(KConfigDialog *dialog) { +#ifndef PLASMA_NO_GLOBAL_SHORTCUTS if (isContainment) { return; } @@ -2054,6 +2055,7 @@ void AppletPrivate::addGlobalShortcutsPage(KConfigDialog *dialog) QObject::connect(dialog, SIGNAL(applyClicked()), q, SLOT(configDialogFinished()), Qt::UniqueConnection); QObject::connect(dialog, SIGNAL(okClicked()), q, SLOT(configDialogFinished()), Qt::UniqueConnection); +#endif } void AppletPrivate::addPublishPage(KConfigDialog *dialog) diff --git a/config-plasma.h.cmake b/config-plasma.h.cmake index ebce7422b..936ab3a72 100644 --- a/config-plasma.h.cmake +++ b/config-plasma.h.cmake @@ -6,4 +6,5 @@ #cmakedefine PLASMA_NO_SOLID #cmakedefine PLASMA_NO_KIO #cmakedefine PLASMA_NO_KUTILS +#cmakedefine PLASMA_NO_GLOBAL_SHORTCUTS