Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Utilities
Konsole
Commits
4b3dca80
Commit
4b3dca80
authored
Mar 28, 2021
by
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
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
4b3dca80
...
...
@@ -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
)
...
...
src/CMakeLists.txt
View file @
4b3dca80
...
...
@@ -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
...
...
src/main.cpp
View file @
4b3dca80
...
...
@@ -79,7 +79,7 @@ public:
// ***
// Entry point into the Konsole terminal application.
// ***
extern
"C"
int
Q_DECL_EXPORT
kde
main
(
int
argc
,
char
*
argv
[])
int
main
(
int
argc
,
char
*
argv
[])
{
#ifdef PROFILE_STARTUP
QElapsedTimer
timer
;
timer
.
start
();
...
...
David Edmundson
@davidedmundson
mentioned in merge request
!461
·
Aug 17, 2021
mentioned in merge request
!461
mentioned in merge request !461
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment