diff --git a/tests/src/core/CMakeLists.txt b/tests/src/core/CMakeLists.txt index c3620629cfc9..92bfef502c5b 100644 --- a/tests/src/core/CMakeLists.txt +++ b/tests/src/core/CMakeLists.txt @@ -104,6 +104,6 @@ ADD_QGIS_TEST(composermaptest testqgscomposermap.cpp) ADD_QGIS_TEST(atlascompositiontest testqgsatlascomposition.cpp) ADD_QGIS_TEST(composerlabeltest testqgscomposerlabel.cpp) ADD_QGIS_TEST(stylev2test testqgsstylev2.cpp) -#ADD_QGIS_TEST(composerhtmltest testqgscomposerhtml.cpp ) +ADD_QGIS_TEST(composerhtmltest testqgscomposerhtml.cpp ) ADD_QGIS_TEST(rectangletest testqgsrectangle.cpp) ADD_QGIS_TEST(composerscalebartest testqgscomposerscalebar.cpp ) diff --git a/tests/testdata/control_images/expected_composerhtml/composerhtml_table.png b/tests/testdata/control_images/expected_composerhtml/composerhtml_table.png index 0007e0c2efbf..03282275370d 100644 Binary files a/tests/testdata/control_images/expected_composerhtml/composerhtml_table.png and b/tests/testdata/control_images/expected_composerhtml/composerhtml_table.png differ diff --git a/tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe1.png b/tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe1.png index 5262a0bcebfd..1ea2100bfacc 100644 Binary files a/tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe1.png and b/tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe1.png differ diff --git a/tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe2.png b/tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe2.png index cebdf29a1e6e..e3ec9ad76790 100644 Binary files a/tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe2.png and b/tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe2.png differ diff --git a/tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe3.png b/tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe3.png index 0fe2e2186019..4d210824b1b3 100644 Binary files a/tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe3.png and b/tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe3.png differ