QImageReader test review

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt b/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt
index 17ce71b..168313c 100644 (file)
--- a/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt
+++ b/tests/benchmarks/gui/image/qimagereader/CMakeLists.txt
@@ -2,8 +2,6 @@ katie_gui_test(tst_bench_qimagereader
     ${CMAKE_CURRENT_SOURCE_DIR}/tst_qimagereader.cpp
 )
 
-# GIF is built-in supported
-target_compile_definitions(tst_bench_qimagereader PRIVATE -DQTEST_HAVE_GIF)
 if(WITH_JPEG AND JPEG_FOUND)
     target_compile_definitions(tst_bench_qimagereader PRIVATE -DQTEST_HAVE_JPEG)
 endif()

diff --git a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp
index e9a6042..f37f11c 100644 (file)
--- a/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/benchmarks/gui/image/qimagereader/tst_qimagereader.cpp
@@ -41,8 +41,6 @@
 #include <QLabel>
 #include <QPixmap>
 #include <QSet>
-#include <QTcpSocket>
-#include <QTcpServer>
 #include <QTimer>
 
 typedef QMap<QString, QString> QStringMap;
@@ -107,10 +105,8 @@ tst_QImageReader::tst_QImageReader()
     images << QPair<QString, QByteArray>(QLatin1String("YCbCr_rgb.jpg"), QByteArray("jpeg"));
     images << QPair<QString, QByteArray>(QLatin1String("task210380.jpg"), QByteArray("jpeg"));
 #endif
-#if defined QTEST_HAVE_GIF
     images << QPair<QString, QByteArray>(QLatin1String("earth.gif"), QByteArray("gif"));
     images << QPair<QString, QByteArray>(QLatin1String("trolltech.gif"), QByteArray("gif"));
-#endif
 }
 
 tst_QImageReader::~tst_QImageReader()