diff options
| author | Chusslove Illich <[email protected]> | 2008-06-10 09:07:59 +0000 |
|---|---|---|
| committer | Chusslove Illich <[email protected]> | 2008-06-10 09:07:59 +0000 |
| commit | e5840f23f9cb8acdf0b7fe7e73287236299829c7 (patch) | |
| tree | 82e6732bc961a9fd440955fb4fcd0171e2c974d1 | |
| parent | 11bf9d8dbb25ce254135454761bd0f138f06a8a3 (diff) | |
Revert 818910 and do it properly (patch by dfaure).
svn path=/trunk/KDE/kdebase/apps/; revision=818988
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/dolphinpart.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
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 <QClipboard> K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();) -// 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) |