1
0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00

Port away from KInit

KInit is planned to go away

https://phabricator.kde.org/T14298
This commit is contained in:
Nicolas Fella 2021-03-28 17:11:36 +02:00
parent 6f134975ae
commit 9e8e58147e
2 changed files with 5 additions and 7 deletions

View File

@ -333,12 +333,11 @@ set(dolphin_SRCS
file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*system-file-manager.png")
ecm_add_app_icon(dolphin_SRCS ICONS ${ICONS_SRCS})
kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
add_executable(dolphin ${dolphin_SRCS})
target_link_libraries(kdeinit_dolphin PUBLIC
dolphinprivate
target_link_libraries(dolphin
PRIVATE
dolphinprivate
dolphinstatic
KF5::Crash
)
@ -346,13 +345,12 @@ target_link_libraries(kdeinit_dolphin PUBLIC
include(DbusInterfaceMacros)
generate_and_install_dbus_interface(
kdeinit_dolphin
dolphin
dbusinterface.h
org.freedesktop.FileManager1.xml
OPTIONS -a
)
install(TARGETS kdeinit_dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
##########################################

View File

@ -37,7 +37,7 @@
#endif
#include <iostream>
extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
int main(int argc, char **argv)
{
#ifndef Q_OS_WIN
// Prohibit using sudo or kdesu (but allow using the root user directly)