diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -17,6 +17,7 @@
#kde4_add_app_icon(kdevelop_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../pics/hi*-app-kdevelop.png")
endif(APPLE)
+qt5_add_resources(kdevelop_SRCS kdevelop.qrc)
add_executable(kdevelop ${kdevelop_SRCS} )
target_link_libraries(kdevelop
@@ -64,9 +65,6 @@
install( PROGRAMS kdevelop.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
install( PROGRAMS kdevelop_ps.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
-install( FILES kdeveloprc DESTINATION ${KDE_INSTALL_CONFDIR} )
-install( FILES kdevelopui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevelop )
install( FILES kdevelop.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} )
install( FILES kdevelop.xml kdevelopinternal.xml DESTINATION ${KDE_INSTALL_MIMEDIR} )
-install( FILES splash.qml DESTINATION ${KDE_INSTALL_DATADIR}/kdevelop )
update_xdg_mimetypes( ${KDE_INSTALL_MIMEDIR} )
diff --git a/app/kdevelop.qrc b/app/kdevelop.qrc
new file mode 100644
--- /dev/null
+++ b/app/kdevelop.qrc
@@ -0,0 +1,12 @@
+
+
+
+ splash.qml
+
+
+ kdeveloprc
+
+
+ kdevelopui.rc
+
+
diff --git a/app/splash.cpp b/app/splash.cpp
--- a/app/splash.cpp
+++ b/app/splash.cpp
@@ -38,10 +38,9 @@
setFlags(Qt::FramelessWindowHint | Qt::SplashScreen);
setResizeMode(QQuickView::SizeViewToRootObject);
- QString splashScript = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kdevelop/splash.qml");
- setSource(QUrl::fromLocalFile(splashScript));
+ setSource(QUrl(QStringLiteral("qrc:/kdevelop/splash.qml")));
if (!rootObject()) {
- qWarning() << "Could not find KDevelop splash screen: kdevelop/splash.qml" << splashScript;
+ qWarning() << "Could not load KDevelop splash screen";
hide(); // hide instead of showing garbage
return;
}
diff --git a/debuggers/gdb/CMakeLists.txt b/debuggers/gdb/CMakeLists.txt
--- a/debuggers/gdb/CMakeLists.txt
+++ b/debuggers/gdb/CMakeLists.txt
@@ -103,6 +103,7 @@
kde_enable_exceptions()
ki18n_wrap_ui(kdevgdb_SRCS ${kdevgdb_UI})
+qt5_add_resources(kdevgdb_SRCS kdevgdb.qrc)
kdevplatform_add_plugin(kdevgdb JSON kdevgdb.json SOURCES ${kdevgdb_SRCS})
target_link_libraries(kdevgdb
KDev::Sublime
@@ -136,7 +137,3 @@
if (HAVE_PATH_WITH_SPACES_TEST)
set_target_properties(test_gdb PROPERTIES COMPILE_FLAGS "-DHAVE_PATH_WITH_SPACES_TEST")
endif()
-
-########### install files ###############
-
-install( FILES kdevgdbui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevgdb )
diff --git a/debuggers/gdb/kdevgdb.qrc b/debuggers/gdb/kdevgdb.qrc
new file mode 100644
--- /dev/null
+++ b/debuggers/gdb/kdevgdb.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevgdbui.rc
+
+
diff --git a/documentation/qthelp/CMakeLists.txt b/documentation/qthelp/CMakeLists.txt
--- a/documentation/qthelp/CMakeLists.txt
+++ b/documentation/qthelp/CMakeLists.txt
@@ -16,11 +16,10 @@
qthelpconfigeditdialog.ui
)
+qt5_add_resources(kdevqthelp_SRCS kdevqthelp.qrc)
kdevplatform_add_plugin(kdevqthelp JSON kdevqthelp.json SOURCES ${kdevqthelp_SRCS})
target_link_libraries(kdevqthelp
KF5::KCMUtils KF5::I18n KF5::KIOWidgets KF5::TextEditor KF5::IconThemes Qt5::Help Qt5::WebKitWidgets KF5::NewStuff
KDev::Language KDev::Documentation KDev::Interfaces)
-install(FILES kdevelop-qthelp.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
-
add_subdirectory(tests)
diff --git a/documentation/qthelp/kdevqthelp.qrc b/documentation/qthelp/kdevqthelp.qrc
new file mode 100644
--- /dev/null
+++ b/documentation/qthelp/kdevqthelp.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevelop-qthelp.knsrc
+
+
diff --git a/languages/clang/CMakeLists.txt b/languages/clang/CMakeLists.txt
--- a/languages/clang/CMakeLists.txt
+++ b/languages/clang/CMakeLists.txt
@@ -35,6 +35,8 @@
clanghighlighting.cpp
)
+qt5_add_resources(kdevclangsupport_SRCS kdevclangsupport.qrc)
+
kdevplatform_add_plugin(kdevclangsupport JSON kdevclangsupport.json SOURCES ${kdevclangsupport_SRCS})
target_link_libraries(kdevclangsupport
@@ -49,5 +51,3 @@
KDev::Util
KDev::Project
)
-
-install(FILES kdevclangsupport.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevclangsupport)
diff --git a/languages/clang/kdevclangsupport.qrc b/languages/clang/kdevclangsupport.qrc
new file mode 100644
--- /dev/null
+++ b/languages/clang/kdevclangsupport.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevclangsupport.rc
+
+
diff --git a/languages/cpp/CMakeLists.txt b/languages/cpp/CMakeLists.txt
--- a/languages/cpp/CMakeLists.txt
+++ b/languages/cpp/CMakeLists.txt
@@ -45,6 +45,8 @@
add_definitions(-DDEBUG_UI_LOCKUP)
endif(BUILD_uiblocktester)
+qt5_add_resources(kdevcpplanguagesupport_PART_SRCS kdevcppsupport.qrc)
+
kdevplatform_add_plugin(kdevcpplanguagesupport JSON kdevcppsupport.json
SOURCES ${kdevcpplanguagesupport_PART_SRCS})
target_link_libraries(kdevcpplanguagesupport
@@ -60,7 +62,3 @@
KF5::IconThemes
KF5::TextEditor
)
-
-########### install files ###############
-
-install(FILES kdevcppsupport.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevcppsupport)
diff --git a/languages/cpp/kdevcppsupport.qrc b/languages/cpp/kdevcppsupport.qrc
new file mode 100644
--- /dev/null
+++ b/languages/cpp/kdevcppsupport.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevcppsupport.rc
+
+
diff --git a/projectbuilders/makebuilder/CMakeLists.txt b/projectbuilders/makebuilder/CMakeLists.txt
--- a/projectbuilders/makebuilder/CMakeLists.txt
+++ b/projectbuilders/makebuilder/CMakeLists.txt
@@ -12,6 +12,7 @@
kconfig_add_kcfg_files( kdevmakebuilder_SRCS makebuilderconfig.kcfgc )
#add_library(kdevmakebuilder MODULE ${kdevmakebuilder_SRCS})
+qt5_add_resources(kdevmakebuilder_SRCS kdevmakebuilder.qrc)
kdevplatform_add_plugin(kdevmakebuilder JSON kdevmakebuilder.json SOURCES ${kdevmakebuilder_SRCS})
target_link_libraries(kdevmakebuilder
KF5::TextEditor
@@ -29,4 +30,3 @@
install(FILES imakebuilder.h DESTINATION ${INCLUDE_INSTALL_DIR}/kdevelop/make COMPONENT Devel)
#configure_file(kdevmakebuilder.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevmakebuilder.desktop)
#install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevmakebuilder.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-# install( FILES kdevmakebuilder.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevmakebuilder )
diff --git a/projectbuilders/makebuilder/kdevmakebuilder.qrc b/projectbuilders/makebuilder/kdevmakebuilder.qrc
new file mode 100644
--- /dev/null
+++ b/projectbuilders/makebuilder/kdevmakebuilder.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevmakebuilder.rc
+
+
diff --git a/projectmanagers/custommake/CMakeLists.txt b/projectmanagers/custommake/CMakeLists.txt
--- a/projectmanagers/custommake/CMakeLists.txt
+++ b/projectmanagers/custommake/CMakeLists.txt
@@ -12,15 +12,11 @@
custommakemodelitems.cpp
)
+qt5_add_resources(kdevcustommakemanager_PART_SRCS kdevcustommakemanager.qrc)
kdevplatform_add_plugin(kdevcustommakemanager JSON kdevcustommakemanager.json SOURCES ${kdevcustommakemanager_PART_SRCS})
target_link_libraries(kdevcustommakemanager
KF5::KIOWidgets KDev::Interfaces KDev::Project KDev::Util KDev::Language
kdevmakefileresolver
)
-
-########### install files ###############
-
-install( FILES kdevcustommakemanager.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevcustommakemanager )
-
add_subdirectory(makefileresolver)
diff --git a/projectmanagers/custommake/kdevcustommakemanager.qrc b/projectmanagers/custommake/kdevcustommakemanager.qrc
new file mode 100644
--- /dev/null
+++ b/projectmanagers/custommake/kdevcustommakemanager.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevcustommakemanager.rc
+
+
diff --git a/utils/okteta/CMakeLists.txt b/utils/okteta/CMakeLists.txt
--- a/utils/okteta/CMakeLists.txt
+++ b/utils/okteta/CMakeLists.txt
@@ -21,6 +21,7 @@
oktetawidget.cpp
)
+qt5_add_resources(kdevokteta_PART_SRCS kdevokteta.qrc)
add_library(kdevokteta MODULE ${kdevokteta_PART_SRCS} )
TARGET_LINK_LIBRARIES( kdevokteta
@@ -39,4 +40,3 @@
configure_file(kdevokteta.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/kdevokteta.desktop)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kdevokteta.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install(FILES kdevokteta.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdevokteta )
diff --git a/utils/okteta/kdevokteta.qrc b/utils/okteta/kdevokteta.qrc
new file mode 100644
--- /dev/null
+++ b/utils/okteta/kdevokteta.qrc
@@ -0,0 +1,6 @@
+
+
+
+ kdevokteta.rc
+
+