mirror/konsole
1
0
Fork 0
mirror of https://github.com/KDE/konsole.git synced 2025-12-23 23:38:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't require dbus + bundle ui files in resources

Browse Source 
REVIEW: 128168
This commit is contained in:
Christoph Cullmann
2016-06-18 22:35:40 +02:00
parent c026b0e4b1
commit 377a33ee8b
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
desktop/CMakeLists.txt
View File

@@ -9,5 +9,4 @@ install( FILES konsolepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
install( FILES konsolehere.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus ) install( FILES konsolehere.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus )
install( FILES konsolerun.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus ) install( FILES konsolerun.desktop DESTINATION ${SERVICES_INSTALL_DIR}/ServiceMenus )
install( FILES konsoleui.rc sessionui.rc partui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/konsole )
install( FILES konsole.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} ) install( FILES konsole.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} )

8
desktop/konsole.qrc Normal file
View File

@@ -0,0 +1,8 @@
<!DOCTYPE RCC>
<RCC version="1.0">
<qresource prefix="/kxmlgui5/konsole">
<file>konsoleui.rc</file>
<file>partui.rc</file>
<file>sessionui.rc</file>
</qresource>
</RCC>

3
src/CMakeLists.txt
View File

@@ -141,6 +141,9 @@ ki18n_wrap_ui(konsoleprivate_SRCS ColorSchemeEditor.ui
settings/ProfileSettings.ui settings/ProfileSettings.ui
settings/TabBarSettings.ui) settings/TabBarSettings.ui)
# add the resource files for the ui files
qt5_add_resources( konsoleprivate_SRCS ../desktop/konsole.qrc)
add_library(konsoleprivate ${konsoleprivate_SRCS}) add_library(konsoleprivate ${konsoleprivate_SRCS})
generate_export_header(konsoleprivate BASE_NAME konsoleprivate) generate_export_header(konsoleprivate BASE_NAME konsoleprivate)
target_link_libraries(konsoleprivate PUBLIC ${konsole_LIBS}) target_link_libraries(konsoleprivate PUBLIC ${konsole_LIBS})

2
src/main.cpp
View File

@@ -120,7 +120,7 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* argv[])
atexit(deleteQApplication); atexit(deleteQApplication);
// Ensure that we only launch a new instance if we need to // Ensure that we only launch a new instance if we need to
// If there is already an instance running, we will quit here // If there is already an instance running, we will quit here
KDBusService dbusService(startupOption); KDBusService dbusService(startupOption | KDBusService::NoExitOnFailure);
needToDeleteQApplication = false; needToDeleteQApplication = false;