kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert 818910 and do it properly (patch by dfaure).

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=818988
This commit is contained in:
Chusslove Illich 2008-06-10 09:07:59 +00:00
parent b320b7b756
commit 07b14fca3b
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dolphin/src/CMakeLists.txt
View file

@ -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} )
##########################################

4
dolphin/src/dolphinpart.cpp
View file

@ -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)

1
konqueror/src/konqmain.cpp
View file

@ -69,7 +69,6 @@ extern "C" KDE_EXPORT int kdemain( int argc, char **argv )
app.setQuitOnLastWindowClosed(false);
KGlobal::locale()->insertCatalog("libkonq"); // needed for apps using libkonq
KGlobal::locale()->insertCatalog("dolphin"); // needed for some file manager menus
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();