From e5840f23f9cb8acdf0b7fe7e73287236299829c7 Mon Sep 17 00:00:00 2001 From: Chusslove Illich Date: Tue, 10 Jun 2008 09:07:59 +0000 Subject: Revert 818910 and do it properly (patch by dfaure). svn path=/trunk/KDE/kdebase/apps/; revision=818988 --- src/CMakeLists.txt | 2 +- src/dolphinpart.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f03ffc439..bd13c4b91 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -82,7 +82,7 @@ target_link_libraries(dolphinpart dolphinprivate konq) install(TARGETS dolphinpart DESTINATION ${PLUGIN_INSTALL_DIR} ) -install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphinpart ) +install(FILES dolphinpart.rc DESTINATION ${DATA_INSTALL_DIR}/dolphin) install(FILES dolphinpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ########################################## diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index c566a4691..a6a64c283 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -49,9 +49,7 @@ #include K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin();) -// The componentdata name must be dolphinpart so that dolphinpart.rc is found -// Alternatively we would have to install it as dolphin/dolphinpart.rc -K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart")) +K_EXPORT_PLUGIN(DolphinPartFactory("dolphin")) DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantList& args) : KParts::ReadOnlyPart(parent) -- cgit v1.3