diff options
| author | Nicolas Fella <[email protected]> | 2021-03-28 17:11:36 +0200 |
|---|---|---|
| committer | Nicolas Fella <[email protected]> | 2021-03-28 17:11:36 +0200 |
| commit | 9e8e58147efe16449c7b3aa54db323dd09df95e7 (patch) | |
| tree | e5b2865c61f3047ca5e9c77829a59eb6384448cb | |
| parent | 6f134975ae0190e2729660289001b8d4051e523c (diff) | |
Port away from KInit
KInit is planned to go away
https://phabricator.kde.org/T14298
| -rw-r--r-- | src/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3f3ecfff2..f70659467 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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}) ########################################## diff --git a/src/main.cpp b/src/main.cpp index ef2905d77..fba45f43c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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) |