qgis
diff --git a/‎tests/src/core/testqgscomposerutils.cpp
Lines changed: 1 addition & 1 deletion b/‎tests/src/core/testqgscomposerutils.cpp
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/testdata/control_images/expected_atlas_sorting2/expected_atlas_sorting2_mask.png
430 Bytes b/‎tests/testdata/control_images/expected_atlas_sorting2/expected_atlas_sorting2_mask.png
430 Bytes
diff --git a/‎tests/testdata/control_images/expected_composerutils_drawtext_rectalign/expected_composerutils_drawtext_rectalign_mask.png
193 Bytes b/‎tests/testdata/control_images/expected_composerutils_drawtext_rectalign/expected_composerutils_drawtext_rectalign_mask.png
193 Bytes
diff --git a/‎tests/testdata/control_images/expected_composerutils_drawtext_rectflag/expected_composerutils_drawtext_rectflag_mask.png
262 Bytes b/‎tests/testdata/control_images/expected_composerutils_drawtext_rectflag/expected_composerutils_drawtext_rectflag_mask.png
262 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_canvas/sp_buffer/sp_buffer_mask.png
-4 Bytes b/‎tests/testdata/control_images/expected_pal_canvas/sp_buffer/sp_buffer_mask.png
-4 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_canvas/sp_shadow/sp_shadow_mask.png
57 Bytes b/‎tests/testdata/control_images/expected_pal_canvas/sp_shadow/sp_shadow_mask.png
57 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer/sp_img_buffer/sp_img_buffer_mask.png
2 Bytes b/‎tests/testdata/control_images/expected_pal_composer/sp_img_buffer/sp_img_buffer_mask.png
2 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer/sp_img_shadow/sp_img_shadow_mask.png
16 Bytes b/‎tests/testdata/control_images/expected_pal_composer/sp_img_shadow/sp_img_shadow_mask.png
16 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer/sp_pdf_buffer/sp_pdf_buffer_mask.png
19 Bytes b/‎tests/testdata/control_images/expected_pal_composer/sp_pdf_buffer/sp_pdf_buffer_mask.png
19 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer/sp_pdf_shadow/sp_pdf_shadow_mask.png
17 Bytes b/‎tests/testdata/control_images/expected_pal_composer/sp_pdf_shadow/sp_pdf_shadow_mask.png
17 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/sp_img_curved_placement_above_mask.png
140 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_above/sp_img_curved_placement_above_mask.png
140 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/sp_img_curved_placement_below_mask.png
222 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_below/sp_img_curved_placement_below_mask.png
222 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_online/sp_img_curved_placement_online_mask.png
164 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_curved_placement_online/sp_img_curved_placement_online_mask.png
164 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_line_orientation/sp_img_line_placement_above_line_orientation_mask.png
156 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_line_orientation/sp_img_line_placement_above_line_orientation_mask.png
156 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_map_orientation/sp_img_line_placement_above_map_orientation_mask.png
146 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_above_map_orientation/sp_img_line_placement_above_map_orientation_mask.png
146 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_line_orientation/sp_img_line_placement_below_line_orientation_mask.png
146 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_line_orientation/sp_img_line_placement_below_line_orientation_mask.png
146 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_map_orientation/sp_img_line_placement_below_map_orientation_mask.png
156 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_below_map_orientation/sp_img_line_placement_below_map_orientation_mask.png
156 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_online/sp_img_line_placement_online_mask.png
216 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_img_line_placement_online/sp_img_line_placement_online_mask.png
216 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_above/sp_pdf_curved_placement_above_mask.png
-21 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_above/sp_pdf_curved_placement_above_mask.png
-21 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_below/sp_pdf_curved_placement_below_mask.png
-120 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_below/sp_pdf_curved_placement_below_mask.png
-120 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_online/sp_pdf_curved_placement_online_mask.png
19 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_curved_placement_online/sp_pdf_curved_placement_online_mask.png
19 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_above_line_orientation/sp_pdf_line_placement_above_line_orientation_mask.png
105 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_above_line_orientation/sp_pdf_line_placement_above_line_orientation_mask.png
105 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_above_map_orientation/sp_pdf_line_placement_above_map_orientation_mask.png
118 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_above_map_orientation/sp_pdf_line_placement_above_map_orientation_mask.png
118 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_below_line_orientation/sp_pdf_line_placement_below_line_orientation_mask.png
118 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_below_line_orientation/sp_pdf_line_placement_below_line_orientation_mask.png
118 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_below_map_orientation/sp_pdf_line_placement_below_map_orientation_mask.png
105 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_below_map_orientation/sp_pdf_line_placement_below_map_orientation_mask.png
105 Bytes
diff --git a/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_online/sp_pdf_line_placement_online_mask.png
58 Bytes b/‎tests/testdata/control_images/expected_pal_composer_line/sp_pdf_line_placement_online/sp_pdf_line_placement_online_mask.png
58 Bytes
diff --git a/‎tests/testdata/control_images/maprotation/expected_lines-parallel-label+45/expected_lines-parallel-label+45_mask.png
341 Bytes b/‎tests/testdata/control_images/maprotation/expected_lines-parallel-label+45/expected_lines-parallel-label+45_mask.png
341 Bytes
@@ -588,7 +588,7 @@ void TestQgsComposerUtils::fontAscentMM()
 void TestQgsComposerUtils::fontDescentMM()
 {
   mTestFont.setPointSize( 12 );
-  QCOMPARE( QgsComposerUtils::fontDescentMM( mTestFont ), 0.9 );
+  QVERIFY( qgsDoubleNear( QgsComposerUtils::fontDescentMM( mTestFont ), 0.9, 0.05 ) );
 }
 
 void TestQgsComposerUtils::fontHeightMM()
Original file line number	Diff line number	Diff line change
`@@ -588,7 +588,7 @@ void TestQgsComposerUtils::fontAscentMM()`
`588`	`588`	`void TestQgsComposerUtils::fontDescentMM()`
`589`	`589`	`{`
`590`	`590`	`mTestFont.setPointSize( 12 );`
`591`		`- QCOMPARE( QgsComposerUtils::fontDescentMM( mTestFont ), 0.9 );`
	`591`	`+ QVERIFY( qgsDoubleNear( QgsComposerUtils::fontDescentMM( mTestFont ), 0.9, 0.05 ) );`
`592`	`592`	`}`
`593`	`593`
`594`	`594`	`void TestQgsComposerUtils::fontHeightMM()`