diff --git a/CMakeLists.txt b/CMakeLists.txt index 2af36cb1..e99c3d29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,6 @@ set(KDE4_IMPORTS_INSTALL_DIR "${KDE4_PLUGIN_INSTALL_DIR}/imports" CACHE PATH "KD set(KDE4_CONFIG_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/config" CACHE PATH "KDE config installation directory") set(KDE4_DATA_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}" CACHE PATH "KDE data installation directory") set(KDE4_ICON_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/icons" CACHE PATH "KDE icon installation directory") -set(KDE4_KCFG_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/config.kcfg" CACHE PATH "KDE kcfg installation directory") set(KDE4_LOCALE_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/translations/kde4" CACHE PATH "KDE locale installation directory") set(KDE4_SERVICES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/kde4/services" CACHE PATH "KDE services installation directory") set(KDE4_SERVICETYPES_INSTALL_DIR "${KDE4_SHARE_INSTALL_PREFIX}/kde4/servicetypes" CACHE PATH "KDE service types installation directory") diff --git a/KDELibs4Config.cmake b/KDELibs4Config.cmake index de57eda5..a7eccaed 100644 --- a/KDELibs4Config.cmake +++ b/KDELibs4Config.cmake @@ -16,7 +16,6 @@ # KDE4_CONFIG_INSTALL_DIR - the directory where config files from kdelibs are installed # KDE4_ICON_INSTALL_DIR - the directory where icons from kdelibs are # KDE4_IMPORTS_INSTALL_DIR - the directory where imports from kdelibs are -# KDE4_KCFG_INSTALL_DIR - the directory where kconfig files from kdelibs are installed # KDE4_LOCALE_INSTALL_DIR - the directory where translations from kdelibs are installed # KDE4_MIME_INSTALL_DIR - the directory where mimetype desktop files from kdelibs are installed # KDE4_SOUND_INSTALL_DIR - the directory where sound files from kdelibs are installed @@ -72,7 +71,6 @@ if(NOT KDELIBS4_FOUND) set(KDE4_CONFIG_INSTALL_DIR "@KDE4_CONFIG_INSTALL_DIR@") set(KDE4_DATA_INSTALL_DIR "@KDE4_DATA_INSTALL_DIR@") set(KDE4_ICON_INSTALL_DIR "@KDE4_ICON_INSTALL_DIR@") - set(KDE4_KCFG_INSTALL_DIR "@KDE4_KCFG_INSTALL_DIR@") set(KDE4_LOCALE_INSTALL_DIR "@KDE4_LOCALE_INSTALL_DIR@") set(KDE4_SERVICES_INSTALL_DIR "@KDE4_SERVICES_INSTALL_DIR@") set(KDE4_SERVICETYPES_INSTALL_DIR "@KDE4_SERVICETYPES_INSTALL_DIR@") diff --git a/config-prefix.h.cmake b/config-prefix.h.cmake index e1f3c26b..b2c84303 100644 --- a/config-prefix.h.cmake +++ b/config-prefix.h.cmake @@ -9,7 +9,6 @@ #define BIN_INSTALL_DIR "${KDE4_BIN_INSTALL_DIR}" #define CONFIG_INSTALL_DIR "${KDE4_CONFIG_INSTALL_DIR}" #define ICON_INSTALL_DIR "${KDE4_ICON_INSTALL_DIR}" -#define KCFG_INSTALL_DIR "${KDE4_KCFG_INSTALL_DIR}" #define PLUGIN_INSTALL_DIR "${KDE4_PLUGIN_INSTALL_DIR}" #define SERVICES_INSTALL_DIR "${KDE4_SERVICES_INSTALL_DIR}" #define SERVICETYPES_INSTALL_DIR "${KDE4_SERVICETYPES_INSTALL_DIR}" diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp index 3b51aebc..a9f2939a 100644 --- a/kdecore/kernel/kstandarddirs.cpp +++ b/kdecore/kernel/kstandarddirs.cpp @@ -323,7 +323,6 @@ static const struct ResourcesTblData { { "exe\0", "bin\0" }, { "module\0", "%lib/kde4\0" }, { "qtplugins\0", "%lib/kde4/plugins\0" }, - { "kcfg\0", "share/config.kcfg\0" }, { "xdgdata-apps\0", "applications\0" }, { "xdgdata-icon\0", "icons\0" }, { "xdgdata-pixmap\0", "pixmaps\0" }, diff --git a/kdecore/kernel/kstandarddirs.h b/kdecore/kernel/kstandarddirs.h index 39e904a6..1f445670 100644 --- a/kdecore/kernel/kstandarddirs.h +++ b/kdecore/kernel/kstandarddirs.h @@ -583,7 +583,6 @@ public: * @li @c lib - @c lib[suffix] * @li @c module - @c lib[suffix]/kde4 * @li @c qtplugins - @c lib[suffix]/kde4/plugins - * @li @c kcfg - @c share/config.kcfg * @li @c xdgdata-apps - @c applications * @li @c xdgdata-icon - @c icons * @li @c xdgdata-pixmap - @c pixmaps diff --git a/kdecore/kernel/kstandarddirs_unix.cpp b/kdecore/kernel/kstandarddirs_unix.cpp index 398963da..714f5af9 100644 --- a/kdecore/kernel/kstandarddirs_unix.cpp +++ b/kdecore/kernel/kstandarddirs_unix.cpp @@ -37,8 +37,6 @@ QString KStandardDirs::installPath(const char *type) return QFile::decodeName(CONFIG_INSTALL_DIR "/"); break; case 'k': - if (strcmp("kcfg", type) == 0) - return QFile::decodeName(KCFG_INSTALL_DIR "/"); if (strcmp("kdedir", type) == 0) return QFile::decodeName(KDEDIR "/"); break;