Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-24 02:42:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

generic: misc cleanups

Browse source
This commit is contained in:
Ivailo Monev 2015-10-17 19:10:20 +03:00
parent 9ec8609680
commit 1ce0f0e9d6
5 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kcontrol/kdebug/kdebugconfig.cpp
View file

@ -173,13 +173,13 @@ void KCMDebug::load()
{ {
KConfigGroup topGroup(pConfig, QString()); KConfigGroup topGroup(pConfig, QString());
m_disableAll->setChecked(topGroup.readEntry("DisableAll", true)); m_disableAll->setChecked(topGroup.readEntry("DisableAll", true));
m_loaded = true; mLoaded = true;
emit changed( false ); emit changed( false );
} }
void KCMDebug::save() void KCMDebug::save()
{ {
if (!m_loaded) { if (!mLoaded) {
return; return;
} }
kDebug(); kDebug();
@ -281,4 +281,5 @@ void KCMDebug::slotAbortFatalChanged()
{ {
save(); save();
} }
#include "moc_kdebugconfig.cpp" #include "moc_kdebugconfig.cpp"

2
kcontrol/kdebug/kdebugconfig.h
View file

@ -64,7 +64,7 @@ private:
void readAreas(); void readAreas();
QString mCurrentDebugArea; QString mCurrentDebugArea;
bool m_loaded; // hack to avoid saving before loading bool mLoaded; // hack to avoid saving before loading
QMap<QString /*area name*/, QString /*description*/> mAreaMap; QMap<QString /*area name*/, QString /*description*/> mAreaMap;

8
libs/taskmanager/CMakeLists.txt
View file

@ -1,4 +1,5 @@
add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1204) add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1204)
include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kephal)
########### next target ############### ########### next target ###############
@ -30,7 +31,7 @@ set(taskmanager_LIB_SRCS ${taskmanager_LIB_SRCS} task_x11.cpp)
add_library(taskmanager SHARED ${taskmanager_LIB_SRCS}) add_library(taskmanager SHARED ${taskmanager_LIB_SRCS})
target_link_libraries(taskmanager processcore ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES}) target_link_libraries(taskmanager processcore ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${X11_LIBRARIES} kephal)
if (X11_Xfixes_FOUND) if (X11_Xfixes_FOUND)
target_link_libraries(taskmanager ${X11_Xfixes_LIB}) target_link_libraries(taskmanager ${X11_Xfixes_LIB})
endif (X11_Xfixes_FOUND) endif (X11_Xfixes_FOUND)
@ -41,11 +42,6 @@ if (X11_Xcomposite_FOUND)
target_link_libraries(taskmanager ${X11_Xcomposite_LIB}) target_link_libraries(taskmanager ${X11_Xcomposite_LIB})
endif (X11_Xcomposite_FOUND) endif (X11_Xcomposite_FOUND)
if (NOT KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
include_directories(${KDEBASE_WORKSPACE_SOURCE_DIR}/libs/kephal)
target_link_libraries(taskmanager kephal)
endif (NOT KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
set_target_properties(taskmanager PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) set_target_properties(taskmanager PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
install(TARGETS taskmanager EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} ) install(TARGETS taskmanager EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )

6
plasma/generic/scriptengines/javascript/CMakeLists.txt
View file

@ -1,11 +1,5 @@
# APPLET # APPLET
if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
set(PLASMA_NO_KDEWEBKIT TRUE)
set(PLASMA_NO_SOLID TRUE)
set(PLASMA_NO_KIO TRUE)
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
set(simple_javascript_engine_SRCS set(simple_javascript_engine_SRCS
common/extension_launchapp.cpp common/extension_launchapp.cpp
common/extension_io.cpp common/extension_io.cpp