Add masks for qt5 and enable atlas test

qgis · Mar 18, 2016 · 6b4f60970d231a036a5b088b8db8757d8f452b78 · 6b4f609
1 parent da635d4
commit 6b4f60970d231a036a5b088b8db8757d8f452b78
diff --git a/ci/travis/linux/qt5/blacklist.txt b/ci/travis/linux/qt5/blacklist.txt
@@ -3,7 +3,6 @@ qgis_wcsprovidertest
 ProcessingParametersTest
 ProcessingQgisAlgorithmsTest
 ProcessingGdalAlgorithmsTest
-qgis_atlascompositiontest
 qgis_composermapgridtest
 qgis_composerpapertest
 qgis_composerrotationtest

diff --git a/...ntrol_images/atlas/expected_atlas_autoscale1/expected_atlas_autoscale1_mask.png b/...ntrol_images/atlas/expected_atlas_autoscale1/expected_atlas_autoscale1_mask.png
diff --git a/...ntrol_images/atlas/expected_atlas_autoscale2/expected_atlas_autoscale2_mask.png b/...ntrol_images/atlas/expected_atlas_autoscale2/expected_atlas_autoscale2_mask.png
diff --git a/...as/expected_atlas_autoscale_old_api1/expected_atlas_autoscale_old_api1_mask.png b/...as/expected_atlas_autoscale_old_api1/expected_atlas_autoscale_old_api1_mask.png
diff --git a/...as/expected_atlas_autoscale_old_api2/expected_atlas_autoscale_old_api2_mask.png b/...as/expected_atlas_autoscale_old_api2/expected_atlas_autoscale_old_api2_mask.png
diff --git a/...ntrol_images/atlas/expected_atlas_filtering1/expected_atlas_filtering1_mask.png b/...ntrol_images/atlas/expected_atlas_filtering1/expected_atlas_filtering1_mask.png
diff --git a/...rol_images/atlas/expected_atlas_fixedscale1/expected_atlas_fixedscale1_mask.png b/...rol_images/atlas/expected_atlas_fixedscale1/expected_atlas_fixedscale1_mask.png
diff --git a/...rol_images/atlas/expected_atlas_fixedscale2/expected_atlas_fixedscale2_mask.png b/...rol_images/atlas/expected_atlas_fixedscale2/expected_atlas_fixedscale2_mask.png
diff --git a/.../expected_atlas_fixedscale_old_api1/expected_atlas_fixedscale_old_api1_mask.png b/.../expected_atlas_fixedscale_old_api1/expected_atlas_fixedscale_old_api1_mask.png
diff --git a/.../expected_atlas_fixedscale_old_api2/expected_atlas_fixedscale_old_api2_mask.png b/.../expected_atlas_fixedscale_old_api2/expected_atlas_fixedscale_old_api2_mask.png
diff --git a/...ata/control_images/atlas/expected_atlas_hiding1/expected_atlas_hiding1_mask.png b/...ata/control_images/atlas/expected_atlas_hiding1/expected_atlas_hiding1_mask.png
diff --git a/...tlas/expected_atlas_predefinedscales1/expected_atlas_predefinedscales1_mask.png b/...tlas/expected_atlas_predefinedscales1/expected_atlas_predefinedscales1_mask.png
diff --git a/...tlas/expected_atlas_predefinedscales2/expected_atlas_predefinedscales2_mask.png b/...tlas/expected_atlas_predefinedscales2/expected_atlas_predefinedscales2_mask.png
diff --git a/...a/control_images/atlas/expected_atlas_sorting1/expected_atlas_sorting1_mask.png b/...a/control_images/atlas/expected_atlas_sorting1/expected_atlas_sorting1_mask.png
diff --git a/...a/control_images/atlas/expected_atlas_sorting2/expected_atlas_sorting2_mask.png b/...a/control_images/atlas/expected_atlas_sorting2/expected_atlas_sorting2_mask.png
diff --git a/...control_images/atlas/expected_atlas_two_maps1/expected_atlas_two_maps1_mask.png b/...control_images/atlas/expected_atlas_two_maps1/expected_atlas_two_maps1_mask.png
diff --git a/...control_images/atlas/expected_atlas_two_maps2/expected_atlas_two_maps2_mask.png b/...control_images/atlas/expected_atlas_two_maps2/expected_atlas_two_maps2_mask.png