Merge branch 'master' of git://anongit.kde.org/krita

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

krita/plugins/tools/defaulttools/defaulttools.qrc

+<!DOCTYPE RCC>
+<RCC version="1.0">
+    <qresource>
+        <file>tool_fill_cursor.png</file>
+        <file>tool_freehand_cursor.png</file>
+        <file>tool_gradient_cursor.png</file>
+        <file>tool_line_cursor.png</file>
+        <file>tool_rectangle_cursor.png</file>
+    </qresource>
+</RCC>

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
+)

krita/plugins/tools/selectiontools/selectiontools.qrc

+<!DOCTYPE RCC>
+<RCC version="1.0">
+    <qresource>
+        <file>tool_contiguous_selection_cursor_add.png</file>
+        <file>tool_contiguous_selection_cursor.png</file>
+        <file>tool_contiguous_selection_cursor_sub.png</file>
+        <file>tool_elliptical_selection_cursor_add.png</file>
+        <file>tool_elliptical_selection_cursor.png</file>
+        <file>tool_elliptical_selection_cursor_sub.png</file>
+        <file>tool_eraser_selection_cursor.png</file>
+        <file>tool_outline_selection_cursor_add.png</file>
+        <file>tool_outline_selection_cursor.png</file>
+        <file>tool_outline_selection_cursor_sub.png</file>
+        <file>tool_polygonal_selection_cursor_add.png</file>
+        <file>tool_polygonal_selection_cursor.png</file>
+        <file>tool_polygonal_selection_cursor_sub.png</file>
+        <file>tool_rectangular_selection_cursor_add.png</file>
+        <file>tool_rectangular_selection_cursor.png</file>
+        <file>tool_rectangular_selection_cursor_sub.png</file>
+        <file>tool_similar_selection_cursor_add.png</file>
+        <file>tool_similar_selection_cursor.png</file>
+        <file>tool_similar_selection_cursor_sub.png</file>
+    </qresource>
+</RCC>

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)

krita/plugins/tools/tool_polyline/polyline.qrc

+<!DOCTYPE RCC>
+<RCC version="1.0">
+    <qresource>
+        <file>tool_polyline_cursor.png</file>
+    </qresource>
+</RCC>