Bundle the XMLGUI files into qrc resources.

This is a step towards being able to run applications uninstalled,
and it simplifies deployment on non-linux.

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bc6f75d6280e02ab6f135b7a5963da85456e70f4..13b94f73b4131000e29f2718af217acbf72a6dea 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -180,6 +180,8 @@ set(dolphinpart_SRCS
    dolphindebug.cpp
 )
 
+qt5_add_resources(dolphinpart_SRCS dolphinpart.qrc)
+
 add_library(dolphinpart MODULE ${dolphinpart_SRCS})
 
 target_link_libraries(dolphinpart
@@ -188,7 +190,6 @@ target_link_libraries(dolphinpart
 
 install(TARGETS dolphinpart DESTINATION ${KDE_INSTALL_PLUGINDIR})
 
-install(FILES dolphinpart.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/dolphinpart)
 install(FILES dolphinpart.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
 ##########################################
@@ -267,6 +268,8 @@ if(NOT WIN32)
    set(dolphinstatic_SRCS ${dolphinstatic_SRCS} panels/terminal/terminalpanel.cpp)
 endif()
 
+qt5_add_resources(dolphinstatic_SRCS dolphin.qrc)
+
 add_library(dolphinstatic STATIC ${dolphinstatic_SRCS})
 
 target_include_directories(dolphinstatic PRIVATE ${PHONON_INCLUDES})
@@ -389,7 +392,6 @@ install( FILES settings/dolphin_directoryviewpropertysettings.kcfg
                settings/dolphin_detailsmodesettings.kcfg
                settings/dolphin_versioncontrolsettings.kcfg
          DESTINATION ${KDE_INSTALL_KCFGDIR} )
-install( FILES dolphinui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/dolphin )
 install( FILES org.kde.dolphin.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR} )
 install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION
 ${KDE_INSTALL_KSERVICES5DIR} )

diff --git a/src/dolphin.qrc b/src/dolphin.qrc
new file mode 100644 (file)
index 0000000..55cae54
--- /dev/null
+++ b/src/dolphin.qrc
@@ -0,0 +1,5 @@
+<RCC>
+<qresource prefix="/kxmlgui5/dolphin">
+<file>dolphinui.rc</file>
+</qresource>
+</RCC>

diff --git a/src/dolphinpart.qrc b/src/dolphinpart.qrc
new file mode 100644 (file)
index 0000000..b525da1
--- /dev/null
+++ b/src/dolphinpart.qrc
@@ -0,0 +1,5 @@
+<RCC>
+<qresource prefix="/kxmlgui5/dolphinpart">
+<file>dolphinpart.rc</file>
+</qresource>
+</RCC>