12 files changed, 36 insertions, 26 deletions
diff --git a/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro
index aae89db52f..0ad195f629 100644
--- a/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro
+++ b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro
@@ -1,5 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qicoimageformat
 SOURCES+= tst_qicoimageformat.cpp
+QT += testlib
 
 wince*: {
    DEFINES += SRCDIR=\\\".\\\"
diff --git a/tests/auto/gui/image/qicon/qicon.pro b/tests/auto/gui/image/qicon/qicon.pro
index 336a63d02f..34fc5b7716 100644
--- a/tests/auto/gui/image/qicon/qicon.pro
+++ b/tests/auto/gui/image/qicon/qicon.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qicon
 
-QT += widgets
+QT += widgets testlib
 SOURCES += tst_qicon.cpp
 RESOURCES = tst_qicon.qrc
 
diff --git a/tests/auto/gui/image/qimage/qimage.pro b/tests/auto/gui/image/qimage/qimage.pro
index 87828b9c3e..afa279f340 100644
--- a/tests/auto/gui/image/qimage/qimage.pro
+++ b/tests/auto/gui/image/qimage/qimage.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qimage
 SOURCES  += tst_qimage.cpp
 
-QT += core-private gui-private
+QT += core-private gui-private testlib
 
 wince*: {
    addImages.files = images/*
diff --git a/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro b/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro
index 46e5cfb2cf..428ff62959 100644
--- a/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro
+++ b/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro
@@ -1,8 +1,6 @@
-############################################################
-# Project file for autotest for file qimageiohandler.h
-############################################################
-
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qimageiohandler
+QT += testlib
 
 SOURCES += tst_qimageiohandler.cpp
 
diff --git a/tests/auto/gui/image/qimagereader/qimagereader.pro b/tests/auto/gui/image/qimagereader/qimagereader.pro
index e706f24814..fc2b97267c 100644
--- a/tests/auto/gui/image/qimagereader/qimagereader.pro
+++ b/tests/auto/gui/image/qimagereader/qimagereader.pro
@@ -1,7 +1,8 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qimagereader
 SOURCES += tst_qimagereader.cpp
 MOC_DIR=tmp
-QT += widgets widgets-private core-private gui-private network
+QT += widgets widgets-private core-private gui-private network testlib
 RESOURCES += qimagereader.qrc
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
diff --git a/tests/auto/gui/image/qimagewriter/qimagewriter.pro b/tests/auto/gui/image/qimagewriter/qimagewriter.pro
index ebd5efd49a..10c950cf0a 100644
--- a/tests/auto/gui/image/qimagewriter/qimagewriter.pro
+++ b/tests/auto/gui/image/qimagewriter/qimagewriter.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qimagewriter
+QT += widgets testlib
 SOURCES += tst_qimagewriter.cpp
 MOC_DIR=tmp
 !contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF
diff --git a/tests/auto/gui/image/qmovie/qmovie.pro b/tests/auto/gui/image/qmovie/qmovie.pro
index 54cd7a2548..d565418d6d 100644
--- a/tests/auto/gui/image/qmovie/qmovie.pro
+++ b/tests/auto/gui/image/qmovie/qmovie.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qmovie
+QT += widgets testlib
 SOURCES += tst_qmovie.cpp
 MOC_DIR=tmp
 
diff --git a/tests/auto/gui/image/qpicture/qpicture.pro b/tests/auto/gui/image/qpicture/qpicture.pro
index eb96b73487..82e62446a9 100644
--- a/tests/auto/gui/image/qpicture/qpicture.pro
+++ b/tests/auto/gui/image/qpicture/qpicture.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += widgets
+CONFIG += testcase
+TARGET = tst_qpicture
+QT += widgets testlib
 SOURCES  += tst_qpicture.cpp
 
 
diff --git a/tests/auto/gui/image/qpixmap/qpixmap.pro b/tests/auto/gui/image/qpixmap/qpixmap.pro
index d6d260da00..fc09164c46 100644
--- a/tests/auto/gui/image/qpixmap/qpixmap.pro
+++ b/tests/auto/gui/image/qpixmap/qpixmap.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qpixmap
 
-QT += core-private gui-private widgets widgets-private
+QT += core-private gui-private widgets widgets-private testlib
 
 SOURCES  += tst_qpixmap.cpp
 wince* {
diff --git a/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro b/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro
index 1ffafd6c25..fe3b5a2db3 100644
--- a/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro
+++ b/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
-QT += gui-private
+CONFIG += testcase
+TARGET = tst_qpixmapcache
+QT += gui-private testlib
 SOURCES  += tst_qpixmapcache.cpp
 
 
diff --git a/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro b/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro
index 21e10b7ab9..872686b82f 100644
--- a/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro
+++ b/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro
@@ -1,6 +1,7 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qpixmapfilter
 
-QT += widgets widgets-private
+QT += widgets widgets-private testlib
 QT += gui-private
 
 SOURCES  += tst_qpixmapfilter.cpp
diff --git a/tests/auto/gui/image/qvolatileimage/qvolatileimage.pro b/tests/auto/gui/image/qvolatileimage/qvolatileimage.pro
index d97eb1ee13..3d982d7951 100644
--- a/tests/auto/gui/image/qvolatileimage/qvolatileimage.pro
+++ b/tests/auto/gui/image/qvolatileimage/qvolatileimage.pro
@@ -1,5 +1,6 @@
-load(qttest_p4)
+CONFIG += testcase
+TARGET = tst_qvolatileimage
 
-QT += gui-private widgets
+QT += gui-private widgets testlib
 
 SOURCES  += tst_qvolatileimage.cpp