diff --git a/plugins/appwizard/CMakeLists.txt b/plugins/appwizard/CMakeLists.txt --- a/plugins/appwizard/CMakeLists.txt +++ b/plugins/appwizard/CMakeLists.txt @@ -18,6 +18,7 @@ ki18n_wrap_ui(kdevappwizard_PART_SRCS ${kdevappwizard_PART_UI}) +qt5_add_resources(kdevappwizard_PART_SRCS kdevappwizard.qrc) kdevplatform_add_plugin(kdevappwizard JSON kdevappwizard.json SOURCES ${kdevappwizard_PART_SRCS}) target_link_libraries(kdevappwizard @@ -29,7 +30,3 @@ install(TARGETS kdevappwizard DESTINATION ${KDE_INSTALL_PLUGINDIR}/kdevplatform/${KDEV_PLUGIN_VERSION} ) -########### install files ############### - -install( FILES kdevappwizard.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevappwizard ) -install( FILES kdevappwizard.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} ) diff --git a/plugins/appwizard/kdevappwizard.qrc b/plugins/appwizard/kdevappwizard.qrc new file mode 100644 --- /dev/null +++ b/plugins/appwizard/kdevappwizard.qrc @@ -0,0 +1,9 @@ + + + + kdevappwizard.rc + + + kdevappwizard.knsrc + + diff --git a/plugins/classbrowser/CMakeLists.txt b/plugins/classbrowser/CMakeLists.txt --- a/plugins/classbrowser/CMakeLists.txt +++ b/plugins/classbrowser/CMakeLists.txt @@ -18,10 +18,7 @@ classtree.cpp ) +qt5_add_resources(kdevclassbrowser_PART_SRCS kdevclassbrowser.qrc) kdevplatform_add_plugin(kdevclassbrowser JSON kdevclassbrowser.json SOURCES ${kdevclassbrowser_PART_SRCS}) target_link_libraries(kdevclassbrowser KF5::TextEditor KDev::Util KDev::Language KDev::Interfaces KDev::Project) - -########### install files ############### - -install(FILES kdevclassbrowser.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevclassbrowser) diff --git a/plugins/classbrowser/kdevclassbrowser.qrc b/plugins/classbrowser/kdevclassbrowser.qrc new file mode 100644 --- /dev/null +++ b/plugins/classbrowser/kdevclassbrowser.qrc @@ -0,0 +1,6 @@ + + + + kdevclassbrowser.rc + + diff --git a/plugins/codeutils/CMakeLists.txt b/plugins/codeutils/CMakeLists.txt --- a/plugins/codeutils/CMakeLists.txt +++ b/plugins/codeutils/CMakeLists.txt @@ -9,6 +9,7 @@ include_directories(CMAKE_CURRENT_BINARY_DIR) +qt5_add_resources(kdevcodeutils_PART_SRCS kdevcodeutils.qrc) kdevplatform_add_plugin(kdevcodeutils JSON kdevcodeutils.json SOURCES ${kdevcodeutils_PART_SRCS}) target_link_libraries(kdevcodeutils @@ -21,7 +22,3 @@ ) add_subdirectory(doc_templates) - -########### install files ############### - -install( FILES kdevcodeutils.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevcodeutils ) diff --git a/plugins/codeutils/kdevcodeutils.qrc b/plugins/codeutils/kdevcodeutils.qrc new file mode 100644 --- /dev/null +++ b/plugins/codeutils/kdevcodeutils.qrc @@ -0,0 +1,6 @@ + + + + kdevcodeutils.rc + + diff --git a/plugins/contextbrowser/CMakeLists.txt b/plugins/contextbrowser/CMakeLists.txt --- a/plugins/contextbrowser/CMakeLists.txt +++ b/plugins/contextbrowser/CMakeLists.txt @@ -8,8 +8,7 @@ browsemanager.cpp ) +qt5_add_resources(kdevcontextbrowser_PART_SRCS kdevcontextbrowser.qrc) kdevplatform_add_plugin(kdevcontextbrowser JSON kdevcontextbrowser.json SOURCES ${kdevcontextbrowser_PART_SRCS}) target_link_libraries(kdevcontextbrowser KDev::Interfaces KDev::Util KDev::Language KDev::Sublime KF5::TextEditor KF5::Parts) - -install(FILES kdevcontextbrowser.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevcontextbrowser) diff --git a/plugins/contextbrowser/kdevcontextbrowser.qrc b/plugins/contextbrowser/kdevcontextbrowser.qrc new file mode 100644 --- /dev/null +++ b/plugins/contextbrowser/kdevcontextbrowser.qrc @@ -0,0 +1,6 @@ + + + + kdevcontextbrowser.rc + + diff --git a/plugins/cvs/CMakeLists.txt b/plugins/cvs/CMakeLists.txt --- a/plugins/cvs/CMakeLists.txt +++ b/plugins/cvs/CMakeLists.txt @@ -32,6 +32,7 @@ ki18n_wrap_ui(kdevcvs_PART_SRCS ${kdevcvs_PART_UI}) +qt5_add_resources(kdevcvs_PART_SRCS kdevcvs.qrc) kdevplatform_add_plugin(kdevcvs JSON kdevcvs.json SOURCES ${kdevcvs_PART_SRCS}) target_link_libraries(kdevcvs @@ -42,8 +43,4 @@ KDev::Vcs KDev::Project KDev::Language -) - -########### install files ############### - -install( FILES kdevcvs.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevcvs ) +) \ No newline at end of file diff --git a/plugins/cvs/kdevcvs.qrc b/plugins/cvs/kdevcvs.qrc new file mode 100644 --- /dev/null +++ b/plugins/cvs/kdevcvs.qrc @@ -0,0 +1,6 @@ + + + + kdevcvs.rc + + diff --git a/plugins/documentswitcher/CMakeLists.txt b/plugins/documentswitcher/CMakeLists.txt --- a/plugins/documentswitcher/CMakeLists.txt +++ b/plugins/documentswitcher/CMakeLists.txt @@ -8,12 +8,7 @@ documentswitchertreeview.cpp ) +qt5_add_resources(kdevdocumentswitcher_PART_SRCS kdevdocumentswitcher.qrc) kdevplatform_add_plugin(kdevdocumentswitcher JSON kdevdocumentswitcher.json SOURCES ${kdevdocumentswitcher_PART_SRCS}) target_link_libraries(kdevdocumentswitcher KDev::Interfaces KDev::Sublime KDev::Interfaces ) - -########### install files ############### - -install( FILES kdevdocumentswitcher.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevdocumentswitcher ) - - diff --git a/plugins/documentswitcher/kdevdocumentswitcher.qrc b/plugins/documentswitcher/kdevdocumentswitcher.qrc new file mode 100644 --- /dev/null +++ b/plugins/documentswitcher/kdevdocumentswitcher.qrc @@ -0,0 +1,6 @@ + + + + kdevdocumentswitcher.rc + + diff --git a/plugins/documentview/CMakeLists.txt b/plugins/documentview/CMakeLists.txt --- a/plugins/documentview/CMakeLists.txt +++ b/plugins/documentview/CMakeLists.txt @@ -12,14 +12,10 @@ kdevdocumentselection.cpp ) +qt5_add_resources(kdevdocumentview_PART_SRCS kdevdocumentview.qrc) kdevplatform_add_plugin(kdevdocumentview JSON kdevdocumentview.json SOURCES ${kdevdocumentview_PART_SRCS}) target_link_libraries(kdevdocumentview KDev::Interfaces KF5::TextEditor ) - -########### install files ############### - -install( FILES kdevdocumentview.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevdocumentview ) - diff --git a/plugins/documentview/kdevdocumentview.qrc b/plugins/documentview/kdevdocumentview.qrc new file mode 100644 --- /dev/null +++ b/plugins/documentview/kdevdocumentview.qrc @@ -0,0 +1,6 @@ + + + + kdevdocumentview.rc + + diff --git a/plugins/externalscript/CMakeLists.txt b/plugins/externalscript/CMakeLists.txt --- a/plugins/externalscript/CMakeLists.txt +++ b/plugins/externalscript/CMakeLists.txt @@ -17,14 +17,11 @@ ki18n_wrap_ui(kdevexternalscript_PART_SRCS ${kdevexternalscript_PART_UI}) +qt5_add_resources(kdevexternalscript_PART_SRCS kdevexternalscript.qrc) kdevplatform_add_plugin(kdevexternalscript JSON kdevexternalscript.json SOURCES ${kdevexternalscript_PART_SRCS}) target_link_libraries(kdevexternalscript KF5::TextEditor KF5::KIOWidgets KF5::Parts KF5::NewStuff KDev::Language KDev::Interfaces KDev::Project KDev::Util KDev::OutputView ) - -########### install files ############### - -install( FILES kdevexternalscript.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevexternalscript ) diff --git a/plugins/externalscript/kdevexternalscript.qrc b/plugins/externalscript/kdevexternalscript.qrc new file mode 100644 --- /dev/null +++ b/plugins/externalscript/kdevexternalscript.qrc @@ -0,0 +1,6 @@ + + + + kdevexternalscript.rc + + diff --git a/plugins/filemanager/CMakeLists.txt b/plugins/filemanager/CMakeLists.txt --- a/plugins/filemanager/CMakeLists.txt +++ b/plugins/filemanager/CMakeLists.txt @@ -5,7 +5,6 @@ filemanager.cpp bookmarkhandler.cpp ) +qt5_add_resources(kdevfilemanager_PART_SRCS kdevfilemanager.qrc) kdevplatform_add_plugin(kdevfilemanager JSON kdevfilemanager.json SOURCES ${kdevfilemanager_PART_SRCS}) target_link_libraries(kdevfilemanager KF5::Bookmarks KF5::KIOCore KF5::KIOFileWidgets KF5::KIOWidgets KF5::TextEditor KDev::Interfaces) - -install( FILES kdevfilemanager.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevfilemanager ) diff --git a/plugins/filemanager/kdevfilemanager.qrc b/plugins/filemanager/kdevfilemanager.qrc new file mode 100644 --- /dev/null +++ b/plugins/filemanager/kdevfilemanager.qrc @@ -0,0 +1,6 @@ + + + + kdevfilemanager.rc + + diff --git a/plugins/filetemplates/CMakeLists.txt b/plugins/filetemplates/CMakeLists.txt --- a/plugins/filetemplates/CMakeLists.txt +++ b/plugins/filetemplates/CMakeLists.txt @@ -27,6 +27,7 @@ ui/testcases.ui ) +qt5_add_resources(kdevfiletemplates_PART_SRCS kdevfiletemplates.qrc) kdevplatform_add_plugin(kdevfiletemplates JSON kdevfiletemplates.json SOURCES ${kdevfiletemplates_PART_SRCS}) target_link_libraries(kdevfiletemplates @@ -41,9 +42,6 @@ ########### install files ############### -install( FILES kdevfiletemplates.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevfiletemplates ) -install( FILES kdevfiletemplates.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} ) - install(FILES licenses/GPL\ v2 licenses/GPL\ v3 diff --git a/plugins/filetemplates/kdevfiletemplates.qrc b/plugins/filetemplates/kdevfiletemplates.qrc new file mode 100644 --- /dev/null +++ b/plugins/filetemplates/kdevfiletemplates.qrc @@ -0,0 +1,9 @@ + + + + kdevfiletemplates.rc + + + kdevfiletemplates.knsrc + + diff --git a/plugins/grepview/CMakeLists.txt b/plugins/grepview/CMakeLists.txt --- a/plugins/grepview/CMakeLists.txt +++ b/plugins/grepview/CMakeLists.txt @@ -22,6 +22,7 @@ ki18n_wrap_ui(kdevgrepview_PART_SRCS ${kdevgrepview_PART_UI}) +qt5_add_resources(kdevgrepview_PART_SRCS kdevgrepview.qrc) kdevplatform_add_plugin(kdevgrepview JSON kdevgrepview.json SOURCES ${kdevgrepview_PART_SRCS}) target_link_libraries(kdevgrepview @@ -38,6 +39,4 @@ ########### install files ############### -install( FILES kdevgrepview.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevgrepview ) - add_subdirectory(tests) diff --git a/plugins/grepview/kdevgrepview.qrc b/plugins/grepview/kdevgrepview.qrc new file mode 100644 --- /dev/null +++ b/plugins/grepview/kdevgrepview.qrc @@ -0,0 +1,6 @@ + + + + kdevgrepview.rc + + diff --git a/plugins/patchreview/CMakeLists.txt b/plugins/patchreview/CMakeLists.txt --- a/plugins/patchreview/CMakeLists.txt +++ b/plugins/patchreview/CMakeLists.txt @@ -20,12 +20,10 @@ ki18n_wrap_ui(patchreview_PART_SRCS patchreview.ui localpatchwidget.ui) +qt5_add_resources(patchreview_PART_SRCS kdevpatchreview.qrc) kdevplatform_add_plugin(kdevpatchreview JSON kdevpatchreview.json SOURCES ${patchreview_PART_SRCS}) target_link_libraries(kdevpatchreview KF5::IconThemes KF5::TextEditor KF5::Parts KDev::Interfaces KDev::Util KDev::Language KDev::Vcs KDev::Sublime ${LIBKOMPAREDIFF2_LIBRARIES}) if (KDEExperimentalPurpose_FOUND) target_compile_definitions(kdevpatchreview PRIVATE WITH_PURPOSE) target_link_libraries(kdevpatchreview KDEExperimental::PurposeWidgets) endif() -########### install files ############### - -install(FILES kdevpatchreview.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevpatchreview) diff --git a/plugins/patchreview/kdevpatchreview.qrc b/plugins/patchreview/kdevpatchreview.qrc new file mode 100644 --- /dev/null +++ b/plugins/patchreview/kdevpatchreview.qrc @@ -0,0 +1,6 @@ + + + + kdevpatchreview.rc + + diff --git a/plugins/problemreporter/CMakeLists.txt b/plugins/problemreporter/CMakeLists.txt --- a/plugins/problemreporter/CMakeLists.txt +++ b/plugins/problemreporter/CMakeLists.txt @@ -11,11 +11,8 @@ problemreportermodel.cpp ) +qt5_add_resources(kdevproblemreporter_PART_SRCS kdevproblemreporter.qrc) kdevplatform_add_plugin(kdevproblemreporter JSON kdevproblemreporter.json SOURCES ${kdevproblemreporter_PART_SRCS}) target_link_libraries(kdevproblemreporter KF5::TextEditor KF5::Parts KDev::Language KDev::Interfaces KDev::Util KDev::Project KDev::Shell) -########### install files ############### - -install(FILES kdevproblemreporter.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevproblemreporter) - add_subdirectory(tests) diff --git a/plugins/problemreporter/kdevproblemreporter.qrc b/plugins/problemreporter/kdevproblemreporter.qrc new file mode 100644 --- /dev/null +++ b/plugins/problemreporter/kdevproblemreporter.qrc @@ -0,0 +1,6 @@ + + + + kdevproblemreporter.rc + + diff --git a/plugins/projectmanagerview/CMakeLists.txt b/plugins/projectmanagerview/CMakeLists.txt --- a/plugins/projectmanagerview/CMakeLists.txt +++ b/plugins/projectmanagerview/CMakeLists.txt @@ -13,15 +13,13 @@ ki18n_wrap_ui( kdevprojectmanagerview_PLUGIN_SRCS projectbuildsetwidget.ui projectmanagerview.ui ) +qt5_add_resources(kdevprojectmanagerview_PLUGIN_SRCS kdevprojectmanagerview.qrc) kdevplatform_add_plugin(kdevprojectmanagerview JSON kdevprojectmanagerview.json SOURCES ${kdevprojectmanagerview_PLUGIN_SRCS}) target_link_libraries(kdevprojectmanagerview KF5::TextEditor KF5::ThreadWeaver KDev::Interfaces KDev::Project KDev::Language KDev::Util KDev::Vcs KDev::Sublime ) -########### install files ############### - -install( FILES kdevprojectmanagerview.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevprojectmanagerview ) diff --git a/plugins/projectmanagerview/kdevprojectmanagerview.qrc b/plugins/projectmanagerview/kdevprojectmanagerview.qrc new file mode 100644 --- /dev/null +++ b/plugins/projectmanagerview/kdevprojectmanagerview.qrc @@ -0,0 +1,6 @@ + + + + kdevprojectmanagerview.rc + + diff --git a/plugins/quickopen/CMakeLists.txt b/plugins/quickopen/CMakeLists.txt --- a/plugins/quickopen/CMakeLists.txt +++ b/plugins/quickopen/CMakeLists.txt @@ -24,9 +24,7 @@ ki18n_wrap_ui(kdevquickopen_PART_SRCS ${kdevquickopen_UI}) +qt5_add_resources(kdevquickopen_PART_SRCS kdevquickopen.qrc) kdevplatform_add_plugin(kdevquickopen JSON kdevquickopen.json SOURCES ${kdevquickopen_PART_SRCS}) target_link_libraries(kdevquickopen KF5::IconThemes KF5::GuiAddons KF5::TextEditor KDev::Language KDev::Interfaces KDev::Project KDev::Util) -########### install files ############### - -install(FILES kdevquickopen.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevquickopen) diff --git a/plugins/quickopen/kdevquickopen.qrc b/plugins/quickopen/kdevquickopen.qrc new file mode 100644 --- /dev/null +++ b/plugins/quickopen/kdevquickopen.qrc @@ -0,0 +1,6 @@ + + + + kdevquickopen.rc + + diff --git a/plugins/standardoutputview/CMakeLists.txt b/plugins/standardoutputview/CMakeLists.txt --- a/plugins/standardoutputview/CMakeLists.txt +++ b/plugins/standardoutputview/CMakeLists.txt @@ -10,6 +10,7 @@ standardoutputviewmetadata.cpp ) +qt5_add_resources(standardoutputview_LIB_SRCS kdevstandardoutputview.qrc) kdevplatform_add_plugin(kdevstandardoutputview JSON kdevstandardoutputview.json SOURCES ${standardoutputview_LIB_SRCS}) target_link_libraries(kdevstandardoutputview @@ -19,5 +20,3 @@ KDev::OutputView ) -install( FILES kdevstandardoutputview.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevstandardoutputview ) - diff --git a/plugins/standardoutputview/kdevstandardoutputview.qrc b/plugins/standardoutputview/kdevstandardoutputview.qrc new file mode 100644 --- /dev/null +++ b/plugins/standardoutputview/kdevstandardoutputview.qrc @@ -0,0 +1,6 @@ + + + + kdevstandardoutputview.rc + + diff --git a/plugins/switchtobuddy/CMakeLists.txt b/plugins/switchtobuddy/CMakeLists.txt --- a/plugins/switchtobuddy/CMakeLists.txt +++ b/plugins/switchtobuddy/CMakeLists.txt @@ -7,11 +7,10 @@ switchtobuddyplugin.cpp ) +qt5_add_resources(kdevswitchtobuddy_PART_SRCS kdevswitchtobuddy.qrc) kdevplatform_add_plugin(kdevswitchtobuddy JSON kdevswitchtobuddy.json SOURCES ${kdevswitchtobuddy_PART_SRCS}) target_link_libraries(kdevswitchtobuddy KDev::Interfaces KDev::Language ) - -install( FILES kdevswitchtobuddy.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevswitchtobuddy) diff --git a/plugins/switchtobuddy/kdevswitchtobuddy.qrc b/plugins/switchtobuddy/kdevswitchtobuddy.qrc new file mode 100644 --- /dev/null +++ b/plugins/switchtobuddy/kdevswitchtobuddy.qrc @@ -0,0 +1,6 @@ + + + + kdevswitchtobuddy.rc + + diff --git a/plugins/testview/CMakeLists.txt b/plugins/testview/CMakeLists.txt --- a/plugins/testview/CMakeLists.txt +++ b/plugins/testview/CMakeLists.txt @@ -7,9 +7,6 @@ testviewdebug.cpp ) +qt5_add_resources(kdevtestview_PLUGIN_SRCS kdevtestview.qrc) kdevplatform_add_plugin(kdevtestview JSON kdevtestview.json SOURCES ${kdevtestview_PLUGIN_SRCS}) target_link_libraries(kdevtestview KF5::ItemModels KDev::Interfaces KDev::Project KDev::Util KDev::Language) - -########### install files ############### - -install( FILES kdevtestview.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevtestview ) diff --git a/plugins/testview/kdevtestview.qrc b/plugins/testview/kdevtestview.qrc new file mode 100644 --- /dev/null +++ b/plugins/testview/kdevtestview.qrc @@ -0,0 +1,6 @@ + + + + kdevtestview.rc + + diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt --- a/shell/CMakeLists.txt +++ b/shell/CMakeLists.txt @@ -105,6 +105,7 @@ settings/templatepage.ui ) +qt5_add_resources(KDevPlatformShell_LIB_SRCS kdevplatformshell.qrc) kdevplatform_add_library(KDevPlatformShell SOURCES ${KDevPlatformShell_LIB_SRCS}) target_link_libraries(KDevPlatformShell LINK_PUBLIC @@ -166,9 +167,4 @@ problemconstants.h filteredproblemstore.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/shell COMPONENT Devel -) - -install( FILES debugger/kdevdebuggershellui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevdebugger ) -install( FILES kdevsessionui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevsession ) -install( FILES kdevsourceformatter.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kdevsourceformatter ) - +) \ No newline at end of file diff --git a/shell/kdevplatformshell.qrc b/shell/kdevplatformshell.qrc new file mode 100644 --- /dev/null +++ b/shell/kdevplatformshell.qrc @@ -0,0 +1,12 @@ + + + + kdevsessionui.rc + + + kdevsourceformatter.rc + + + debugger/kdevdebuggershellui.rc + +