Convert remaining tests/benchmarks

Change-Id: Ie7d49d4dc5bf6b2345b54f6bdfffcd974123f729
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

7 files changed, 129 insertions, 3 deletions

diff --git a/tests/benchmarks/gui/image/CMakeLists.txt b/tests/benchmarks/gui/image/CMakeLists.txt
new file mode 100644
index 0000000000..77cfeedc3e
--- /dev/null
+++ b/tests/benchmarks/gui/image/CMakeLists.txt
@@ -0,0 +1,8 @@
+# Generated from image.pro.
+
+add_subdirectory(blendbench)
+add_subdirectory(qimageconversion)
+add_subdirectory(qimagereader)
+add_subdirectory(qimagescale)
+add_subdirectory(qpixmap)
+add_subdirectory(qpixmapcache)
diff --git a/tests/benchmarks/gui/image/blendbench/CMakeLists.txt b/tests/benchmarks/gui/image/blendbench/CMakeLists.txt
index 24b2a79df1..3599a51371 100644
--- a/tests/benchmarks/gui/image/blendbench/CMakeLists.txt
+++ b/tests/benchmarks/gui/image/blendbench/CMakeLists.txt
@@ -1,3 +1,16 @@
-add_qt_test(tst_bench_blendbench SOURCES
+# Generated from blendbench.pro.
+
+#####################################################################
+## tst_bench_blendbench Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_blendbench
+    SOURCES
         main.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
 )
+
+#### Keys ignored in scope 1:.:.:blendbench.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt b/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt
new file mode 100644
index 0000000000..d9b481ca46
--- /dev/null
+++ b/tests/benchmarks/gui/image/qimageconversion/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Generated from qimageconversion.pro.
+
+#####################################################################
+## tst_bench_imageConversion Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_imageConversion
+    SOURCES
+        tst_qimageconversion.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qimageconversion.pro:<TRUE>:
+# QT_FOR_CONFIG = "gui-private"
+# TEMPLATE = "app"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_gif
+    DEFINES
+        QTEST_HAVE_GIF
+)
+
+extend_target(tst_bench_imageConversion CONDITION QT_FEATURE_jpeg
+    DEFINES
+        QTEST_HAVE_JPEG
+)
diff --git a/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt b/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt
new file mode 100644
index 0000000000..be72a44187
--- /dev/null
+++ b/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt
@@ -0,0 +1,31 @@
+# Generated from qimagereader.pro.
+
+#####################################################################
+## tst_bench_qimagereader Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qimagereader
+    SOURCES
+        tst_qimagereader.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qimagereader.pro:<TRUE>:
+# QT_FOR_CONFIG = "gui-private"
+# TEMPLATE = "app"
+# TESTDATA = "images/*"
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_gif
+    DEFINES
+        QTEST_HAVE_GIF
+)
+
+extend_target(tst_bench_qimagereader CONDITION QT_FEATURE_jpeg
+    DEFINES
+        QTEST_HAVE_JPEG
+)
diff --git a/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt b/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt
index 58b9159eba..cbf3e5459b 100644
--- a/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt
+++ b/tests/benchmarks/gui/image/qimagescale/CMakeLists.txt
@@ -1,3 +1,16 @@
-add_qt_test(tst_bench_imageScale SOURCES
+# Generated from qimagescale.pro.
+
+#####################################################################
+## tst_bench_imageScale Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_imageScale
+    SOURCES
         tst_qimagescale.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
 )
+
+#### Keys ignored in scope 1:.:.:qimagescale.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt
new file mode 100644
index 0000000000..2798fe4dbb
--- /dev/null
+++ b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt
@@ -0,0 +1,18 @@
+# Generated from qpixmap.pro.
+
+#####################################################################
+## tst_bench_qpixmap Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qpixmap
+    SOURCES
+        tst_qpixmap.cpp
+    LIBRARIES
+        Qt::GuiPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
+)
+
+#### Keys ignored in scope 1:.:.:qpixmap.pro:<TRUE>:
+# TEMPLATE = "app"
diff --git a/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt b/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt
index e2aa20d75a..46347ef94a 100644
--- a/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt
+++ b/tests/benchmarks/gui/image/qpixmapcache/CMakeLists.txt
@@ -1,3 +1,16 @@
-add_qt_test(tst_bench_qpixmapcache SOURCES
+# Generated from qpixmapcache.pro.
+
+#####################################################################
+## tst_bench_qpixmapcache Binary:
+#####################################################################
+
+add_qt_benchmark(tst_bench_qpixmapcache
+    SOURCES
         tst_qpixmapcache.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Test
 )
+
+#### Keys ignored in scope 1:.:.:qpixmapcache.pro:<TRUE>:
+# TEMPLATE = "app"