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

Port away from KInit, which is going to be removed in KF6

For details see: https://phabricator.kde.org/T12140
parent ec170136
......@@ -51,7 +51,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
Bookmarks Completion Config ConfigWidgets
CoreAddons Crash GuiAddons DBusAddons
I18n IconThemes Init KIO NewStuff NewStuffCore Notifications NotifyConfig
I18n IconThemes KIO NewStuff NewStuffCore Notifications NotifyConfig
Parts Pty Service TextWidgets WidgetsAddons
WindowSystem XmlGui DBusAddons GlobalAccel
)
......
......@@ -245,7 +245,7 @@ set_target_properties(konsoleprivate PROPERTIES
install(TARGETS konsoleprivate ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
set(konsole_KDEINIT_SRCS
set(konsole_SRCS
Application.cpp
MainWindow.cpp
main.cpp
......@@ -261,10 +261,10 @@ set(konsole_KDEINIT_SRCS
# Sets the icon on Windows and OSX
ecm_add_app_icon(kdeinit_konsole ICONS ${ICONS_SRCS})
ecm_add_app_icon(konsole ICONS ${ICONS_SRCS})
kf5_add_kdeinit_executable(konsole ${konsole_KDEINIT_SRCS})
target_link_libraries(kdeinit_konsole
add_executable(konsole ${konsole_SRCS})
target_link_libraries(konsole
konsoleprivate
KF5::XmlGui
KF5::WindowSystem
......@@ -287,8 +287,7 @@ if(APPLE)
MACOSX_BUNDLE_COPYRIGHT "1997-2020 The Konsole Developers")
endif()
install(TARGETS kdeinit_konsole konsole
${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(TARGETS konsole ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
### Embedded Konsole KPart
......
......@@ -79,7 +79,7 @@ public:
// ***
// Entry point into the Konsole terminal application.
// ***
extern "C" int Q_DECL_EXPORT kdemain(int argc, char *argv[])
int main(int argc, char *argv[])
{
#ifdef PROFILE_STARTUP
QElapsedTimer timer; timer.start();
......
Markdown is supported
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