diff --git a/karchivemanager/CMakeLists.txt b/karchivemanager/CMakeLists.txt index 9c77b7d8..574553b5 100644 --- a/karchivemanager/CMakeLists.txt +++ b/karchivemanager/CMakeLists.txt @@ -3,8 +3,8 @@ project(karchivemanager) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) include(FeatureSummary) - find_package(KDE4 4.19.0 REQUIRED) - include(KDE4Defaults) + find_package(KDELibs4 4.23.0 REQUIRED) + include_directories(${KDE4_INCLUDES}) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) endif() @@ -29,8 +29,8 @@ set(karchivemanager_sources add_executable(karchivemanager ${karchivemanager_sources}) target_link_libraries(karchivemanager - ${KDE4_KDEUI_LIBS} - ${KDE4_KFILE_LIBS} + KDE4::kdeui + KDE4::kfile ${LibArchive_LIBRARIES} ) diff --git a/karchivemanager/karchiveapp.ui b/karchivemanager/karchiveapp.ui index 19c01a41..7ced4104 100644 --- a/karchivemanager/karchiveapp.ui +++ b/karchivemanager/karchiveapp.ui @@ -122,6 +122,5 @@ - diff --git a/karchivemanager/main.cpp b/karchivemanager/main.cpp index 201fdb48..ec82b5fe 100644 --- a/karchivemanager/main.cpp +++ b/karchivemanager/main.cpp @@ -27,13 +27,12 @@ int main(int argc, char** argv) { QApplication::setAttribute(Qt::AA_X11InitThreads, true); - KAboutData aboutData("karchivemanager", 0, ki18n("Archive Manager"), - "1.0.0", ki18n("Simple archive manager for KDE."), - KAboutData::License_GPL_V2, - ki18n("(c) 2018 Ivailo Monev"), - KLocalizedString(), - "http://github.com/fluxer/katana" - ); + KAboutData aboutData( + "karchivemanager", 0, ki18n("Archive Manager"), + "1.0.0", ki18n("Simple archive manager for KDE."), + KAboutData::License_GPL_V2, + ki18n("(c) 2018 Ivailo Monev") + ); aboutData.addAuthor(ki18n("Ivailo Monev"), ki18n("Maintainer"), diff --git a/kman/main.cpp b/kman/main.cpp index 54b77a60..b50df050 100644 --- a/kman/main.cpp +++ b/kman/main.cpp @@ -24,13 +24,12 @@ int main(int argc, char** argv) { - KAboutData aboutData("kman", 0, ki18n("KMan"), - "1.0.0", ki18n("Simple manual page reader for KDE."), - KAboutData::License_GPL_V2, - ki18n("(c) 2018 Ivailo Monev"), - KLocalizedString(), - "http://github.com/fluxer/katana" - ); + KAboutData aboutData( + "kman", 0, ki18n("KMan"), + "1.0.0", ki18n("Simple manual page reader for KDE."), + KAboutData::License_GPL_V2, + ki18n("(c) 2018 Ivailo Monev") + ); aboutData.addAuthor(ki18n("Ivailo Monev"), ki18n("Maintainer"), diff --git a/kupdatenotifier/CMakeLists.txt b/kupdatenotifier/CMakeLists.txt index f645f196..297c9f48 100644 --- a/kupdatenotifier/CMakeLists.txt +++ b/kupdatenotifier/CMakeLists.txt @@ -1,8 +1,10 @@ project(kupdatenotifier) if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) - find_package(KDE4 4.21.0 REQUIRED) - include(KDE4Defaults) + include(FeatureSummary) + + find_package(KDELibs4 4.23.0 REQUIRED) + include_directories(${KDE4_INCLUDES}) add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) endif() @@ -16,9 +18,12 @@ set(kupdatenotifier_SRCS add_executable(kupdatenotifier ${kupdatenotifier_SRCS}) -target_link_libraries(kupdatenotifier ${KDE4_KDEUI_LIBS}) +target_link_libraries(kupdatenotifier KDE4::kdeui) -install(TARGETS kupdatenotifier ${INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS kupdatenotifier + DESTINATION ${KDE4_BIN_INSTALL_DIR} +) ########### next target ############### diff --git a/kupdatenotifier/main.cpp b/kupdatenotifier/main.cpp index f341e67f..a97a6ed6 100644 --- a/kupdatenotifier/main.cpp +++ b/kupdatenotifier/main.cpp @@ -31,9 +31,7 @@ int main(int argc, char** argv) "kupdatenotifier", 0, ki18n("KUpdateNotifier"), "1.0.0", ki18n("A panel applet for software updates notification."), KAboutData::License_GPL_V2, - ki18n("(c) 2022 Ivailo Monev"), - KLocalizedString(), - "http://github.com/fluxer/katana" + ki18n("(c) 2022 Ivailo Monev") ); aboutData.addAuthor( @@ -44,7 +42,6 @@ int main(int argc, char** argv) aboutData.setProgramIconName(QLatin1String("system-software-update")); KCmdLineArgs::init(argc, argv, &aboutData); - KUniqueApplication::addCmdLineOptions(); KUniqueApplication kupdatenotifierapp; kupdatenotifierapp.setQuitOnLastWindowClosed(false);