CMake: Regenerate and fixup qtimageformats projectswip/cmake

A few changes happened since last update:
- CMake target names are now consistent with Qt 5 names
- ZLIB handling
- TIFF 3rd party handling
- Standalone tests simplification
- Updates in the SUBDIRS project
- Other minor changes

Change-Id: I85cca79d38feca44c5b78dae48c79779ae05e288
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

5 files changed, 39 insertions, 13 deletions

diff --git a/tests/.prev_CMakeLists.txt b/tests/.prev_CMakeLists.txt
index 718724d..2214137 100644
--- a/tests/.prev_CMakeLists.txt
+++ b/tests/.prev_CMakeLists.txt
@@ -1,10 +1,7 @@
 # Generated from tests.pro.
 
-if(NOT TARGET Qt::Test)
-    cmake_minimum_required(VERSION 3.15.0)
-    project(imageformatsTests_FIXME VERSION 6.0.0 LANGUAGES C CXX)
-    find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core SET_ME_TO_SOMETHING_USEFUL)
-    find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS SET_ME_TO_SOMETHING_USEFUL)
-    qt_set_up_standalone_tests_build()
+if(QT_BUILD_STANDALONE_TESTS)
+    # Add qt_find_package calls for extra dependencies that need to be found when building
+    # the standalone tests here.
 endif()
 qt_build_tests()
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 5a389d6..2214137 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,10 +1,7 @@
 # Generated from tests.pro.
 
-if(NOT TARGET Qt::Test)
-    cmake_minimum_required(VERSION 3.15.0)
-    project(imageformatsTests_FIXME VERSION 6.0.0 LANGUAGES C CXX)
-    find_package(Qt6 ${PROJECT_VERSION} REQUIRED COMPONENTS BuildInternals Core Test) # special case
-    find_package(Qt6 ${PROJECT_VERSION} OPTIONAL_COMPONENTS Gui) # special case
-    qt_set_up_standalone_tests_build()
+if(QT_BUILD_STANDALONE_TESTS)
+    # Add qt_find_package calls for extra dependencies that need to be found when building
+    # the standalone tests here.
 endif()
 qt_build_tests()
diff --git a/tests/auto/tiff/CMakeLists.txt b/tests/auto/tiff/CMakeLists.txt
index 92335d3..4bd527a 100644
--- a/tests/auto/tiff/CMakeLists.txt
+++ b/tests/auto/tiff/CMakeLists.txt
@@ -15,6 +15,18 @@ qt_add_test(tst_qtiff
 set_source_files_properties("../../shared/images/tiff/16bpc.tiff"
     PROPERTIES QT_RESOURCE_ALIAS "tiff/16bpc.tiff"
 )
+set_source_files_properties("../../shared/images/tiff/big_16bpc.tiff"
+    PROPERTIES QT_RESOURCE_ALIAS "tiff/big_16bpc.tiff"
+)
+set_source_files_properties("../../shared/images/tiff/big_grayscale.tiff"
+    PROPERTIES QT_RESOURCE_ALIAS "tiff/big_grayscale.tiff"
+)
+set_source_files_properties("../../shared/images/tiff/big_rgb.tiff"
+    PROPERTIES QT_RESOURCE_ALIAS "tiff/big_rgb.tiff"
+)
+set_source_files_properties("../../shared/images/tiff/big_rgb_bigendian.tiff"
+    PROPERTIES QT_RESOURCE_ALIAS "tiff/big_rgb_bigendian.tiff"
+)
 set_source_files_properties("../../shared/images/tiff/colorful.bmp"
     PROPERTIES QT_RESOURCE_ALIAS "tiff/colorful.bmp"
 )
@@ -170,6 +182,10 @@ set_source_files_properties("../../shared/images/tiff/tiled_rgb.tiff"
 )
 set(tiff_resource_files
     "tiff/16bpc.tiff"
+    "tiff/big_16bpc.tiff"
+    "tiff/big_grayscale.tiff"
+    "tiff/big_rgb.tiff"
+    "tiff/big_rgb_bigendian.tiff"
     "tiff/colorful.bmp"
     "tiff/corrupt-data.tif"
     "tiff/gray16.tiff"
diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt
index 14b22d3..d6508bf 100644
--- a/tests/benchmarks/CMakeLists.txt
+++ b/tests/benchmarks/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Generated from benchmarks.pro.
 
-if(ON)
+if(QT_FEATURE_system_zlib)
     add_subdirectory(mng)
     add_subdirectory(tiff)
 endif()
diff --git a/tests/benchmarks/tiff/CMakeLists.txt b/tests/benchmarks/tiff/CMakeLists.txt
index 37a700c..2632376 100644
--- a/tests/benchmarks/tiff/CMakeLists.txt
+++ b/tests/benchmarks/tiff/CMakeLists.txt
@@ -16,6 +16,18 @@ qt_add_benchmark(tst_bench_qtiff
 set_source_files_properties("../../shared/images/tiff/16bpc.tiff"
     PROPERTIES QT_RESOURCE_ALIAS "tiff/16bpc.tiff"
 )
+set_source_files_properties("../../shared/images/tiff/big_16bpc.tiff"
+    PROPERTIES QT_RESOURCE_ALIAS "tiff/big_16bpc.tiff"
+)
+set_source_files_properties("../../shared/images/tiff/big_grayscale.tiff"
+    PROPERTIES QT_RESOURCE_ALIAS "tiff/big_grayscale.tiff"
+)
+set_source_files_properties("../../shared/images/tiff/big_rgb.tiff"
+    PROPERTIES QT_RESOURCE_ALIAS "tiff/big_rgb.tiff"
+)
+set_source_files_properties("../../shared/images/tiff/big_rgb_bigendian.tiff"
+    PROPERTIES QT_RESOURCE_ALIAS "tiff/big_rgb_bigendian.tiff"
+)
 set_source_files_properties("../../shared/images/tiff/colorful.bmp"
     PROPERTIES QT_RESOURCE_ALIAS "tiff/colorful.bmp"
 )
@@ -171,6 +183,10 @@ set_source_files_properties("../../shared/images/tiff/tiled_rgb.tiff"
 )
 set(tiff_resource_files
     "tiff/16bpc.tiff"
+    "tiff/big_16bpc.tiff"
+    "tiff/big_grayscale.tiff"
+    "tiff/big_rgb.tiff"
+    "tiff/big_rgb_bigendian.tiff"
     "tiff/colorful.bmp"
     "tiff/corrupt-data.tif"
     "tiff/gray16.tiff"