KDE/kdebase

[Christoph Feck]

SVN commit 1092369 by cfeck:

Move kcm_desktoppaths from kdebase/apps to kdebase/workspace

This allows users to change desktop paths without having Konqueror
installed.

Please move translation and documentation in trunk, thanks!

BUG: 216427
CCMAIL: kde-packager at kde.org
CCMAIL: kde-i18n-doc at kde.org
CCMAIL: kde-buildsystem at kde.org
CCMAIL: faure at kde.org


 M  +0 -14     apps/konqueror/settings/konq/CMakeLists.txt  
 D             apps/konqueror/settings/konq/desktoppath.desktop  
 D             apps/konqueror/settings/konq/globalpaths.cpp  
 D             apps/konqueror/settings/konq/globalpaths.h  
 D             apps/konqueror/settings/konq/kcmdesktoppaths.cpp  
 D             apps/konqueror/settings/konq/kcmdesktoppaths.h  
 M  +1 -0      workspace/kcontrol/CMakeLists.txt  
 A             workspace/kcontrol/desktoppaths (directory)  
 A             workspace/kcontrol/desktoppaths/CMakeLists.txt  
 A             workspace/kcontrol/desktoppaths/desktoppath.desktop   apps/konqueror/settings/konq/desktoppath.desktop#1092359
 A             workspace/kcontrol/desktoppaths/globalpaths.cpp   apps/konqueror/settings/konq/globalpaths.cpp#1092359 [License: GPL (v2+)]
 A             workspace/kcontrol/desktoppaths/globalpaths.h   apps/konqueror/settings/konq/globalpaths.h#1092359 [License: GPL (v2+)]
 A             workspace/kcontrol/desktoppaths/kcmdesktoppaths.cpp   apps/konqueror/settings/konq/kcmdesktoppaths.cpp#1092359 [License: LGPL (v2)]
 A             workspace/kcontrol/desktoppaths/kcmdesktoppaths.h   apps/konqueror/settings/konq/kcmdesktoppaths.h#1092359 [License: LGPL (v2)]


--- trunk/KDE/kdebase/apps/konqueror/settings/konq/CMakeLists.txt #1092368:1092369
@@ -12,22 +12,8 @@
 install(TARGETS kcm_konq  DESTINATION ${PLUGIN_INSTALL_DIR} )
 
 
-set(kcm_desktoppaths_PART_SRCS
-   globalpaths.cpp
-   kcmdesktoppaths.cpp
-)
-
-kde4_add_plugin(kcm_desktoppaths ${kcm_desktoppaths_PART_SRCS})
-
-
-target_link_libraries(kcm_desktoppaths ${KDE4_KUTILS_LIBS} ${KDE4_KIO_LIBS})
-
-install(TARGETS kcm_desktoppaths  DESTINATION ${PLUGIN_INSTALL_DIR} )
-
-
 ########### install files ###############
 install( FILES
-   desktoppath.desktop
    filebehavior.desktop
    #fileappearance.desktop
    DESTINATION  ${SERVICES_INSTALL_DIR} )
--- trunk/KDE/kdebase/workspace/kcontrol/CMakeLists.txt #1092368:1092369
@@ -43,6 +43,7 @@
 #add_subdirectory( smartcard )
 
 add_subdirectory( hardware )
+add_subdirectory( desktoppaths )
 
 if(FONTCONFIG_FOUND AND FREETYPE_FOUND AND NOT WIN32)
     add_subdirectory( fonts )