Update test masks for Qt5, enable labeling tests

qgis · May 15, 2016 · 57d114e · 57d114e · m-kuhn · May 15, 2016
1 parent e5e78af
commit 57d114e
Show file tree

Hide file tree

Showing 66 changed files with 0 additions and 3 deletions.
diff --git a/ci/travis/linux/qt5/blacklist.txt b/ci/travis/linux/qt5/blacklist.txt
@@ -6,9 +6,6 @@ PyQgsGeometryTest
 PyQgsJSONUtils
 PyQgsLocalServer
 PyQgsMapUnitScale
-PyQgsPalLabelingCanvas
-PyQgsPalLabelingComposer
-PyQgsPalLabelingPlacement
 PyQgsPalLabelingServer
 PyQgsRelationEditWidget
 PyQgsServer

diff --git a/...ntrol_images/expected_pal_canvas/sp_background_rect/sp_background_rect_mask.png b/...ntrol_images/expected_pal_canvas/sp_background_rect/sp_background_rect_mask.png
diff --git a/...control_images/expected_pal_canvas/sp_background_svg/sp_background_svg_mask.png b/...control_images/expected_pal_canvas/sp_background_svg/sp_background_svg_mask.png
diff --git a/...ected_pal_canvas/sp_background_svg_w_offset/sp_background_svg_w_offset_mask.png b/...ected_pal_canvas/sp_background_svg_w_offset/sp_background_svg_w_offset_mask.png
diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_buffer/sp_buffer_mask.png b/tests/testdata/control_images/expected_pal_canvas/sp_buffer/sp_buffer_mask.png
diff --git a/...a/control_images/expected_pal_canvas/sp_default_label/sp_default_label_mask.png b/...a/control_images/expected_pal_canvas/sp_default_label/sp_default_label_mask.png
diff --git a/...ted_pal_canvas/sp_partials_labels_disabled/sp_partials_labels_disabled_mask.png b/...ted_pal_canvas/sp_partials_labels_disabled/sp_partials_labels_disabled_mask.png
diff --git a/...ected_pal_canvas/sp_partials_labels_enabled/sp_partials_labels_enabled_mask.png b/...ected_pal_canvas/sp_partials_labels_enabled/sp_partials_labels_enabled_mask.png
diff --git a/tests/testdata/control_images/expected_pal_canvas/sp_shadow/sp_shadow_mask.png b/tests/testdata/control_images/expected_pal_canvas/sp_shadow/sp_shadow_mask.png
diff --git a/...estdata/control_images/expected_pal_canvas/sp_text_color/sp_text_color_mask.png b/...estdata/control_images/expected_pal_canvas/sp_text_color/sp_text_color_mask.png
diff --git a/...images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit_mask.png b/...images/expected_pal_canvas/sp_text_size_map_unit/sp_text_size_map_unit_mask.png
diff --git a/...ed_pal_canvas_line/sp_curved_placement_above/sp_curved_placement_above_mask.png b/...ed_pal_canvas_line/sp_curved_placement_above/sp_curved_placement_above_mask.png
diff --git a/...ed_pal_canvas_line/sp_curved_placement_below/sp_curved_placement_below_mask.png b/...ed_pal_canvas_line/sp_curved_placement_below/sp_curved_placement_below_mask.png
diff --git a/..._pal_canvas_line/sp_curved_placement_online/sp_curved_placement_online_mask.png b/..._pal_canvas_line/sp_curved_placement_online/sp_curved_placement_online_mask.png
diff --git a/...cement_above_line_orientation/sp_line_placement_above_line_orientation_mask.png b/...cement_above_line_orientation/sp_line_placement_above_line_orientation_mask.png
diff --git a/...lacement_above_map_orientation/sp_line_placement_above_map_orientation_mask.png b/...lacement_above_map_orientation/sp_line_placement_above_map_orientation_mask.png
diff --git a/...cement_below_line_orientation/sp_line_placement_below_line_orientation_mask.png b/...cement_below_line_orientation/sp_line_placement_below_line_orientation_mask.png
diff --git a/...lacement_below_map_orientation/sp_line_placement_below_map_orientation_mask.png b/...lacement_below_map_orientation/sp_line_placement_below_map_orientation_mask.png
diff --git a/...cted_pal_canvas_line/sp_line_placement_online/sp_line_placement_online_mask.png b/...cted_pal_canvas_line/sp_line_placement_online/sp_line_placement_online_mask.png
diff --git a/...es/expected_pal_composer/sp_img_background_rect/sp_img_background_rect_mask.png b/...es/expected_pal_composer/sp_img_background_rect/sp_img_background_rect_mask.png
diff --git a/...mposer/sp_img_background_rect_w_offset/sp_img_background_rect_w_offset_mask.png b/...mposer/sp_img_background_rect_w_offset/sp_img_background_rect_w_offset_mask.png
diff --git a/...ages/expected_pal_composer/sp_img_background_svg/sp_img_background_svg_mask.png b/...ages/expected_pal_composer/sp_img_background_svg/sp_img_background_svg_mask.png
diff --git a/...composer/sp_img_background_svg_w_offset/sp_img_background_svg_w_offset_mask.png b/...composer/sp_img_background_svg_w_offset/sp_img_background_svg_w_offset_mask.png
diff --git a/...tdata/control_images/expected_pal_composer/sp_img_buffer/sp_img_buffer_mask.png b/...tdata/control_images/expected_pal_composer/sp_img_buffer/sp_img_buffer_mask.png
diff --git a/...images/expected_pal_composer/sp_img_default_label/sp_img_default_label_mask.png b/...images/expected_pal_composer/sp_img_default_label/sp_img_default_label_mask.png
diff --git a/...composer/sp_img_partials_labels_enabled/sp_img_partials_labels_enabled_mask.png b/...composer/sp_img_partials_labels_enabled/sp_img_partials_labels_enabled_mask.png
diff --git a/...tdata/control_images/expected_pal_composer/sp_img_shadow/sp_img_shadow_mask.png b/...tdata/control_images/expected_pal_composer/sp_img_shadow/sp_img_shadow_mask.png
diff --git a/...ntrol_images/expected_pal_composer/sp_img_text_color/sp_img_text_color_mask.png b/...ntrol_images/expected_pal_composer/sp_img_text_color/sp_img_text_color_mask.png
diff --git a/...ected_pal_composer/sp_img_text_size_map_unit/sp_img_text_size_map_unit_mask.png b/...ected_pal_composer/sp_img_text_size_map_unit/sp_img_text_size_map_unit_mask.png
diff --git a/...tdata/control_images/expected_pal_composer/sp_pdf_shadow/sp_pdf_shadow_mask.png b/...tdata/control_images/expected_pal_composer/sp_pdf_shadow/sp_pdf_shadow_mask.png
diff --git a/...es/expected_pal_composer/sp_svg_background_rect/sp_svg_background_rect_mask.png b/...es/expected_pal_composer/sp_svg_background_rect/sp_svg_background_rect_mask.png
diff --git a/...mposer/sp_svg_background_rect_w_offset/sp_svg_background_rect_w_offset_mask.png b/...mposer/sp_svg_background_rect_w_offset/sp_svg_background_rect_w_offset_mask.png
diff --git a/...ages/expected_pal_composer/sp_svg_background_svg/sp_svg_background_svg_mask.png b/...ages/expected_pal_composer/sp_svg_background_svg/sp_svg_background_svg_mask.png
diff --git a/...composer/sp_svg_background_svg_w_offset/sp_svg_background_svg_w_offset_mask.png b/...composer/sp_svg_background_svg_w_offset/sp_svg_background_svg_w_offset_mask.png
diff --git a/...tdata/control_images/expected_pal_composer/sp_svg_buffer/sp_svg_buffer_mask.png b/...tdata/control_images/expected_pal_composer/sp_svg_buffer/sp_svg_buffer_mask.png
diff --git a/...images/expected_pal_composer/sp_svg_default_label/sp_svg_default_label_mask.png b/...images/expected_pal_composer/sp_svg_default_label/sp_svg_default_label_mask.png
diff --git a/...composer/sp_svg_partials_labels_enabled/sp_svg_partials_labels_enabled_mask.png b/...composer/sp_svg_partials_labels_enabled/sp_svg_partials_labels_enabled_mask.png
diff --git a/...tdata/control_images/expected_pal_composer/sp_svg_shadow/sp_svg_shadow_mask.png b/...tdata/control_images/expected_pal_composer/sp_svg_shadow/sp_svg_shadow_mask.png
diff --git a/...ntrol_images/expected_pal_composer/sp_svg_text_color/sp_svg_text_color_mask.png b/...ntrol_images/expected_pal_composer/sp_svg_text_color/sp_svg_text_color_mask.png
diff --git a/...ected_pal_composer/sp_svg_text_size_map_unit/sp_svg_text_size_map_unit_mask.png b/...ected_pal_composer/sp_svg_text_size_map_unit/sp_svg_text_size_map_unit_mask.png
diff --git a/...poser_line/sp_img_curved_placement_above/sp_img_curved_placement_above_mask.png b/...poser_line/sp_img_curved_placement_above/sp_img_curved_placement_above_mask.png
diff --git a/...poser_line/sp_img_curved_placement_below/sp_img_curved_placement_below_mask.png b/...poser_line/sp_img_curved_placement_below/sp_img_curved_placement_below_mask.png
diff --git a/...ser_line/sp_img_curved_placement_online/sp_img_curved_placement_online_mask.png b/...ser_line/sp_img_curved_placement_online/sp_img_curved_placement_online_mask.png
diff --git a/...nt_above_line_orientation/sp_img_line_placement_above_line_orientation_mask.png b/...nt_above_line_orientation/sp_img_line_placement_above_line_orientation_mask.png
diff --git a/...ment_above_map_orientation/sp_img_line_placement_above_map_orientation_mask.png b/...ment_above_map_orientation/sp_img_line_placement_above_map_orientation_mask.png
diff --git a/...nt_below_line_orientation/sp_img_line_placement_below_line_orientation_mask.png b/...nt_below_line_orientation/sp_img_line_placement_below_line_orientation_mask.png
diff --git a/...ment_below_map_orientation/sp_img_line_placement_below_map_orientation_mask.png b/...ment_below_map_orientation/sp_img_line_placement_below_map_orientation_mask.png
diff --git a/...poser_line/sp_svg_curved_placement_above/sp_svg_curved_placement_above_mask.png b/...poser_line/sp_svg_curved_placement_above/sp_svg_curved_placement_above_mask.png
diff --git a/...poser_line/sp_svg_curved_placement_below/sp_svg_curved_placement_below_mask.png b/...poser_line/sp_svg_curved_placement_below/sp_svg_curved_placement_below_mask.png
diff --git a/...ser_line/sp_svg_curved_placement_online/sp_svg_curved_placement_online_mask.png b/...ser_line/sp_svg_curved_placement_online/sp_svg_curved_placement_online_mask.png
diff --git a/...nt_above_line_orientation/sp_svg_line_placement_above_line_orientation_mask.png b/...nt_above_line_orientation/sp_svg_line_placement_above_line_orientation_mask.png
diff --git a/...ment_above_map_orientation/sp_svg_line_placement_above_map_orientation_mask.png b/...ment_above_map_orientation/sp_svg_line_placement_above_map_orientation_mask.png
diff --git a/...nt_below_line_orientation/sp_svg_line_placement_below_line_orientation_mask.png b/...nt_below_line_orientation/sp_svg_line_placement_below_line_orientation_mask.png
diff --git a/...ment_below_map_orientation/sp_svg_line_placement_below_map_orientation_mask.png b/...ment_below_map_orientation/sp_svg_line_placement_below_map_orientation_mask.png
diff --git a/...omposer_line/sp_svg_line_placement_online/sp_svg_line_placement_online_mask.png b/...omposer_line/sp_svg_line_placement_online/sp_svg_line_placement_online_mask.png
diff --git a/..._pal_placement/sp_point_ordered_placement2/sp_point_ordered_placement2_mask.png b/..._pal_placement/sp_point_ordered_placement2/sp_point_ordered_placement2_mask.png
diff --git a/..._pal_placement/sp_point_ordered_placement3/sp_point_ordered_placement3_mask.png b/..._pal_placement/sp_point_ordered_placement3/sp_point_ordered_placement3_mask.png
diff --git a/..._pal_placement/sp_point_ordered_placement4/sp_point_ordered_placement4_mask.png b/..._pal_placement/sp_point_ordered_placement4/sp_point_ordered_placement4_mask.png
diff --git a/...cted_pal_placement/sp_point_placement_around/sp_point_placement_around_mask.png b/...cted_pal_placement/sp_point_placement_around/sp_point_placement_around_mask.png
diff --git a/.../sp_point_placement_around_obstacle/sp_point_placement_around_obstacle_mask.png b/.../sp_point_placement_around_obstacle/sp_point_placement_around_obstacle_mask.png
diff --git a/..._obstacle_large_symbol/sp_point_placement_around_obstacle_large_symbol_mask.png b/..._obstacle_large_symbol/sp_point_placement_around_obstacle_large_symbol_mask.png
diff --git a/...ed_pal_placement/sp_polygon_multiple_labels/sp_polygon_multiple_labels_mask.png b/...ed_pal_placement/sp_polygon_multiple_labels/sp_polygon_multiple_labels_mask.png
diff --git a/...placement_with_hole_and_point/sp_polygon_placement_with_hole_and_point_mask.png b/...placement_with_hole_and_point/sp_polygon_placement_with_hole_and_point_mask.png
diff --git a/...ntrol_images/symbol_fontmarker/expected_fontmarker/expected_fontmarker_mask.png b/...ntrol_images/symbol_fontmarker/expected_fontmarker/expected_fontmarker_mask.png
diff --git a/...ymbol_fontmarker/expected_fontmarker_bounds/expected_fontmarker_bounds_mask.png b/...ymbol_fontmarker/expected_fontmarker_bounds/expected_fontmarker_bounds_mask.png
diff --git a/...bol_fontmarker/expected_fontmarker_outline/expected_fontmarker_outline_mask.png b/...bol_fontmarker/expected_fontmarker_outline/expected_fontmarker_outline_mask.png