alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

git rid of the shortcuts dialog on reduced functionality builds

Browse Source
This commit is contained in:
Aaron Seigo 2011-11-14 21:19:53 +01:00
parent da386deb15
commit 67651e12bb
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -7,6 +7,7 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
set(PLASMA_NO_SOLID TRUE) set(PLASMA_NO_SOLID TRUE)
set(PLASMA_NO_KIO TRUE) set(PLASMA_NO_KIO TRUE)
set(PLASMA_NO_KUTILS TRUE) set(PLASMA_NO_KUTILS TRUE)
set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE)
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION) endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
include_directories(${CMAKE_CURRENT_SOURCE_DIR} include_directories(${CMAKE_CURRENT_SOURCE_DIR}

2
applet.cpp
View File

@ -2035,6 +2035,7 @@ void AppletPrivate::addStandardConfigurationPages(KConfigDialog *dialog)
void AppletPrivate::addGlobalShortcutsPage(KConfigDialog *dialog) void AppletPrivate::addGlobalShortcutsPage(KConfigDialog *dialog)
{ {
#ifndef PLASMA_NO_GLOBAL_SHORTCUTS
if (isContainment) { if (isContainment) {
return; return;
} }
@ -2054,6 +2055,7 @@ void AppletPrivate::addGlobalShortcutsPage(KConfigDialog *dialog)
QObject::connect(dialog, SIGNAL(applyClicked()), q, SLOT(configDialogFinished()), Qt::UniqueConnection); QObject::connect(dialog, SIGNAL(applyClicked()), q, SLOT(configDialogFinished()), Qt::UniqueConnection);
QObject::connect(dialog, SIGNAL(okClicked()), q, SLOT(configDialogFinished()), Qt::UniqueConnection); QObject::connect(dialog, SIGNAL(okClicked()), q, SLOT(configDialogFinished()), Qt::UniqueConnection);
#endif
} }
void AppletPrivate::addPublishPage(KConfigDialog *dialog) void AppletPrivate::addPublishPage(KConfigDialog *dialog)

1
config-plasma.h.cmake
View File

@ -6,4 +6,5 @@
#cmakedefine PLASMA_NO_SOLID #cmakedefine PLASMA_NO_SOLID
#cmakedefine PLASMA_NO_KIO #cmakedefine PLASMA_NO_KIO
#cmakedefine PLASMA_NO_KUTILS #cmakedefine PLASMA_NO_KUTILS
#cmakedefine PLASMA_NO_GLOBAL_SHORTCUTS