diff --git a/krita/plugins/tools/defaulttools/CMakeLists.txt b/krita/plugins/tools/defaulttools/CMakeLists.txt index 15148841e16b31aedada56ebffba1318e906760d..5b9bd5d91ddb78859e29138cbedc934fdf67293e 100644 --- a/krita/plugins/tools/defaulttools/CMakeLists.txt +++ b/krita/plugins/tools/defaulttools/CMakeLists.txt @@ -23,8 +23,10 @@ set(kritadefaulttools_PART_SRCS ) ki18n_wrap_ui(kritadefaulttools_PART_SRCS wdgcolorpicker.ui wdgmovetool.ui) +qt5_add_resources(kritadefaulttools_PART_SRCS defaulttools.qrc ) add_library(kritadefaulttools MODULE ${kritadefaulttools_PART_SRCS}) + generate_export_header(kritadefaulttools BASE_NAME kritadefaulttools) kcoreaddons_desktop_to_json(kritadefaulttools kritadefaulttools.desktop) @@ -36,16 +38,6 @@ install(TARGETS kritadefaulttools DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES -# cursors - tool_rectangle_cursor.png - tool_ellipse_cursor.png - tool_line_cursor.png - tool_freehand_cursor.png - tool_fill_cursor.png - tool_gradient_cursor.png - DESTINATION ${DATA_INSTALL_DIR}/krita/pics) - install( FILES KisToolPath.action KisToolPencil.action diff --git a/krita/plugins/tools/defaulttools/defaulttools.qrc b/krita/plugins/tools/defaulttools/defaulttools.qrc new file mode 100644 index 0000000000000000000000000000000000000000..753ee7199096f863b26733289f0fcbb8f13800b2 --- /dev/null +++ b/krita/plugins/tools/defaulttools/defaulttools.qrc @@ -0,0 +1,10 @@ + + + + tool_fill_cursor.png + tool_freehand_cursor.png + tool_gradient_cursor.png + tool_line_cursor.png + tool_rectangle_cursor.png + + diff --git a/krita/plugins/tools/selectiontools/CMakeLists.txt b/krita/plugins/tools/selectiontools/CMakeLists.txt index a3daadb84b99af3857ff6b433c1d2597d3395b48..73bdc0ec8ef4427cc6f4cd039afa640d7cc5fc28 100644 --- a/krita/plugins/tools/selectiontools/CMakeLists.txt +++ b/krita/plugins/tools/selectiontools/CMakeLists.txt @@ -11,34 +11,23 @@ set(kritaselectiontools_PART_SRCS kis_tool_select_similar.cc ) +qt5_add_resources(kritaselectiontools_PART_SRCS selectiontools.qrc) + add_library(kritaselectiontools MODULE ${kritaselectiontools_PART_SRCS}) + kcoreaddons_desktop_to_json(kritaselectiontools kritaselectiontools.desktop) target_link_libraries(kritaselectiontools kritaui kritabasicflakes) install(TARGETS kritaselectiontools DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR}) - -########### install files ############### - -install( FILES tool_rectangular_selection_cursor.png - tool_eraser_selection_cursor.png - tool_contiguous_selection_cursor.png - tool_elliptical_selection_cursor.png - tool_outline_selection_cursor.png - tool_polygonal_selection_cursor.png - tool_similar_selection_cursor.png - - DESTINATION ${DATA_INSTALL_DIR}/krita/pics) - - install( FILES - KisToolSelectPolygonal.action - KisToolSelectElliptical.action - KisToolSelectSimilar.action - KisToolSelectContiguous.action - KisToolSelectRectangular.action - KisToolSelectOutline.action - KisToolSelectPath.action - -DESTINATION ${DATA_INSTALL_DIR}/krita/actions) + KisToolSelectPolygonal.action + KisToolSelectElliptical.action + KisToolSelectSimilar.action + KisToolSelectContiguous.action + KisToolSelectRectangular.action + KisToolSelectOutline.action + KisToolSelectPath.action + DESTINATION ${DATA_INSTALL_DIR}/krita/actions +) diff --git a/krita/plugins/tools/selectiontools/selectiontools.qrc b/krita/plugins/tools/selectiontools/selectiontools.qrc new file mode 100644 index 0000000000000000000000000000000000000000..cd3646a38940ac9db30e007f7100dff55388c751 --- /dev/null +++ b/krita/plugins/tools/selectiontools/selectiontools.qrc @@ -0,0 +1,24 @@ + + + + tool_contiguous_selection_cursor_add.png + tool_contiguous_selection_cursor.png + tool_contiguous_selection_cursor_sub.png + tool_elliptical_selection_cursor_add.png + tool_elliptical_selection_cursor.png + tool_elliptical_selection_cursor_sub.png + tool_eraser_selection_cursor.png + tool_outline_selection_cursor_add.png + tool_outline_selection_cursor.png + tool_outline_selection_cursor_sub.png + tool_polygonal_selection_cursor_add.png + tool_polygonal_selection_cursor.png + tool_polygonal_selection_cursor_sub.png + tool_rectangular_selection_cursor_add.png + tool_rectangular_selection_cursor.png + tool_rectangular_selection_cursor_sub.png + tool_similar_selection_cursor_add.png + tool_similar_selection_cursor.png + tool_similar_selection_cursor_sub.png + + diff --git a/krita/plugins/tools/tool_polyline/CMakeLists.txt b/krita/plugins/tools/tool_polyline/CMakeLists.txt index 7ead84c4a491028540dda8333be8028ba0f74df0..c0b62e61c0ed461634f348aaf07743c5fe5cffcb 100644 --- a/krita/plugins/tools/tool_polyline/CMakeLists.txt +++ b/krita/plugins/tools/tool_polyline/CMakeLists.txt @@ -5,19 +5,17 @@ set(kritatoolpolyline_PART_SRCS kis_tool_polyline.cc ) +qt5_add_resources(kritatoolpolyline_PART_SRCS polyline.qrc) add_library(kritatoolpolyline MODULE ${kritatoolpolyline_PART_SRCS}) kcoreaddons_desktop_to_json(kritatoolpolyline kritatoolpolyline.desktop) - target_link_libraries(kritatoolpolyline kritaui) install(TARGETS kritatoolpolyline DESTINATION ${CALLIGRA_PLUGIN_INSTALL_DIR}) ########### install files ############### -install( FILES tool_polyline_cursor.png DESTINATION ${DATA_INSTALL_DIR}/krita/pics) - install( FILES KisToolPolyline.action DESTINATION ${DATA_INSTALL_DIR}/krita/actions) diff --git a/krita/plugins/tools/tool_polyline/polyline.qrc b/krita/plugins/tools/tool_polyline/polyline.qrc new file mode 100644 index 0000000000000000000000000000000000000000..42332489928ed638acdea31a810ceff50cea9f56 --- /dev/null +++ b/krita/plugins/tools/tool_polyline/polyline.qrc @@ -0,0 +1,6 @@ + + + + tool_polyline_cursor.png + +