Commit 4bc6709e authored by Ahmad Samir's avatar Ahmad Samir
Browse files

Port klipper away from KInit

KInit is being phased out, see KF6 task https://phabricator.kde.org/T12140
parent e6fe8b0e
......@@ -29,11 +29,11 @@ configure_file(config-klipper.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-klipper
ki18n_wrap_ui(libklipper_common_SRCS generalconfig.ui actionsconfig.ui editactiondialog.ui)
kconfig_add_kcfg_files(libklipper_common_SRCS klippersettings.kcfgc)
set(klipper_KDEINIT_SRCS ${libklipper_common_SRCS} main.cpp tray.cpp)
set(klipper_SRCS ${libklipper_common_SRCS} main.cpp tray.cpp)
kf5_add_kdeinit_executable(klipper ${klipper_KDEINIT_SRCS})
add_executable(klipper ${klipper_SRCS})
target_link_libraries(kdeinit_klipper
target_link_libraries(klipper
Qt::Concurrent
KF5::ConfigGui
KF5::CoreAddons
......@@ -51,10 +51,9 @@ target_link_libraries(kdeinit_klipper
systemclipboard
)
if (X11_FOUND)
target_link_libraries(kdeinit_klipper XCB::XCB Qt::X11Extras)
target_link_libraries(klipper XCB::XCB Qt::X11Extras)
endif()
install(TARGETS kdeinit_klipper ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS klipper ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES org.kde.klipper.desktop DESTINATION ${KDE_INSTALL_APPDIR})
......
......@@ -32,7 +32,7 @@
#include "klipper.h"
#include "tray.h"
extern "C" int Q_DECL_EXPORT kdemain(int argc, char *argv[])
int main(int argc, char *argv[])
{
QApplication app(argc, argv);
KLocalizedString::setApplicationDomain("klipper");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment