2015-06-13 17:12:57 +03:00
|
|
|
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
|
2015-08-30 19:30:40 +03:00
|
|
|
index 9137eb2..4d46862 100644
|
2015-06-13 17:12:57 +03:00
|
|
|
--- a/kded/CMakeLists.txt
|
|
|
|
+++ b/kded/CMakeLists.txt
|
2015-08-30 19:30:40 +03:00
|
|
|
@@ -60,7 +60,7 @@ install(TARGETS kbuildsycoca4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
2015-06-13 17:12:57 +03:00
|
|
|
|
|
|
|
########### install files ###############
|
|
|
|
|
2015-06-13 16:08:35 +03:00
|
|
|
-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
|
2015-06-13 17:12:57 +03:00
|
|
|
+install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu)
|
2015-06-13 16:08:35 +03:00
|
|
|
install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
|
2015-06-13 17:12:57 +03:00
|
|
|
|
|
|
|
|
|
|
|
diff --git a/kded/kbuildsycoca.cpp b/kded/kbuildsycoca.cpp
|
2015-08-30 19:30:40 +03:00
|
|
|
index dd06704..5ee5f97 100644
|
2015-06-13 17:12:57 +03:00
|
|
|
--- a/kded/kbuildsycoca.cpp
|
|
|
|
+++ b/kded/kbuildsycoca.cpp
|
|
|
|
@@ -311,7 +311,7 @@ bool KBuildSycoca::build()
|
2015-06-13 16:08:35 +03:00
|
|
|
if (!m_trackId.isEmpty())
|
|
|
|
g_vfolder->setTrackId(m_trackId);
|
|
|
|
|
2015-08-30 19:30:40 +03:00
|
|
|
- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu");
|
|
|
|
+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu");
|
2015-06-13 16:08:35 +03:00
|
|
|
|
2015-06-13 17:12:57 +03:00
|
|
|
KServiceGroup::Ptr entry = g_buildServiceGroupFactory->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
|
2015-06-13 16:08:35 +03:00
|
|
|
entry->setLayoutInfo(kdeMenu->layoutList);
|