Don't require dbus + bundle ui files in resources

REVIEW: 128168

desktop/CMakeLists.txt

@@ -9,5 +9,4 @@ install( FILES konsolepart.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 install( FILES konsolehere.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} )

desktop/konsole.qrc

@@ -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>

src/CMakeLists.txt

@@ -141,6 +141,9 @@ ki18n_wrap_ui(konsoleprivate_SRCS ColorSchemeEditor.ui
                                 settings/ProfileSettings.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})
 generate_export_header(konsoleprivate BASE_NAME konsoleprivate)
 target_link_libraries(konsoleprivate PUBLIC ${konsole_LIBS})

src/main.cpp

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