Moved gui autotests into new directory structure

Task-number: QTBUG-21133

Change-Id: I83b8f652935cf92151265ca2530a3cf81c31fdef
Reviewed-on: http://codereview.qt.nokia.com/3996
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jo Asplin <jo.asplin@nokia.com>

640 files changed, 114 insertions, 74 deletions

diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index c64ed21b98..da2089b66b 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -17,7 +17,6 @@ SUBDIRS=\
    qdatetime \
    qeasingcurve \
    qelapsedtimer \
-   qevent \
    qexplicitlyshareddatapointer \
    qfreelist \
    qhash \
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 20194f9b7b..7525c6d5ce 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -5,6 +5,7 @@
 #
 TEMPLATE=subdirs
 SUBDIRS=\
+    gui \
     gestures \
     languagechange \
     modeltest \
@@ -16,17 +17,13 @@ SUBDIRS=\
     qabstractscrollarea \
     qabstractslider \
     qabstractspinbox \
-    qabstracttextdocumentlayout \
     qaction \
     qactiongroup \
     qapplication \
     qboxlayout \
-    qbrush \
     qbuttongroup \
     qcalendarwidget \
     qcheckbox \
-    qclipboard \
-    qcolor \
     qcolordialog \
     qcolumnview \
     qcommandlinkbutton \
@@ -34,7 +31,6 @@ SUBDIRS=\
     qcomplextext \
     qdatawidgetmapper \
     qdatetimeedit \
-    qdesktopservices \
     qdesktopwidget \
     qdial \
     qdialog \
@@ -43,21 +39,15 @@ SUBDIRS=\
     qdockwidget \
     qdoublespinbox \
     qdoublevalidator \
-    qdrag \
     qerrormessage \
     qfiledialog \
     qfiledialog2 \
     qfileiconprovider \
-    qfileopenevent \
     qfilesystemmodel \
     qfocusframe \
-    qfont \
     qfontcombobox \
-    qfontdatabase \
     qfontdialog \
-    qfontmetrics \
     qformlayout \
-    qglyphrun \
     qgraphicsanchorlayout \
     qgraphicsanchorlayout1 \
     qgraphicseffect \
@@ -79,14 +69,8 @@ SUBDIRS=\
     qgraphicswidget \
     qgridlayout \
     qgroupbox \
-    qguivariant \
     qheaderview \
-    qicoimageformat \
-    qicon \
     qidentityproxymodel \
-    qimageiohandler \
-    qimagereader \
-    qimagewriter \
     qinputcontext \
     qinputdialog \
     qintvalidator \
@@ -94,7 +78,6 @@ SUBDIRS=\
     qitemeditorfactory \
     qitemselectionmodel \
     qitemview \
-    qkeysequence \
     qlabel \
     qlcdnumber \
     qlineedit \
@@ -105,42 +88,23 @@ SUBDIRS=\
     #qlocalsocket \  # FIXME: uses qtscript (QTBUG-19242)
     qmacstyle \
     qmainwindow \
-    qmatrixnxn \
     qmdisubwindow \
     qmessagebox \
     qmetaobject \
     qmimedata \
-    qmouseevent_modal \
-    qmovie \
-    qvolatileimage \
     qnetworkaccessmanager_and_qprogressdialog \
     qopengl \
-    qpaintengine \
-    qpainterpath \
-    qpainterpathstroker \
-    qpalette \
-    qpathclipper \
-    qpen \
-    qpicture \
-    qpixmapcache \
-    qpixmapfilter \
     qplaintextedit \
     qpointer \
-    qpolygon \
-    qprinterinfo \
     qprogressbar \
     qprogressdialog \
     qpushbutton \
-    qquaternion \
     qradiobutton \
-    qrawfont \
     qregexpvalidator \
-    qregion \
     qscrollarea \
     qscrollbar \
     qscroller \
     qsharedpointer_and_qwidget \
-    qshortcut \
     qsidebar \
     qsignalmapper \
     qsizegrip \
@@ -153,35 +117,20 @@ SUBDIRS=\
     qstandarditem \
     qstandarditemmodel \
     qstatemachine \
-    qstatictext \
     qstatusbar \
     qstringlistmodel \
     qstyle \
     qstyleoption \
     qstylesheetstyle \
-    qsyntaxhighlighter \
     qsystemtrayicon \
     qtabbar \
     qtableview \
     qtablewidget \
     qtcpsocket \
-    qtextblock \
-    qtextcursor \
-    qtextdocumentfragment \
-    qtextdocumentlayout \
-    qtextformat \
-    qtextlayout \
-    qtextlist \
-    qtextobject \
-    qtextpiecetable \
-    qtextscriptengine \
-    qtexttable \
     qtipc \
     qtoolbar \
     qtoolbox \
     qtooltip \
-    qtouchevent \
-    qtransform \
     qtransformedscreen \
     qtranslator \
     qtreeview \
@@ -189,12 +138,10 @@ SUBDIRS=\
     qtreewidgetitemiterator \
     qundogroup \
     qundostack \
-    qvectornd \
     qwidget_window \
     qwidgetaction \
     qwindowsurface \
     qwizard \
-    qwmatrix \
     qwsembedwidget \
     qwsinputmethod \
     qwswindowsystem \
@@ -212,15 +159,10 @@ win32:SUBDIRS -= qtextpiecetable
            qlistwidget \
            qmainwindow \
            qnetworkreply \
-           qpathclipper \
-           qpixmapcache \
            qsidebar \
            qstylesheetstyle \
-           qtextlayout \
-           qtextpiecetable \
            qtipc \
            qtoolbar \
-           qstatictext \
 
 symbian:SUBDIRS -= \
     qsystemtrayicon \
diff --git a/tests/auto/gui/gui.pro b/tests/auto/gui/gui.pro
new file mode 100644
index 0000000000..d54198467d
--- /dev/null
+++ b/tests/auto/gui/gui.pro
@@ -0,0 +1,9 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+    image \
+    kernel \
+    math3d \
+    painting \
+    text \
+    util \
+
diff --git a/tests/auto/gui/image/image.pro b/tests/auto/gui/image/image.pro
new file mode 100644
index 0000000000..fe089f5e75
--- /dev/null
+++ b/tests/auto/gui/image/image.pro
@@ -0,0 +1,18 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qimagereader \
+   qicoimageformat \
+   qpixmap \
+   qpixmapcache \
+   qimage \
+   qpixmapfilter \
+   qimageiohandler \
+   qimagewriter \
+   qmovie \
+   qvolatileimage \
+   qicon \
+   qpicture \
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+           qpixmapcache \
+
diff --git a/tests/auto/qicoimageformat/.gitignore b/tests/auto/gui/image/qicoimageformat/.gitignore
index 9f673c5635..9f673c5635 100644
--- a/tests/auto/qicoimageformat/.gitignore
+++ b/tests/auto/gui/image/qicoimageformat/.gitignore
diff --git a/tests/auto/qicoimageformat/icons/invalid/35floppy.ico b/tests/auto/gui/image/qicoimageformat/icons/invalid/35floppy.ico
index 96087612fb..96087612fb 100644
--- a/tests/auto/qicoimageformat/icons/invalid/35floppy.ico
+++ b/tests/auto/gui/image/qicoimageformat/icons/invalid/35floppy.ico
diff --git a/tests/auto/qicoimageformat/icons/valid/35FLOPPY.ICO b/tests/auto/gui/image/qicoimageformat/icons/valid/35FLOPPY.ICO
index e9551d6390..e9551d6390 100644
--- a/tests/auto/qicoimageformat/icons/valid/35FLOPPY.ICO
+++ b/tests/auto/gui/image/qicoimageformat/icons/valid/35FLOPPY.ICO
diff --git a/tests/auto/qicoimageformat/icons/valid/AddPerfMon.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/AddPerfMon.ico
index 3368d3634a..3368d3634a 100644
--- a/tests/auto/qicoimageformat/icons/valid/AddPerfMon.ico
+++ b/tests/auto/gui/image/qicoimageformat/icons/valid/AddPerfMon.ico
diff --git a/tests/auto/qicoimageformat/icons/valid/App.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/App.ico
index 03b80a68f8..03b80a68f8 100644
--- a/tests/auto/qicoimageformat/icons/valid/App.ico
+++ b/tests/auto/gui/image/qicoimageformat/icons/valid/App.ico
diff --git a/tests/auto/qicoimageformat/icons/valid/Obj_N2_Internal_Mem.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/Obj_N2_Internal_Mem.ico
index 8da119efdd..8da119efdd 100644
--- a/tests/auto/qicoimageformat/icons/valid/Obj_N2_Internal_Mem.ico
+++ b/tests/auto/gui/image/qicoimageformat/icons/valid/Obj_N2_Internal_Mem.ico
diff --git a/tests/auto/qicoimageformat/icons/valid/Qt.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/Qt.ico
index fef1dee146..fef1dee146 100644
--- a/tests/auto/qicoimageformat/icons/valid/Qt.ico
+++ b/tests/auto/gui/image/qicoimageformat/icons/valid/Qt.ico
diff --git a/tests/auto/qicoimageformat/icons/valid/Status_Play.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/Status_Play.ico
index d05782cce9..d05782cce9 100644
--- a/tests/auto/qicoimageformat/icons/valid/Status_Play.ico
+++ b/tests/auto/gui/image/qicoimageformat/icons/valid/Status_Play.ico
diff --git a/tests/auto/qicoimageformat/icons/valid/TIMER01.ICO b/tests/auto/gui/image/qicoimageformat/icons/valid/TIMER01.ICO
index 5563beec8c..5563beec8c 100644
--- a/tests/auto/qicoimageformat/icons/valid/TIMER01.ICO
+++ b/tests/auto/gui/image/qicoimageformat/icons/valid/TIMER01.ICO
diff --git a/tests/auto/qicoimageformat/icons/valid/WORLD.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/WORLD.ico
index 7a8ab39f56..7a8ab39f56 100644
--- a/tests/auto/qicoimageformat/icons/valid/WORLD.ico
+++ b/tests/auto/gui/image/qicoimageformat/icons/valid/WORLD.ico
diff --git a/tests/auto/qicoimageformat/icons/valid/WORLDH.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/WORLDH.ico
index c2b48f8d99..c2b48f8d99 100644
--- a/tests/auto/qicoimageformat/icons/valid/WORLDH.ico
+++ b/tests/auto/gui/image/qicoimageformat/icons/valid/WORLDH.ico
diff --git a/tests/auto/qicoimageformat/icons/valid/abcardWindow.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/abcardWindow.ico
index e78a15c42b..e78a15c42b 100644
--- a/tests/auto/qicoimageformat/icons/valid/abcardWindow.ico
+++ b/tests/auto/gui/image/qicoimageformat/icons/valid/abcardWindow.ico
diff --git a/tests/auto/qicoimageformat/icons/valid/semitransparent.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/semitransparent.ico
index 893ceb254c..893ceb254c 100644
--- a/tests/auto/qicoimageformat/icons/valid/semitransparent.ico
+++ b/tests/auto/gui/image/qicoimageformat/icons/valid/semitransparent.ico
diff --git a/tests/auto/qicoimageformat/icons/valid/trolltechlogo_tiny.ico b/tests/auto/gui/image/qicoimageformat/icons/valid/trolltechlogo_tiny.ico
index 3e02a53e58..3e02a53e58 100644
--- a/tests/auto/qicoimageformat/icons/valid/trolltechlogo_tiny.ico
+++ b/tests/auto/gui/image/qicoimageformat/icons/valid/trolltechlogo_tiny.ico
diff --git a/tests/auto/qicoimageformat/qicoimageformat.pro b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro
index c150c9af9f..c150c9af9f 100644
--- a/tests/auto/qicoimageformat/qicoimageformat.pro
+++ b/tests/auto/gui/image/qicoimageformat/qicoimageformat.pro
diff --git a/tests/auto/qicoimageformat/tst_qicoimageformat.cpp b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
index 3aace12fdb..3aace12fdb 100644
--- a/tests/auto/qicoimageformat/tst_qicoimageformat.cpp
+++ b/tests/auto/gui/image/qicoimageformat/tst_qicoimageformat.cpp
diff --git a/tests/auto/qicon/.gitignore b/tests/auto/gui/image/qicon/.gitignore
index c101ef9d28..c101ef9d28 100644
--- a/tests/auto/qicon/.gitignore
+++ b/tests/auto/gui/image/qicon/.gitignore
diff --git a/tests/auto/qicon/heart.svg b/tests/auto/gui/image/qicon/heart.svg
index 8c982cd93c..8c982cd93c 100644
--- a/tests/auto/qicon/heart.svg
+++ b/tests/auto/gui/image/qicon/heart.svg
diff --git a/tests/auto/qicon/heart.svgz b/tests/auto/gui/image/qicon/heart.svgz
index 0f0913ffa7..0f0913ffa7 100644
--- a/tests/auto/qicon/heart.svgz
+++ b/tests/auto/gui/image/qicon/heart.svgz
diff --git a/tests/auto/qicon/icons/testtheme/16x16/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/testtheme/16x16/actions/appointment-new.png
index 18b7c6781e..18b7c6781e 100644
--- a/tests/auto/qicon/icons/testtheme/16x16/actions/appointment-new.png
+++ b/tests/auto/gui/image/qicon/icons/testtheme/16x16/actions/appointment-new.png
diff --git a/tests/auto/qicon/icons/testtheme/22x22/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/testtheme/22x22/actions/appointment-new.png
index d676ffd463..d676ffd463 100644
--- a/tests/auto/qicon/icons/testtheme/22x22/actions/appointment-new.png
+++ b/tests/auto/gui/image/qicon/icons/testtheme/22x22/actions/appointment-new.png
diff --git a/tests/auto/qicon/icons/testtheme/32x32/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/testtheme/32x32/actions/appointment-new.png
index 85daef3b0b..85daef3b0b 100644
--- a/tests/auto/qicon/icons/testtheme/32x32/actions/appointment-new.png
+++ b/tests/auto/gui/image/qicon/icons/testtheme/32x32/actions/appointment-new.png
diff --git a/tests/auto/qicon/icons/testtheme/index.theme b/tests/auto/gui/image/qicon/icons/testtheme/index.theme
index e18736ab43..e18736ab43 100644
--- a/tests/auto/qicon/icons/testtheme/index.theme
+++ b/tests/auto/gui/image/qicon/icons/testtheme/index.theme
diff --git a/tests/auto/qicon/icons/testtheme/scalable/actions/svg-only.svg b/tests/auto/gui/image/qicon/icons/testtheme/scalable/actions/svg-only.svg
index 4cb14f82f0..4cb14f82f0 100644
--- a/tests/auto/qicon/icons/testtheme/scalable/actions/svg-only.svg
+++ b/tests/auto/gui/image/qicon/icons/testtheme/scalable/actions/svg-only.svg
diff --git a/tests/auto/qicon/icons/themeparent/16x16/actions/address-book-new.png b/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/address-book-new.png
index 2098cfdf36..2098cfdf36 100644
--- a/tests/auto/qicon/icons/themeparent/16x16/actions/address-book-new.png
+++ b/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/address-book-new.png
diff --git a/tests/auto/qicon/icons/themeparent/16x16/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/appointment-new.png
index 18b7c6781e..18b7c6781e 100644
--- a/tests/auto/qicon/icons/themeparent/16x16/actions/appointment-new.png
+++ b/tests/auto/gui/image/qicon/icons/themeparent/16x16/actions/appointment-new.png
diff --git a/tests/auto/qicon/icons/themeparent/22x22/actions/address-book-new.png b/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/address-book-new.png
index fad446cd92..fad446cd92 100644
--- a/tests/auto/qicon/icons/themeparent/22x22/actions/address-book-new.png
+++ b/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/address-book-new.png
diff --git a/tests/auto/qicon/icons/themeparent/22x22/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/appointment-new.png
index d676ffd463..d676ffd463 100644
--- a/tests/auto/qicon/icons/themeparent/22x22/actions/appointment-new.png
+++ b/tests/auto/gui/image/qicon/icons/themeparent/22x22/actions/appointment-new.png
diff --git a/tests/auto/qicon/icons/themeparent/32x32/actions/address-book-new.png b/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/address-book-new.png
index 420139d307..420139d307 100644
--- a/tests/auto/qicon/icons/themeparent/32x32/actions/address-book-new.png
+++ b/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/address-book-new.png
diff --git a/tests/auto/qicon/icons/themeparent/32x32/actions/appointment-new.png b/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/appointment-new.png
index 85daef3b0b..85daef3b0b 100644
--- a/tests/auto/qicon/icons/themeparent/32x32/actions/appointment-new.png
+++ b/tests/auto/gui/image/qicon/icons/themeparent/32x32/actions/appointment-new.png
diff --git a/tests/auto/qicon/icons/themeparent/index.theme b/tests/auto/gui/image/qicon/icons/themeparent/index.theme
index e536a0bf2f..e536a0bf2f 100644
--- a/tests/auto/qicon/icons/themeparent/index.theme
+++ b/tests/auto/gui/image/qicon/icons/themeparent/index.theme
diff --git a/tests/auto/qicon/icons/themeparent/scalable/actions/address-book-new.svg b/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/address-book-new.svg
index 600a82c1b0..600a82c1b0 100644
--- a/tests/auto/qicon/icons/themeparent/scalable/actions/address-book-new.svg
+++ b/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/address-book-new.svg
diff --git a/tests/auto/qicon/icons/themeparent/scalable/actions/appointment-new.svg b/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/appointment-new.svg
index 4cb14f82f0..4cb14f82f0 100644
--- a/tests/auto/qicon/icons/themeparent/scalable/actions/appointment-new.svg
+++ b/tests/auto/gui/image/qicon/icons/themeparent/scalable/actions/appointment-new.svg
diff --git a/tests/auto/qicon/image.png b/tests/auto/gui/image/qicon/image.png
index 8d703640c1..8d703640c1 100644
--- a/tests/auto/qicon/image.png
+++ b/tests/auto/gui/image/qicon/image.png
diff --git a/tests/auto/qicon/qicon.pro b/tests/auto/gui/image/qicon/qicon.pro
index cc87fae539..cc87fae539 100644
--- a/tests/auto/qicon/qicon.pro
+++ b/tests/auto/gui/image/qicon/qicon.pro
diff --git a/tests/auto/qicon/rect.png b/tests/auto/gui/image/qicon/rect.png
index b5d3ecbddf..b5d3ecbddf 100644
--- a/tests/auto/qicon/rect.png
+++ b/tests/auto/gui/image/qicon/rect.png
diff --git a/tests/auto/qicon/rect.svg b/tests/auto/gui/image/qicon/rect.svg
index 8eb24727be..8eb24727be 100644
--- a/tests/auto/qicon/rect.svg
+++ b/tests/auto/gui/image/qicon/rect.svg
diff --git a/tests/auto/qicon/trash.svg b/tests/auto/gui/image/qicon/trash.svg
index c44e4c75a2..c44e4c75a2 100644
--- a/tests/auto/qicon/trash.svg
+++ b/tests/auto/gui/image/qicon/trash.svg
diff --git a/tests/auto/qicon/tst_qicon.cpp b/tests/auto/gui/image/qicon/tst_qicon.cpp
index 4c430f9435..4c430f9435 100644
--- a/tests/auto/qicon/tst_qicon.cpp
+++ b/tests/auto/gui/image/qicon/tst_qicon.cpp
diff --git a/tests/auto/qicon/tst_qicon.qrc b/tests/auto/gui/image/qicon/tst_qicon.qrc
index 7925a33c84..7925a33c84 100644
--- a/tests/auto/qicon/tst_qicon.qrc
+++ b/tests/auto/gui/image/qicon/tst_qicon.qrc
diff --git a/tests/auto/qimage/.gitignore b/tests/auto/gui/image/qimage/.gitignore
index d8afbffa72..d8afbffa72 100644
--- a/tests/auto/qimage/.gitignore
+++ b/tests/auto/gui/image/qimage/.gitignore
diff --git a/tests/auto/qimage/images/image.bmp b/tests/auto/gui/image/qimage/images/image.bmp
index 39640e43e9..39640e43e9 100644
--- a/tests/auto/qimage/images/image.bmp
+++ b/tests/auto/gui/image/qimage/images/image.bmp
diff --git a/tests/auto/qimage/images/image.gif b/tests/auto/gui/image/qimage/images/image.gif
index 2c5a7f87e9..2c5a7f87e9 100644
--- a/tests/auto/qimage/images/image.gif
+++ b/tests/auto/gui/image/qimage/images/image.gif
diff --git a/tests/auto/qimage/images/image.ico b/tests/auto/gui/image/qimage/images/image.ico
index 7312d20f87..7312d20f87 100644
--- a/tests/auto/qimage/images/image.ico
+++ b/tests/auto/gui/image/qimage/images/image.ico
diff --git a/tests/auto/qimage/images/image.jpg b/tests/auto/gui/image/qimage/images/image.jpg
index 7611322b1b..7611322b1b 100644
--- a/tests/auto/qimage/images/image.jpg
+++ b/tests/auto/gui/image/qimage/images/image.jpg
diff --git a/tests/auto/qimage/images/image.pbm b/tests/auto/gui/image/qimage/images/image.pbm
index 67e5efa3e9..67e5efa3e9 100644
--- a/tests/auto/qimage/images/image.pbm
+++ b/tests/auto/gui/image/qimage/images/image.pbm
diff --git a/tests/auto/qimage/images/image.pgm b/tests/auto/gui/image/qimage/images/image.pgm
index 443bf40964..443bf40964 100644
--- a/tests/auto/qimage/images/image.pgm
+++ b/tests/auto/gui/image/qimage/images/image.pgm
diff --git a/tests/auto/qimage/images/image.png b/tests/auto/gui/image/qimage/images/image.png
index 7d4890a7ff..7d4890a7ff 100644
--- a/tests/auto/qimage/images/image.png
+++ b/tests/auto/gui/image/qimage/images/image.png
diff --git a/tests/auto/qimage/images/image.ppm b/tests/auto/gui/image/qimage/images/image.ppm
index 2a5640e189..2a5640e189 100644
--- a/tests/auto/qimage/images/image.ppm
+++ b/tests/auto/gui/image/qimage/images/image.ppm
diff --git a/tests/auto/qimage/images/image.tif b/tests/auto/gui/image/qimage/images/image.tif
index ee0637cf25..ee0637cf25 100644
--- a/tests/auto/qimage/images/image.tif
+++ b/tests/auto/gui/image/qimage/images/image.tif
diff --git a/tests/auto/qimage/images/image.xbm b/tests/auto/gui/image/qimage/images/image.xbm
index d0e0fcf2c1..d0e0fcf2c1 100644
--- a/tests/auto/qimage/images/image.xbm
+++ b/tests/auto/gui/image/qimage/images/image.xbm
diff --git a/tests/auto/qimage/images/image.xpm b/tests/auto/gui/image/qimage/images/image.xpm
index 264ba401e6..264ba401e6 100644
--- a/tests/auto/qimage/images/image.xpm
+++ b/tests/auto/gui/image/qimage/images/image.xpm
diff --git a/tests/auto/qimage/qimage.pro b/tests/auto/gui/image/qimage/qimage.pro
index b517bc1237..b517bc1237 100644
--- a/tests/auto/qimage/qimage.pro
+++ b/tests/auto/gui/image/qimage/qimage.pro
diff --git a/tests/auto/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index dce2957ae4..dce2957ae4 100644
--- a/tests/auto/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
diff --git a/tests/auto/qimageiohandler/.gitignore b/tests/auto/gui/image/qimageiohandler/.gitignore
index 6ea7bdb667..6ea7bdb667 100644
--- a/tests/auto/qimageiohandler/.gitignore
+++ b/tests/auto/gui/image/qimageiohandler/.gitignore
diff --git a/tests/auto/qimageiohandler/qimageiohandler.pro b/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro
index 46e5cfb2cf..46e5cfb2cf 100644
--- a/tests/auto/qimageiohandler/qimageiohandler.pro
+++ b/tests/auto/gui/image/qimageiohandler/qimageiohandler.pro
diff --git a/tests/auto/qimageiohandler/tst_qimageiohandler.cpp b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
index dd132302f8..dd132302f8 100644
--- a/tests/auto/qimageiohandler/tst_qimageiohandler.cpp
+++ b/tests/auto/gui/image/qimageiohandler/tst_qimageiohandler.cpp
diff --git a/tests/auto/qimagereader/.gitignore b/tests/auto/gui/image/qimagereader/.gitignore
index fdf03f239d..fdf03f239d 100644
--- a/tests/auto/qimagereader/.gitignore
+++ b/tests/auto/gui/image/qimagereader/.gitignore
diff --git a/tests/auto/qimagereader/baseline/35floppy.png b/tests/auto/gui/image/qimagereader/baseline/35floppy.png
index 56b9b44c47..56b9b44c47 100644
--- a/tests/auto/qimagereader/baseline/35floppy.png
+++ b/tests/auto/gui/image/qimagereader/baseline/35floppy.png
diff --git a/tests/auto/qimagereader/baseline/connect.png b/tests/auto/gui/image/qimagereader/baseline/connect.png
index 9544bb9c76..9544bb9c76 100644
--- a/tests/auto/qimagereader/baseline/connect.png
+++ b/tests/auto/gui/image/qimagereader/baseline/connect.png
diff --git a/tests/auto/qimagereader/baseline/kde_favicon.png b/tests/auto/gui/image/qimagereader/baseline/kde_favicon.png
index e19287b49d..e19287b49d 100644
--- a/tests/auto/qimagereader/baseline/kde_favicon.png
+++ b/tests/auto/gui/image/qimagereader/baseline/kde_favicon.png
diff --git a/tests/auto/qimagereader/baseline/semitransparent.png b/tests/auto/gui/image/qimagereader/baseline/semitransparent.png
index a3ad780699..a3ad780699 100644
--- a/tests/auto/qimagereader/baseline/semitransparent.png
+++ b/tests/auto/gui/image/qimagereader/baseline/semitransparent.png
diff --git a/tests/auto/qimagereader/images/16bpp.bmp b/tests/auto/gui/image/qimagereader/images/16bpp.bmp
index 74ce63edd4..74ce63edd4 100644
--- a/tests/auto/qimagereader/images/16bpp.bmp
+++ b/tests/auto/gui/image/qimagereader/images/16bpp.bmp
diff --git a/tests/auto/qimagereader/images/4bpp-rle.bmp b/tests/auto/gui/image/qimagereader/images/4bpp-rle.bmp
index ae71e678fd..ae71e678fd 100644
--- a/tests/auto/qimagereader/images/4bpp-rle.bmp
+++ b/tests/auto/gui/image/qimagereader/images/4bpp-rle.bmp
diff --git a/tests/auto/qimagereader/images/YCbCr_cmyk.jpg b/tests/auto/gui/image/qimagereader/images/YCbCr_cmyk.jpg
index b8aa9ea609..b8aa9ea609 100644
--- a/tests/auto/qimagereader/images/YCbCr_cmyk.jpg
+++ b/tests/auto/gui/image/qimagereader/images/YCbCr_cmyk.jpg
diff --git a/tests/auto/qimagereader/images/YCbCr_cmyk.png b/tests/auto/gui/image/qimagereader/images/YCbCr_cmyk.png
index a24db1b13f..a24db1b13f 100644
--- a/tests/auto/qimagereader/images/YCbCr_cmyk.png
+++ b/tests/auto/gui/image/qimagereader/images/YCbCr_cmyk.png
diff --git a/tests/auto/qimagereader/images/YCbCr_rgb.jpg b/tests/auto/gui/image/qimagereader/images/YCbCr_rgb.jpg
index 8771224cb5..8771224cb5 100644
--- a/tests/auto/qimagereader/images/YCbCr_rgb.jpg
+++ b/tests/auto/gui/image/qimagereader/images/YCbCr_rgb.jpg
diff --git a/tests/auto/qimagereader/images/away.png b/tests/auto/gui/image/qimagereader/images/away.png
index 0e21a37883..0e21a37883 100644
--- a/tests/auto/qimagereader/images/away.png
+++ b/tests/auto/gui/image/qimagereader/images/away.png
diff --git a/tests/auto/qimagereader/images/ball.mng b/tests/auto/gui/image/qimagereader/images/ball.mng
index 81544780fd..81544780fd 100644
--- a/tests/auto/qimagereader/images/ball.mng
+++ b/tests/auto/gui/image/qimagereader/images/ball.mng
diff --git a/tests/auto/qimagereader/images/bat1.gif b/tests/auto/gui/image/qimagereader/images/bat1.gif
index cb6f4f7a8e..cb6f4f7a8e 100644
--- a/tests/auto/qimagereader/images/bat1.gif
+++ b/tests/auto/gui/image/qimagereader/images/bat1.gif
diff --git a/tests/auto/qimagereader/images/bat2.gif b/tests/auto/gui/image/qimagereader/images/bat2.gif
index fbbda4ef76..fbbda4ef76 100644
--- a/tests/auto/qimagereader/images/bat2.gif
+++ b/tests/auto/gui/image/qimagereader/images/bat2.gif
diff --git a/tests/auto/qimagereader/images/beavis.jpg b/tests/auto/gui/image/qimagereader/images/beavis.jpg
index d55504779b..d55504779b 100644
--- a/tests/auto/qimagereader/images/beavis.jpg
+++ b/tests/auto/gui/image/qimagereader/images/beavis.jpg
diff --git a/tests/auto/qimagereader/images/black.png b/tests/auto/gui/image/qimagereader/images/black.png
index 6c94085ed5..6c94085ed5 100644
--- a/tests/auto/qimagereader/images/black.png
+++ b/tests/auto/gui/image/qimagereader/images/black.png
diff --git a/tests/auto/qimagereader/images/black.xpm b/tests/auto/gui/image/qimagereader/images/black.xpm
index d7925bf211..d7925bf211 100644
--- a/tests/auto/qimagereader/images/black.xpm
+++ b/tests/auto/gui/image/qimagereader/images/black.xpm
diff --git a/tests/auto/qimagereader/images/colorful.bmp b/tests/auto/gui/image/qimagereader/images/colorful.bmp
index 8ea6f4acd7..8ea6f4acd7 100644
--- a/tests/auto/qimagereader/images/colorful.bmp
+++ b/tests/auto/gui/image/qimagereader/images/colorful.bmp
diff --git a/tests/auto/qimagereader/images/corrupt-colors.xpm b/tests/auto/gui/image/qimagereader/images/corrupt-colors.xpm
index f8d80edbbc..f8d80edbbc 100644
--- a/tests/auto/qimagereader/images/corrupt-colors.xpm
+++ b/tests/auto/gui/image/qimagereader/images/corrupt-colors.xpm
diff --git a/tests/auto/qimagereader/images/corrupt-data.tif b/tests/auto/gui/image/qimagereader/images/corrupt-data.tif
index d63c688b27..d63c688b27 100644
--- a/tests/auto/qimagereader/images/corrupt-data.tif
+++ b/tests/auto/gui/image/qimagereader/images/corrupt-data.tif
diff --git a/tests/auto/qimagereader/images/corrupt-pixel-count.xpm b/tests/auto/gui/image/qimagereader/images/corrupt-pixel-count.xpm
index 3a736ff262..3a736ff262 100644
--- a/tests/auto/qimagereader/images/corrupt-pixel-count.xpm
+++ b/tests/auto/gui/image/qimagereader/images/corrupt-pixel-count.xpm
diff --git a/tests/auto/qimagereader/images/corrupt-pixels.xpm b/tests/auto/gui/image/qimagereader/images/corrupt-pixels.xpm
index 21031ee604..21031ee604 100644
--- a/tests/auto/qimagereader/images/corrupt-pixels.xpm
+++ b/tests/auto/gui/image/qimagereader/images/corrupt-pixels.xpm
diff --git a/tests/auto/qimagereader/images/corrupt.bmp b/tests/auto/gui/image/qimagereader/images/corrupt.bmp
index 824190bdeb..824190bdeb 100644
--- a/tests/auto/qimagereader/images/corrupt.bmp
+++ b/tests/auto/gui/image/qimagereader/images/corrupt.bmp
diff --git a/tests/auto/qimagereader/images/corrupt.gif b/tests/auto/gui/image/qimagereader/images/corrupt.gif
index 07259454c9..07259454c9 100644
--- a/tests/auto/qimagereader/images/corrupt.gif
+++ b/tests/auto/gui/image/qimagereader/images/corrupt.gif
diff --git a/tests/auto/qimagereader/images/corrupt.jpg b/tests/auto/gui/image/qimagereader/images/corrupt.jpg
index 1959662922..1959662922 100644
--- a/tests/auto/qimagereader/images/corrupt.jpg
+++ b/tests/auto/gui/image/qimagereader/images/corrupt.jpg
diff --git a/tests/auto/qimagereader/images/corrupt.mng b/tests/auto/gui/image/qimagereader/images/corrupt.mng
index 17fd43a5ca..17fd43a5ca 100644
--- a/tests/auto/qimagereader/images/corrupt.mng
+++ b/tests/auto/gui/image/qimagereader/images/corrupt.mng
diff --git a/tests/auto/qimagereader/images/corrupt.png b/tests/auto/gui/image/qimagereader/images/corrupt.png
index 9d8911c64e..9d8911c64e 100644
--- a/tests/auto/qimagereader/images/corrupt.png
+++ b/tests/auto/gui/image/qimagereader/images/corrupt.png
diff --git a/tests/auto/qimagereader/images/corrupt.svg b/tests/auto/gui/image/qimagereader/images/corrupt.svg
index 8747df008f..8747df008f 100644
--- a/tests/auto/qimagereader/images/corrupt.svg
+++ b/tests/auto/gui/image/qimagereader/images/corrupt.svg
diff --git a/tests/auto/qimagereader/images/corrupt.svgz b/tests/auto/gui/image/qimagereader/images/corrupt.svgz
index 67fdceee0b..67fdceee0b 100644
--- a/tests/auto/qimagereader/images/corrupt.svgz
+++ b/tests/auto/gui/image/qimagereader/images/corrupt.svgz
diff --git a/tests/auto/qimagereader/images/corrupt.xbm b/tests/auto/gui/image/qimagereader/images/corrupt.xbm
index 8510634e6d..8510634e6d 100644
--- a/tests/auto/qimagereader/images/corrupt.xbm
+++ b/tests/auto/gui/image/qimagereader/images/corrupt.xbm
diff --git a/tests/auto/qimagereader/images/crash-signed-char.bmp b/tests/auto/gui/image/qimagereader/images/crash-signed-char.bmp
index b35cda6c35..b35cda6c35 100644
--- a/tests/auto/qimagereader/images/crash-signed-char.bmp
+++ b/tests/auto/gui/image/qimagereader/images/crash-signed-char.bmp
diff --git a/tests/auto/qimagereader/images/earth.gif b/tests/auto/gui/image/qimagereader/images/earth.gif
index 2c229eb110..2c229eb110 100644
--- a/tests/auto/qimagereader/images/earth.gif
+++ b/tests/auto/gui/image/qimagereader/images/earth.gif
diff --git a/tests/auto/qimagereader/images/endless-anim.gif b/tests/auto/gui/image/qimagereader/images/endless-anim.gif
index 00df8da786..00df8da786 100644
--- a/tests/auto/qimagereader/images/endless-anim.gif
+++ b/tests/auto/gui/image/qimagereader/images/endless-anim.gif
diff --git a/tests/auto/qimagereader/images/fire.mng b/tests/auto/gui/image/qimagereader/images/fire.mng
index c6695c8369..c6695c8369 100644
--- a/tests/auto/qimagereader/images/fire.mng
+++ b/tests/auto/gui/image/qimagereader/images/fire.mng
diff --git a/tests/auto/qimagereader/images/font.bmp b/tests/auto/gui/image/qimagereader/images/font.bmp
index 28b8c66924..28b8c66924 100644
--- a/tests/auto/qimagereader/images/font.bmp
+++ b/tests/auto/gui/image/qimagereader/images/font.bmp
diff --git a/tests/auto/qimagereader/images/four-frames.gif b/tests/auto/gui/image/qimagereader/images/four-frames.gif
index 6aff2e0af2..6aff2e0af2 100644
--- a/tests/auto/qimagereader/images/four-frames.gif
+++ b/tests/auto/gui/image/qimagereader/images/four-frames.gif
diff --git a/tests/auto/qimagereader/images/gnus.xbm b/tests/auto/gui/image/qimagereader/images/gnus.xbm
index 58d1ac845a..58d1ac845a 100644
--- a/tests/auto/qimagereader/images/gnus.xbm
+++ b/tests/auto/gui/image/qimagereader/images/gnus.xbm
diff --git a/tests/auto/qimagereader/images/grayscale-ref.tif b/tests/auto/gui/image/qimagereader/images/grayscale-ref.tif
index 960531ea86..960531ea86 100644
--- a/tests/auto/qimagereader/images/grayscale-ref.tif
+++ b/tests/auto/gui/image/qimagereader/images/grayscale-ref.tif
diff --git a/tests/auto/qimagereader/images/grayscale.tif b/tests/auto/gui/image/qimagereader/images/grayscale.tif
index 5f4e11429d..5f4e11429d 100644
--- a/tests/auto/qimagereader/images/grayscale.tif
+++ b/tests/auto/gui/image/qimagereader/images/grayscale.tif
diff --git a/tests/auto/qimagereader/images/image.pbm b/tests/auto/gui/image/qimagereader/images/image.pbm
index 67e5efa3e9..67e5efa3e9 100644
--- a/tests/auto/qimagereader/images/image.pbm
+++ b/tests/auto/gui/image/qimagereader/images/image.pbm
diff --git a/tests/auto/qimagereader/images/image.pgm b/tests/auto/gui/image/qimagereader/images/image.pgm
index 443bf40964..443bf40964 100644
--- a/tests/auto/qimagereader/images/image.pgm
+++ b/tests/auto/gui/image/qimagereader/images/image.pgm
diff --git a/tests/auto/qimagereader/images/image.png b/tests/auto/gui/image/qimagereader/images/image.png
index 7d4890a7ff..7d4890a7ff 100644
--- a/tests/auto/qimagereader/images/image.png
+++ b/tests/auto/gui/image/qimagereader/images/image.png
diff --git a/tests/auto/qimagereader/images/image.ppm b/tests/auto/gui/image/qimagereader/images/image.ppm
index 2a5640e189..2a5640e189 100644
--- a/tests/auto/qimagereader/images/image.ppm
+++ b/tests/auto/gui/image/qimagereader/images/image.ppm
diff --git a/tests/auto/qimagereader/images/image_100dpi.tif b/tests/auto/gui/image/qimagereader/images/image_100dpi.tif
index fcf3cd89aa..fcf3cd89aa 100644
--- a/tests/auto/qimagereader/images/image_100dpi.tif
+++ b/tests/auto/gui/image/qimagereader/images/image_100dpi.tif
diff --git a/tests/auto/qimagereader/images/kollada-noext b/tests/auto/gui/image/qimagereader/images/kollada-noext
index 2abd4bb763..2abd4bb763 100644
--- a/tests/auto/qimagereader/images/kollada-noext
+++ b/tests/auto/gui/image/qimagereader/images/kollada-noext
diff --git a/tests/auto/qimagereader/images/kollada.png b/tests/auto/gui/image/qimagereader/images/kollada.png
index 2abd4bb763..2abd4bb763 100644
--- a/tests/auto/qimagereader/images/kollada.png
+++ b/tests/auto/gui/image/qimagereader/images/kollada.png
diff --git a/tests/auto/qimagereader/images/marble.xpm b/tests/auto/gui/image/qimagereader/images/marble.xpm
index 1c08049624..1c08049624 100644
--- a/tests/auto/qimagereader/images/marble.xpm
+++ b/tests/auto/gui/image/qimagereader/images/marble.xpm
diff --git a/tests/auto/qimagereader/images/namedcolors.xpm b/tests/auto/gui/image/qimagereader/images/namedcolors.xpm
index f6485d510e..f6485d510e 100644
--- a/tests/auto/qimagereader/images/namedcolors.xpm
+++ b/tests/auto/gui/image/qimagereader/images/namedcolors.xpm
diff --git a/tests/auto/qimagereader/images/negativeheight.bmp b/tests/auto/gui/image/qimagereader/images/negativeheight.bmp
index 875887acef..875887acef 100644
--- a/tests/auto/qimagereader/images/negativeheight.bmp
+++ b/tests/auto/gui/image/qimagereader/images/negativeheight.bmp
diff --git a/tests/auto/qimagereader/images/noclearcode.bmp b/tests/auto/gui/image/qimagereader/images/noclearcode.bmp
index 1a5ca9c9bd..1a5ca9c9bd 100644
--- a/tests/auto/qimagereader/images/noclearcode.bmp
+++ b/tests/auto/gui/image/qimagereader/images/noclearcode.bmp
diff --git a/tests/auto/qimagereader/images/noclearcode.gif b/tests/auto/gui/image/qimagereader/images/noclearcode.gif
index 27784d61b2..27784d61b2 100644
--- a/tests/auto/qimagereader/images/noclearcode.gif
+++ b/tests/auto/gui/image/qimagereader/images/noclearcode.gif
diff --git a/tests/auto/qimagereader/images/nontransparent.xpm b/tests/auto/gui/image/qimagereader/images/nontransparent.xpm
index 00c21ef7d7..00c21ef7d7 100644
--- a/tests/auto/qimagereader/images/nontransparent.xpm
+++ b/tests/auto/gui/image/qimagereader/images/nontransparent.xpm
diff --git a/tests/auto/qimagereader/images/qt-gif-anim.gif b/tests/auto/gui/image/qimagereader/images/qt-gif-anim.gif
index 8bca4a8354..8bca4a8354 100644
--- a/tests/auto/qimagereader/images/qt-gif-anim.gif
+++ b/tests/auto/gui/image/qimagereader/images/qt-gif-anim.gif
diff --git a/tests/auto/qimagereader/images/qt-gif-noanim.gif b/tests/auto/gui/image/qimagereader/images/qt-gif-noanim.gif
index b6a854067d..b6a854067d 100644
--- a/tests/auto/qimagereader/images/qt-gif-noanim.gif
+++ b/tests/auto/gui/image/qimagereader/images/qt-gif-noanim.gif
diff --git a/tests/auto/qimagereader/images/qt.gif b/tests/auto/gui/image/qimagereader/images/qt.gif
index e0a5a80b13..e0a5a80b13 100644
--- a/tests/auto/qimagereader/images/qt.gif
+++ b/tests/auto/gui/image/qimagereader/images/qt.gif
diff --git a/tests/auto/qimagereader/images/qt1.gif b/tests/auto/gui/image/qimagereader/images/qt1.gif
index 0ce910cee0..0ce910cee0 100644
--- a/tests/auto/qimagereader/images/qt1.gif
+++ b/tests/auto/gui/image/qimagereader/images/qt1.gif
diff --git a/tests/auto/qimagereader/images/qt2.gif b/tests/auto/gui/image/qimagereader/images/qt2.gif
index 993a315d0f..993a315d0f 100644
--- a/tests/auto/qimagereader/images/qt2.gif
+++ b/tests/auto/gui/image/qimagereader/images/qt2.gif
diff --git a/tests/auto/qimagereader/images/qt3.gif b/tests/auto/gui/image/qimagereader/images/qt3.gif
index 7391678a99..7391678a99 100644
--- a/tests/auto/qimagereader/images/qt3.gif
+++ b/tests/auto/gui/image/qimagereader/images/qt3.gif
diff --git a/tests/auto/qimagereader/images/qt4.gif b/tests/auto/gui/image/qimagereader/images/qt4.gif
index 41109a9c3f..41109a9c3f 100644
--- a/tests/auto/qimagereader/images/qt4.gif
+++ b/tests/auto/gui/image/qimagereader/images/qt4.gif
diff --git a/tests/auto/qimagereader/images/qt5.gif b/tests/auto/gui/image/qimagereader/images/qt5.gif
index 5a3fb54ff5..5a3fb54ff5 100644
--- a/tests/auto/qimagereader/images/qt5.gif
+++ b/tests/auto/gui/image/qimagereader/images/qt5.gif
diff --git a/tests/auto/qimagereader/images/qt6.gif b/tests/auto/gui/image/qimagereader/images/qt6.gif
index f22e7c980a..f22e7c980a 100644
--- a/tests/auto/qimagereader/images/qt6.gif
+++ b/tests/auto/gui/image/qimagereader/images/qt6.gif
diff --git a/tests/auto/qimagereader/images/qt7.gif b/tests/auto/gui/image/qimagereader/images/qt7.gif
index a315671417..a315671417 100644
--- a/tests/auto/qimagereader/images/qt7.gif
+++ b/tests/auto/gui/image/qimagereader/images/qt7.gif
diff --git a/tests/auto/qimagereader/images/qt8.gif b/tests/auto/gui/image/qimagereader/images/qt8.gif
index 2a7d09e859..2a7d09e859 100644
--- a/tests/auto/qimagereader/images/qt8.gif
+++ b/tests/auto/gui/image/qimagereader/images/qt8.gif
diff --git a/tests/auto/qimagereader/images/qtbug13653-no_eoi.jpg b/tests/auto/gui/image/qimagereader/images/qtbug13653-no_eoi.jpg
index 605e8a85da..605e8a85da 100644
--- a/tests/auto/qimagereader/images/qtbug13653-no_eoi.jpg
+++ b/tests/auto/gui/image/qimagereader/images/qtbug13653-no_eoi.jpg
diff --git a/tests/auto/qimagereader/images/rect.svg b/tests/auto/gui/image/qimagereader/images/rect.svg
index c56549a69a..c56549a69a 100644
--- a/tests/auto/qimagereader/images/rect.svg
+++ b/tests/auto/gui/image/qimagereader/images/rect.svg
diff --git a/tests/auto/qimagereader/images/rect.svgz b/tests/auto/gui/image/qimagereader/images/rect.svgz
index c2e193b989..c2e193b989 100644
--- a/tests/auto/qimagereader/images/rect.svgz
+++ b/tests/auto/gui/image/qimagereader/images/rect.svgz
diff --git a/tests/auto/qimagereader/images/rgba_adobedeflate_littleendian.tif b/tests/auto/gui/image/qimagereader/images/rgba_adobedeflate_littleendian.tif
index 78868b0d48..78868b0d48 100644
--- a/tests/auto/qimagereader/images/rgba_adobedeflate_littleendian.tif
+++ b/tests/auto/gui/image/qimagereader/images/rgba_adobedeflate_littleendian.tif
diff --git a/tests/auto/qimagereader/images/rgba_lzw_littleendian.tif b/tests/auto/gui/image/qimagereader/images/rgba_lzw_littleendian.tif
index 107eab74e7..107eab74e7 100644
--- a/tests/auto/qimagereader/images/rgba_lzw_littleendian.tif
+++ b/tests/auto/gui/image/qimagereader/images/rgba_lzw_littleendian.tif
diff --git a/tests/auto/qimagereader/images/rgba_nocompression_bigendian.tif b/tests/auto/gui/image/qimagereader/images/rgba_nocompression_bigendian.tif
index c314bae4c0..c314bae4c0 100644
--- a/tests/auto/qimagereader/images/rgba_nocompression_bigendian.tif
+++ b/tests/auto/gui/image/qimagereader/images/rgba_nocompression_bigendian.tif
diff --git a/tests/auto/qimagereader/images/rgba_nocompression_littleendian.tif b/tests/auto/gui/image/qimagereader/images/rgba_nocompression_littleendian.tif
index 4f820f6649..4f820f6649 100644
--- a/tests/auto/qimagereader/images/rgba_nocompression_littleendian.tif
+++ b/tests/auto/gui/image/qimagereader/images/rgba_nocompression_littleendian.tif
diff --git a/tests/auto/qimagereader/images/rgba_packbits_littleendian.tif b/tests/auto/gui/image/qimagereader/images/rgba_packbits_littleendian.tif
index ddeec38fbc..ddeec38fbc 100644
--- a/tests/auto/qimagereader/images/rgba_packbits_littleendian.tif
+++ b/tests/auto/gui/image/qimagereader/images/rgba_packbits_littleendian.tif
diff --git a/tests/auto/qimagereader/images/rgba_zipdeflate_littleendian.tif b/tests/auto/gui/image/qimagereader/images/rgba_zipdeflate_littleendian.tif
index 50a3024246..50a3024246 100644
--- a/tests/auto/qimagereader/images/rgba_zipdeflate_littleendian.tif
+++ b/tests/auto/gui/image/qimagereader/images/rgba_zipdeflate_littleendian.tif
diff --git a/tests/auto/qimagereader/images/runners.ppm b/tests/auto/gui/image/qimagereader/images/runners.ppm
index fda1c97073..fda1c97073 100644
--- a/tests/auto/qimagereader/images/runners.ppm
+++ b/tests/auto/gui/image/qimagereader/images/runners.ppm
diff --git a/tests/auto/qimagereader/images/teapot.ppm b/tests/auto/gui/image/qimagereader/images/teapot.ppm
index b8ab85f3a5..b8ab85f3a5 100644
--- a/tests/auto/qimagereader/images/teapot.ppm
+++ b/tests/auto/gui/image/qimagereader/images/teapot.ppm
diff --git a/tests/auto/qimagereader/images/test.ppm b/tests/auto/gui/image/qimagereader/images/test.ppm
index 05d627c0cb..05d627c0cb 100644
--- a/tests/auto/qimagereader/images/test.ppm
+++ b/tests/auto/gui/image/qimagereader/images/test.ppm
diff --git a/tests/auto/qimagereader/images/test.xpm b/tests/auto/gui/image/qimagereader/images/test.xpm
index 5fcf075b7f..5fcf075b7f 100644
--- a/tests/auto/qimagereader/images/test.xpm
+++ b/tests/auto/gui/image/qimagereader/images/test.xpm
diff --git a/tests/auto/qimagereader/images/test32bfv4.bmp b/tests/auto/gui/image/qimagereader/images/test32bfv4.bmp
index 37060373ed..37060373ed 100644
--- a/tests/auto/qimagereader/images/test32bfv4.bmp
+++ b/tests/auto/gui/image/qimagereader/images/test32bfv4.bmp
diff --git a/tests/auto/qimagereader/images/test32v5.bmp b/tests/auto/gui/image/qimagereader/images/test32v5.bmp
index 8ad3cfa60d..8ad3cfa60d 100644
--- a/tests/auto/qimagereader/images/test32v5.bmp
+++ b/tests/auto/gui/image/qimagereader/images/test32v5.bmp
diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_1.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_1.tiff
index 3fcb8a9aca..3fcb8a9aca 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_1.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_1.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_2.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_2.tiff
index 6f3e9d5297..6f3e9d5297 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_2.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_2.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_3.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_3.tiff
index aab9cf2596..aab9cf2596 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_3.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_3.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_4.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_4.tiff
index aad96ffc6c..aad96ffc6c 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_4.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_4.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_5.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_5.tiff
index 05d23dcb86..05d23dcb86 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_5.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_5.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_6.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_6.tiff
index 9ffe7fcaa4..9ffe7fcaa4 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_6.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_6.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_7.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_7.tiff
index eeeb01937e..eeeb01937e 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_7.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_7.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_8.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_8.tiff
index 87cf2fd774..87cf2fd774 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/indexed_orientation_8.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/indexed_orientation_8.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_1.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_1.tiff
index 3b589b2232..3b589b2232 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_1.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_1.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_2.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_2.tiff
index 9a662239db..9a662239db 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_2.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_2.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_3.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_3.tiff
index eed242388c..eed242388c 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_3.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_3.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_4.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_4.tiff
index 055480e0ca..055480e0ca 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_4.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_4.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_5.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_5.tiff
index b4d0974ec8..b4d0974ec8 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_5.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_5.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_6.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_6.tiff
index 3b1e02af56..3b1e02af56 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_6.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_6.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_7.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_7.tiff
index b752c745c3..b752c745c3 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_7.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_7.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_8.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_8.tiff
index e228d05659..e228d05659 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/mono_orientation_8.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/mono_orientation_8.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/original_indexed.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/original_indexed.tiff
index 7507e526a5..7507e526a5 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/original_indexed.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/original_indexed.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/original_mono.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/original_mono.tiff
index 8ff9db80f5..8ff9db80f5 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/original_mono.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/original_mono.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/original_rgb.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/original_rgb.tiff
index 321ea3ebf5..321ea3ebf5 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/original_rgb.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/original_rgb.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_1.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_1.tiff
index 2756a82fbb..2756a82fbb 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_1.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_1.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_2.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_2.tiff
index ae9af0999d..ae9af0999d 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_2.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_2.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_3.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_3.tiff
index a2f432526b..a2f432526b 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_3.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_3.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_4.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_4.tiff
index f35bfc4c9c..f35bfc4c9c 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_4.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_4.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_5.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_5.tiff
index 70e5478065..70e5478065 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_5.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_5.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_6.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_6.tiff
index b2635fe14f..b2635fe14f 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_6.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_6.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_7.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_7.tiff
index 1fb0cd9df6..1fb0cd9df6 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_7.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_7.tiff
diff --git a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_8.tiff b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_8.tiff
index 666b1b4c55..666b1b4c55 100644
--- a/tests/auto/qimagereader/images/tiff_oriented/rgb_orientation_8.tiff
+++ b/tests/auto/gui/image/qimagereader/images/tiff_oriented/rgb_orientation_8.tiff
diff --git a/tests/auto/qimagereader/images/transparent.xpm b/tests/auto/gui/image/qimagereader/images/transparent.xpm
index 5ddcf0b00e..5ddcf0b00e 100644
--- a/tests/auto/qimagereader/images/transparent.xpm
+++ b/tests/auto/gui/image/qimagereader/images/transparent.xpm
diff --git a/tests/auto/qimagereader/images/trolltech.gif b/tests/auto/gui/image/qimagereader/images/trolltech.gif
index f674369efc..f674369efc 100644
--- a/tests/auto/qimagereader/images/trolltech.gif
+++ b/tests/auto/gui/image/qimagereader/images/trolltech.gif
diff --git a/tests/auto/qimagereader/images/tst7.bmp b/tests/auto/gui/image/qimagereader/images/tst7.bmp
index 6d3ac9241c..6d3ac9241c 100644
--- a/tests/auto/qimagereader/images/tst7.bmp
+++ b/tests/auto/gui/image/qimagereader/images/tst7.bmp
diff --git a/tests/auto/qimagereader/images/tst7.png b/tests/auto/gui/image/qimagereader/images/tst7.png
index 96efae4e79..96efae4e79 100644
--- a/tests/auto/qimagereader/images/tst7.png
+++ b/tests/auto/gui/image/qimagereader/images/tst7.png
diff --git a/tests/auto/qimagereader/images/txts.png b/tests/auto/gui/image/qimagereader/images/txts.png
index 99be1eb4f9..99be1eb4f9 100755
--- a/tests/auto/qimagereader/images/txts.png
+++ b/tests/auto/gui/image/qimagereader/images/txts.png
diff --git a/tests/auto/qimagereader/qimagereader.pro b/tests/auto/gui/image/qimagereader/qimagereader.pro
index 43d587ea48..43d587ea48 100644
--- a/tests/auto/qimagereader/qimagereader.pro
+++ b/tests/auto/gui/image/qimagereader/qimagereader.pro
diff --git a/tests/auto/qimagereader/qimagereader.qrc b/tests/auto/gui/image/qimagereader/qimagereader.qrc
index 2c70652389..2c70652389 100644
--- a/tests/auto/qimagereader/qimagereader.qrc
+++ b/tests/auto/gui/image/qimagereader/qimagereader.qrc
diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index 6359468597..ffedc69a7f 100644
--- a/tests/auto/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -55,7 +55,7 @@
 #include <QTcpServer>
 #include <QTimer>
 
-#include "../platformquirks.h"
+#include "../../../platformquirks.h"
 
 #if defined(Q_OS_SYMBIAN)
 # define SRCDIR "."
diff --git a/tests/auto/qimagewriter/.gitignore b/tests/auto/gui/image/qimagewriter/.gitignore
index 9355bcd1bf..9355bcd1bf 100644
--- a/tests/auto/qimagewriter/.gitignore
+++ b/tests/auto/gui/image/qimagewriter/.gitignore
diff --git a/tests/auto/qimagewriter/images/YCbCr_cmyk.jpg b/tests/auto/gui/image/qimagewriter/images/YCbCr_cmyk.jpg
index b8aa9ea609..b8aa9ea609 100644
--- a/tests/auto/qimagewriter/images/YCbCr_cmyk.jpg
+++ b/tests/auto/gui/image/qimagewriter/images/YCbCr_cmyk.jpg
diff --git a/tests/auto/qimagewriter/images/YCbCr_rgb.jpg b/tests/auto/gui/image/qimagewriter/images/YCbCr_rgb.jpg
index 8771224cb5..8771224cb5 100644
--- a/tests/auto/qimagewriter/images/YCbCr_rgb.jpg
+++ b/tests/auto/gui/image/qimagewriter/images/YCbCr_rgb.jpg
diff --git a/tests/auto/qimagewriter/images/beavis.jpg b/tests/auto/gui/image/qimagewriter/images/beavis.jpg
index d55504779b..d55504779b 100644
--- a/tests/auto/qimagewriter/images/beavis.jpg
+++ b/tests/auto/gui/image/qimagewriter/images/beavis.jpg
diff --git a/tests/auto/qimagewriter/images/colorful.bmp b/tests/auto/gui/image/qimagewriter/images/colorful.bmp
index 8ea6f4acd7..8ea6f4acd7 100644
--- a/tests/auto/qimagewriter/images/colorful.bmp
+++ b/tests/auto/gui/image/qimagewriter/images/colorful.bmp
diff --git a/tests/auto/qimagewriter/images/earth.gif b/tests/auto/gui/image/qimagewriter/images/earth.gif
index 2c229eb110..2c229eb110 100644
--- a/tests/auto/qimagewriter/images/earth.gif
+++ b/tests/auto/gui/image/qimagewriter/images/earth.gif
diff --git a/tests/auto/qimagewriter/images/font.bmp b/tests/auto/gui/image/qimagewriter/images/font.bmp
index 28b8c66924..28b8c66924 100644
--- a/tests/auto/qimagewriter/images/font.bmp
+++ b/tests/auto/gui/image/qimagewriter/images/font.bmp
diff --git a/tests/auto/qimagewriter/images/gnus.xbm b/tests/auto/gui/image/qimagewriter/images/gnus.xbm
index 58d1ac845a..58d1ac845a 100644
--- a/tests/auto/qimagewriter/images/gnus.xbm
+++ b/tests/auto/gui/image/qimagewriter/images/gnus.xbm
diff --git a/tests/auto/qimagewriter/images/kollada.png b/tests/auto/gui/image/qimagewriter/images/kollada.png
index 2abd4bb763..2abd4bb763 100644
--- a/tests/auto/qimagewriter/images/kollada.png
+++ b/tests/auto/gui/image/qimagewriter/images/kollada.png
diff --git a/tests/auto/qimagewriter/images/marble.xpm b/tests/auto/gui/image/qimagewriter/images/marble.xpm
index e59830bbe9..e59830bbe9 100644
--- a/tests/auto/qimagewriter/images/marble.xpm
+++ b/tests/auto/gui/image/qimagewriter/images/marble.xpm
diff --git a/tests/auto/qimagewriter/images/ship63.pbm b/tests/auto/gui/image/qimagewriter/images/ship63.pbm
index 4da971a2d7..4da971a2d7 100644
--- a/tests/auto/qimagewriter/images/ship63.pbm
+++ b/tests/auto/gui/image/qimagewriter/images/ship63.pbm
diff --git a/tests/auto/qimagewriter/images/teapot.ppm b/tests/auto/gui/image/qimagewriter/images/teapot.ppm
index b8ab85f3a5..b8ab85f3a5 100644
--- a/tests/auto/qimagewriter/images/teapot.ppm
+++ b/tests/auto/gui/image/qimagewriter/images/teapot.ppm
diff --git a/tests/auto/qimagewriter/images/teapot.tiff b/tests/auto/gui/image/qimagewriter/images/teapot.tiff
index 20845c6e32..20845c6e32 100644
--- a/tests/auto/qimagewriter/images/teapot.tiff
+++ b/tests/auto/gui/image/qimagewriter/images/teapot.tiff
diff --git a/tests/auto/qimagewriter/images/trolltech.gif b/tests/auto/gui/image/qimagewriter/images/trolltech.gif
index f674369efc..f674369efc 100644
--- a/tests/auto/qimagewriter/images/trolltech.gif
+++ b/tests/auto/gui/image/qimagewriter/images/trolltech.gif
diff --git a/tests/auto/qimagewriter/qimagewriter.pro b/tests/auto/gui/image/qimagewriter/qimagewriter.pro
index 0fc40d0f0a..0fc40d0f0a 100644
--- a/tests/auto/qimagewriter/qimagewriter.pro
+++ b/tests/auto/gui/image/qimagewriter/qimagewriter.pro
diff --git a/tests/auto/qimagewriter/tst_qimagewriter.cpp b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
index b119763723..b119763723 100644
--- a/tests/auto/qimagewriter/tst_qimagewriter.cpp
+++ b/tests/auto/gui/image/qimagewriter/tst_qimagewriter.cpp
diff --git a/tests/auto/qmovie/.gitignore b/tests/auto/gui/image/qmovie/.gitignore
index 396e8cbc7d..396e8cbc7d 100644
--- a/tests/auto/qmovie/.gitignore
+++ b/tests/auto/gui/image/qmovie/.gitignore
diff --git a/tests/auto/qmovie/animations/comicsecard.gif b/tests/auto/gui/image/qmovie/animations/comicsecard.gif
index f064de065b..f064de065b 100644
--- a/tests/auto/qmovie/animations/comicsecard.gif
+++ b/tests/auto/gui/image/qmovie/animations/comicsecard.gif
diff --git a/tests/auto/qmovie/animations/corrupt.gif b/tests/auto/gui/image/qmovie/animations/corrupt.gif
index c1545eb0ed..c1545eb0ed 100644
--- a/tests/auto/qmovie/animations/corrupt.gif
+++ b/tests/auto/gui/image/qmovie/animations/corrupt.gif
diff --git a/tests/auto/qmovie/animations/dutch.mng b/tests/auto/gui/image/qmovie/animations/dutch.mng
index 4917fdee7a..4917fdee7a 100644
--- a/tests/auto/qmovie/animations/dutch.mng
+++ b/tests/auto/gui/image/qmovie/animations/dutch.mng
diff --git a/tests/auto/qmovie/animations/trolltech.gif b/tests/auto/gui/image/qmovie/animations/trolltech.gif
index df7eb92703..df7eb92703 100644
--- a/tests/auto/qmovie/animations/trolltech.gif
+++ b/tests/auto/gui/image/qmovie/animations/trolltech.gif
diff --git a/tests/auto/qmovie/qmovie.pro b/tests/auto/gui/image/qmovie/qmovie.pro
index 3e085ceeaf..3e085ceeaf 100644
--- a/tests/auto/qmovie/qmovie.pro
+++ b/tests/auto/gui/image/qmovie/qmovie.pro
diff --git a/tests/auto/qmovie/resources.qrc b/tests/auto/gui/image/qmovie/resources.qrc
index ce459a0e7e..ce459a0e7e 100644
--- a/tests/auto/qmovie/resources.qrc
+++ b/tests/auto/gui/image/qmovie/resources.qrc
diff --git a/tests/auto/qmovie/tst_qmovie.cpp b/tests/auto/gui/image/qmovie/tst_qmovie.cpp
index 15c7f856b1..15c7f856b1 100644
--- a/tests/auto/qmovie/tst_qmovie.cpp
+++ b/tests/auto/gui/image/qmovie/tst_qmovie.cpp
diff --git a/tests/auto/qpicture/.gitignore b/tests/auto/gui/image/qpicture/.gitignore
index 0f391ffb80..0f391ffb80 100644
--- a/tests/auto/qpicture/.gitignore
+++ b/tests/auto/gui/image/qpicture/.gitignore
diff --git a/tests/auto/qpicture/qpicture.pro b/tests/auto/gui/image/qpicture/qpicture.pro
index eb96b73487..eb96b73487 100644
--- a/tests/auto/qpicture/qpicture.pro
+++ b/tests/auto/gui/image/qpicture/qpicture.pro
diff --git a/tests/auto/qpicture/tst_qpicture.cpp b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
index 8661a2b2d0..8661a2b2d0 100644
--- a/tests/auto/qpicture/tst_qpicture.cpp
+++ b/tests/auto/gui/image/qpicture/tst_qpicture.cpp
diff --git a/tests/auto/qpixmap/.gitignore b/tests/auto/gui/image/qpixmap/.gitignore
index 8d4996f365..8d4996f365 100644
--- a/tests/auto/qpixmap/.gitignore
+++ b/tests/auto/gui/image/qpixmap/.gitignore
diff --git a/tests/auto/qpixmap/convertFromImage/task31722_0/img1.png b/tests/auto/gui/image/qpixmap/convertFromImage/task31722_0/img1.png
index 7991e9fb17..7991e9fb17 100644
--- a/tests/auto/qpixmap/convertFromImage/task31722_0/img1.png
+++ b/tests/auto/gui/image/qpixmap/convertFromImage/task31722_0/img1.png
diff --git a/tests/auto/qpixmap/convertFromImage/task31722_0/img2.png b/tests/auto/gui/image/qpixmap/convertFromImage/task31722_0/img2.png
index dca6d97dc3..dca6d97dc3 100644
--- a/tests/auto/qpixmap/convertFromImage/task31722_0/img2.png
+++ b/tests/auto/gui/image/qpixmap/convertFromImage/task31722_0/img2.png
diff --git a/tests/auto/qpixmap/convertFromImage/task31722_1/img1.png b/tests/auto/gui/image/qpixmap/convertFromImage/task31722_1/img1.png
index 31e6e1aaa0..31e6e1aaa0 100644
--- a/tests/auto/qpixmap/convertFromImage/task31722_1/img1.png
+++ b/tests/auto/gui/image/qpixmap/convertFromImage/task31722_1/img1.png
diff --git a/tests/auto/qpixmap/convertFromImage/task31722_1/img2.png b/tests/auto/gui/image/qpixmap/convertFromImage/task31722_1/img2.png
index 0d48026898..0d48026898 100644
--- a/tests/auto/qpixmap/convertFromImage/task31722_1/img2.png
+++ b/tests/auto/gui/image/qpixmap/convertFromImage/task31722_1/img2.png
diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp.ico b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp.ico
index dbb55cd4db..dbb55cd4db 100644
--- a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp.ico
+++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp.ico
diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp_16x16.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_16x16.png
index f23f39818c..f23f39818c 100644
--- a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp_16x16.png
+++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_16x16.png
diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp_256x256.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_256x256.png
index 293f1c5942..293f1c5942 100644
--- a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp_256x256.png
+++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_256x256.png
diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp_32x32.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_32x32.png
index bfdb1fe035..bfdb1fe035 100644
--- a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp_32x32.png
+++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_32x32.png
diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp_48x48.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_48x48.png
index 7dd2d13351..7dd2d13351 100644
--- a/tests/auto/qpixmap/convertFromToHICON/icon_32bpp_48x48.png
+++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_32bpp_48x48.png
diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_8bpp.ico b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp.ico
index 4341a3355e..4341a3355e 100644
--- a/tests/auto/qpixmap/convertFromToHICON/icon_8bpp.ico
+++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp.ico
diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_8bpp_16x16.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_16x16.png
index e9a995e19e..e9a995e19e 100644
--- a/tests/auto/qpixmap/convertFromToHICON/icon_8bpp_16x16.png
+++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_16x16.png
diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_8bpp_32x32.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_32x32.png
index 41ef57f94d..41ef57f94d 100644
--- a/tests/auto/qpixmap/convertFromToHICON/icon_8bpp_32x32.png
+++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_32x32.png
diff --git a/tests/auto/qpixmap/convertFromToHICON/icon_8bpp_48x48.png b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_48x48.png
index 35d60d138b..35d60d138b 100644
--- a/tests/auto/qpixmap/convertFromToHICON/icon_8bpp_48x48.png
+++ b/tests/auto/gui/image/qpixmap/convertFromToHICON/icon_8bpp_48x48.png
diff --git a/tests/auto/qpixmap/images/designer.png b/tests/auto/gui/image/qpixmap/images/designer.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/images/designer.png
+++ b/tests/auto/gui/image/qpixmap/images/designer.png
diff --git a/tests/auto/qpixmap/images/dx_-10_dy_-10_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_50_50_100_100.png
index a4a19249c7..a4a19249c7 100644
--- a/tests/auto/qpixmap/images/dx_-10_dy_-10_50_50_100_100.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_50_50_100_100.png
diff --git a/tests/auto/qpixmap/images/dx_-10_dy_-10_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_x_y_w_h.png
index 1506af5a7e..1506af5a7e 100644
--- a/tests/auto/qpixmap/images/dx_-10_dy_-10_x_y_w_h.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_-10_x_y_w_h.png
diff --git a/tests/auto/qpixmap/images/dx_-10_dy_0_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_50_50_100_100.png
index 8500ab1f5c..8500ab1f5c 100644
--- a/tests/auto/qpixmap/images/dx_-10_dy_0_50_50_100_100.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_50_50_100_100.png
diff --git a/tests/auto/qpixmap/images/dx_-10_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_x_y_w_h.png
index 2145c6124c..2145c6124c 100644
--- a/tests/auto/qpixmap/images/dx_-10_dy_0_x_y_w_h.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_-10_dy_0_x_y_w_h.png
diff --git a/tests/auto/qpixmap/images/dx_-128_dy_-128_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_-128_dy_-128_x_y_w_h.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/images/dx_-128_dy_-128_x_y_w_h.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_-128_dy_-128_x_y_w_h.png
diff --git a/tests/auto/qpixmap/images/dx_-128_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_-128_dy_0_x_y_w_h.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/images/dx_-128_dy_0_x_y_w_h.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_-128_dy_0_x_y_w_h.png
diff --git a/tests/auto/qpixmap/images/dx_0_dy_-10_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_50_50_100_100.png
index 728ee79153..728ee79153 100644
--- a/tests/auto/qpixmap/images/dx_0_dy_-10_50_50_100_100.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_50_50_100_100.png
diff --git a/tests/auto/qpixmap/images/dx_0_dy_-10_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_x_y_w_h.png
index e9d5850db7..e9d5850db7 100644
--- a/tests/auto/qpixmap/images/dx_0_dy_-10_x_y_w_h.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-10_x_y_w_h.png
diff --git a/tests/auto/qpixmap/images/dx_0_dy_-128_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-128_x_y_w_h.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/images/dx_0_dy_-128_x_y_w_h.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_-128_x_y_w_h.png
diff --git a/tests/auto/qpixmap/images/dx_0_dy_0_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_50_50_100_100.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/images/dx_0_dy_0_50_50_100_100.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_50_50_100_100.png
diff --git a/tests/auto/qpixmap/images/dx_0_dy_0_null.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_null.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/images/dx_0_dy_0_null.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_null.png
diff --git a/tests/auto/qpixmap/images/dx_0_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_x_y_w_h.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/images/dx_0_dy_0_x_y_w_h.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_0_x_y_w_h.png
diff --git a/tests/auto/qpixmap/images/dx_0_dy_10_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_10_50_50_100_100.png
index 7c09b17830..7c09b17830 100644
--- a/tests/auto/qpixmap/images/dx_0_dy_10_50_50_100_100.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_10_50_50_100_100.png
diff --git a/tests/auto/qpixmap/images/dx_0_dy_10_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_10_x_y_w_h.png
index 70a63405e6..70a63405e6 100644
--- a/tests/auto/qpixmap/images/dx_0_dy_10_x_y_w_h.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_10_x_y_w_h.png
diff --git a/tests/auto/qpixmap/images/dx_0_dy_128_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_128_x_y_w_h.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/images/dx_0_dy_128_x_y_w_h.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_128_x_y_w_h.png
diff --git a/tests/auto/qpixmap/images/dx_0_dy_1_null.png b/tests/auto/gui/image/qpixmap/images/dx_0_dy_1_null.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/images/dx_0_dy_1_null.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_0_dy_1_null.png
diff --git a/tests/auto/qpixmap/images/dx_10_dy_0_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_10_dy_0_50_50_100_100.png
index 85abadaf98..85abadaf98 100644
--- a/tests/auto/qpixmap/images/dx_10_dy_0_50_50_100_100.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_10_dy_0_50_50_100_100.png
diff --git a/tests/auto/qpixmap/images/dx_10_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_10_dy_0_x_y_w_h.png
index 3e03450c01..3e03450c01 100644
--- a/tests/auto/qpixmap/images/dx_10_dy_0_x_y_w_h.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_10_dy_0_x_y_w_h.png
diff --git a/tests/auto/qpixmap/images/dx_10_dy_10_50_50_100_100.png b/tests/auto/gui/image/qpixmap/images/dx_10_dy_10_50_50_100_100.png
index 315fbe087a..315fbe087a 100644
--- a/tests/auto/qpixmap/images/dx_10_dy_10_50_50_100_100.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_10_dy_10_50_50_100_100.png
diff --git a/tests/auto/qpixmap/images/dx_10_dy_10_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_10_dy_10_x_y_w_h.png
index d91dc71217..d91dc71217 100644
--- a/tests/auto/qpixmap/images/dx_10_dy_10_x_y_w_h.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_10_dy_10_x_y_w_h.png
diff --git a/tests/auto/qpixmap/images/dx_128_dy_0_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_128_dy_0_x_y_w_h.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/images/dx_128_dy_0_x_y_w_h.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_128_dy_0_x_y_w_h.png
diff --git a/tests/auto/qpixmap/images/dx_128_dy_128_64_64_128_128.png b/tests/auto/gui/image/qpixmap/images/dx_128_dy_128_64_64_128_128.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/images/dx_128_dy_128_64_64_128_128.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_128_dy_128_64_64_128_128.png
diff --git a/tests/auto/qpixmap/images/dx_128_dy_128_x_y_w_h.png b/tests/auto/gui/image/qpixmap/images/dx_128_dy_128_x_y_w_h.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/images/dx_128_dy_128_x_y_w_h.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_128_dy_128_x_y_w_h.png
diff --git a/tests/auto/qpixmap/images/dx_1_dy_0_null.png b/tests/auto/gui/image/qpixmap/images/dx_1_dy_0_null.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/images/dx_1_dy_0_null.png
+++ b/tests/auto/gui/image/qpixmap/images/dx_1_dy_0_null.png
diff --git a/tests/auto/qpixmap/loadFromData/designer_argb32.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_argb32.png
index 55d8247cfc..55d8247cfc 100644
--- a/tests/auto/qpixmap/loadFromData/designer_argb32.png
+++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_argb32.png
diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha.gif b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.gif
index 26a6da33df..26a6da33df 100644
--- a/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha.gif
+++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.gif
diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.png
index 28cd2f06d1..28cd2f06d1 100644
--- a/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha.png
+++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha.png
diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif
index 86a3a2e17d..86a3a2e17d 100644
--- a/tests/auto/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif
+++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_no_alpha_animated.gif
diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_with_alpha.gif b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.gif
index 49ec77b39b..49ec77b39b 100644
--- a/tests/auto/qpixmap/loadFromData/designer_indexed8_with_alpha.gif
+++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.gif
diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_with_alpha.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.png
index 09735a9752..09735a9752 100644
--- a/tests/auto/qpixmap/loadFromData/designer_indexed8_with_alpha.png
+++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha.png
diff --git a/tests/auto/qpixmap/loadFromData/designer_indexed8_with_alpha_animated.gif b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha_animated.gif
index f813c057d2..f813c057d2 100644
--- a/tests/auto/qpixmap/loadFromData/designer_indexed8_with_alpha_animated.gif
+++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_indexed8_with_alpha_animated.gif
diff --git a/tests/auto/qpixmap/loadFromData/designer_rgb32.jpg b/tests/auto/gui/image/qpixmap/loadFromData/designer_rgb32.jpg
index 70f39c2154..70f39c2154 100644
--- a/tests/auto/qpixmap/loadFromData/designer_rgb32.jpg
+++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_rgb32.jpg
diff --git a/tests/auto/qpixmap/loadFromData/designer_rgb32.png b/tests/auto/gui/image/qpixmap/loadFromData/designer_rgb32.png
index bca471d576..bca471d576 100644
--- a/tests/auto/qpixmap/loadFromData/designer_rgb32.png
+++ b/tests/auto/gui/image/qpixmap/loadFromData/designer_rgb32.png
diff --git a/tests/auto/qpixmap/qpixmap.pro b/tests/auto/gui/image/qpixmap/qpixmap.pro
index fe156d547c..fe156d547c 100644
--- a/tests/auto/qpixmap/qpixmap.pro
+++ b/tests/auto/gui/image/qpixmap/qpixmap.pro
diff --git a/tests/auto/qpixmap/qpixmap.qrc b/tests/auto/gui/image/qpixmap/qpixmap.qrc
index 99fde61a29..99fde61a29 100644
--- a/tests/auto/qpixmap/qpixmap.qrc
+++ b/tests/auto/gui/image/qpixmap/qpixmap.qrc
diff --git a/tests/auto/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
index 38858e5503..38858e5503 100644
--- a/tests/auto/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
diff --git a/tests/auto/qpixmapcache/.gitignore b/tests/auto/gui/image/qpixmapcache/.gitignore
index 2bc572c2dd..2bc572c2dd 100644
--- a/tests/auto/qpixmapcache/.gitignore
+++ b/tests/auto/gui/image/qpixmapcache/.gitignore
diff --git a/tests/auto/qpixmapcache/qpixmapcache.pro b/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro
index 1ffafd6c25..1ffafd6c25 100644
--- a/tests/auto/qpixmapcache/qpixmapcache.pro
+++ b/tests/auto/gui/image/qpixmapcache/qpixmapcache.pro
diff --git a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp b/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp
index 9f7192dc1c..9f7192dc1c 100644
--- a/tests/auto/qpixmapcache/tst_qpixmapcache.cpp
+++ b/tests/auto/gui/image/qpixmapcache/tst_qpixmapcache.cpp
diff --git a/tests/auto/qpixmapfilter/noise.png b/tests/auto/gui/image/qpixmapfilter/noise.png
index 1bebaf528e..1bebaf528e 100644
--- a/tests/auto/qpixmapfilter/noise.png
+++ b/tests/auto/gui/image/qpixmapfilter/noise.png
diff --git a/tests/auto/qpixmapfilter/qpixmapfilter.pro b/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro
index 21e10b7ab9..21e10b7ab9 100644
--- a/tests/auto/qpixmapfilter/qpixmapfilter.pro
+++ b/tests/auto/gui/image/qpixmapfilter/qpixmapfilter.pro
diff --git a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp b/tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp
index 5634285ad4..5634285ad4 100644
--- a/tests/auto/qpixmapfilter/tst_qpixmapfilter.cpp
+++ b/tests/auto/gui/image/qpixmapfilter/tst_qpixmapfilter.cpp
diff --git a/tests/auto/qvolatileimage/qvolatileimage.pro b/tests/auto/gui/image/qvolatileimage/qvolatileimage.pro
index 45d80b85f2..45d80b85f2 100644
--- a/tests/auto/qvolatileimage/qvolatileimage.pro
+++ b/tests/auto/gui/image/qvolatileimage/qvolatileimage.pro
diff --git a/tests/auto/qvolatileimage/tst_qvolatileimage.cpp b/tests/auto/gui/image/qvolatileimage/tst_qvolatileimage.cpp
index bacca66dcd..bacca66dcd 100644
--- a/tests/auto/qvolatileimage/tst_qvolatileimage.cpp
+++ b/tests/auto/gui/image/qvolatileimage/tst_qvolatileimage.cpp
diff --git a/tests/auto/gui/kernel/kernel.pro b/tests/auto/gui/kernel/kernel.pro
new file mode 100644
index 0000000000..880c3c8613
--- /dev/null
+++ b/tests/auto/gui/kernel/kernel.pro
@@ -0,0 +1,17 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qclipboard \
+   qdrag \
+   qevent \
+   qfileopenevent \
+   qguivariant \
+   qkeysequence \
+   qmouseevent \
+   qmouseevent_modal \
+   qpalette \
+   qshortcut \
+   qtouchevent \
+
+symbian {
+    SUBDIRS += qsoftkeymanager
+}
diff --git a/tests/auto/qclipboard/.gitignore b/tests/auto/gui/kernel/qclipboard/.gitignore
index 4fcf7d55fc..4fcf7d55fc 100644
--- a/tests/auto/qclipboard/.gitignore
+++ b/tests/auto/gui/kernel/qclipboard/.gitignore
diff --git a/tests/auto/qclipboard/copier/copier.pro b/tests/auto/gui/kernel/qclipboard/copier/copier.pro
index d345d33eb5..d345d33eb5 100644
--- a/tests/auto/qclipboard/copier/copier.pro
+++ b/tests/auto/gui/kernel/qclipboard/copier/copier.pro
diff --git a/tests/auto/qclipboard/copier/main.cpp b/tests/auto/gui/kernel/qclipboard/copier/main.cpp
index e4417352ff..e4417352ff 100644
--- a/tests/auto/qclipboard/copier/main.cpp
+++ b/tests/auto/gui/kernel/qclipboard/copier/main.cpp
diff --git a/tests/auto/qclipboard/paster/main.cpp b/tests/auto/gui/kernel/qclipboard/paster/main.cpp
index 4df4d7fb45..4df4d7fb45 100644
--- a/tests/auto/qclipboard/paster/main.cpp
+++ b/tests/auto/gui/kernel/qclipboard/paster/main.cpp
diff --git a/tests/auto/qclipboard/paster/paster.pro b/tests/auto/gui/kernel/qclipboard/paster/paster.pro
index d214c9e90a..d214c9e90a 100644
--- a/tests/auto/qclipboard/paster/paster.pro
+++ b/tests/auto/gui/kernel/qclipboard/paster/paster.pro
diff --git a/tests/auto/qclipboard/qclipboard.pro b/tests/auto/gui/kernel/qclipboard/qclipboard.pro
index 692ca5dd3f..692ca5dd3f 100644
--- a/tests/auto/qclipboard/qclipboard.pro
+++ b/tests/auto/gui/kernel/qclipboard/qclipboard.pro
diff --git a/tests/auto/qclipboard/test/test.pro b/tests/auto/gui/kernel/qclipboard/test/test.pro
index 12c6b6ce4f..12c6b6ce4f 100644
--- a/tests/auto/qclipboard/test/test.pro
+++ b/tests/auto/gui/kernel/qclipboard/test/test.pro
diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
index 4d3bb29e13..4d3bb29e13 100644
--- a/tests/auto/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
diff --git a/tests/auto/qdrag/.gitignore b/tests/auto/gui/kernel/qdrag/.gitignore
index d210808afe..d210808afe 100644
--- a/tests/auto/qdrag/.gitignore
+++ b/tests/auto/gui/kernel/qdrag/.gitignore
diff --git a/tests/auto/qdrag/qdrag.pro b/tests/auto/gui/kernel/qdrag/qdrag.pro
index d9d645559b..d9d645559b 100644
--- a/tests/auto/qdrag/qdrag.pro
+++ b/tests/auto/gui/kernel/qdrag/qdrag.pro
diff --git a/tests/auto/qdrag/tst_qdrag.cpp b/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp
index 4d18cefb2c..4d18cefb2c 100644
--- a/tests/auto/qdrag/tst_qdrag.cpp
+++ b/tests/auto/gui/kernel/qdrag/tst_qdrag.cpp
diff --git a/tests/auto/qevent/.gitignore b/tests/auto/gui/kernel/qevent/.gitignore
index 2a3ef2a115..2a3ef2a115 100644
--- a/tests/auto/qevent/.gitignore
+++ b/tests/auto/gui/kernel/qevent/.gitignore
diff --git a/tests/auto/qevent/qevent.pro b/tests/auto/gui/kernel/qevent/qevent.pro
index 6042b6cdc9..6042b6cdc9 100644
--- a/tests/auto/qevent/qevent.pro
+++ b/tests/auto/gui/kernel/qevent/qevent.pro
diff --git a/tests/auto/qevent/tst_qevent.cpp b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
index ae39380883..ae39380883 100644
--- a/tests/auto/qevent/tst_qevent.cpp
+++ b/tests/auto/gui/kernel/qevent/tst_qevent.cpp
diff --git a/tests/auto/qfileopenevent/qfileopenevent.pro b/tests/auto/gui/kernel/qfileopenevent/qfileopenevent.pro
index 73724828db..73724828db 100644
--- a/tests/auto/qfileopenevent/qfileopenevent.pro
+++ b/tests/auto/gui/kernel/qfileopenevent/qfileopenevent.pro
diff --git a/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp
index 5d1a6a390f..5d1a6a390f 100644
--- a/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp
+++ b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp
diff --git a/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro
index cb61b82e38..cb61b82e38 100644
--- a/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro
+++ b/tests/auto/gui/kernel/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro
diff --git a/tests/auto/qfileopenevent/test/test.pro b/tests/auto/gui/kernel/qfileopenevent/test/test.pro
index 3f16dcf6ee..3f16dcf6ee 100644
--- a/tests/auto/qfileopenevent/test/test.pro
+++ b/tests/auto/gui/kernel/qfileopenevent/test/test.pro
diff --git a/tests/auto/qfileopenevent/test/tst_qfileopenevent.cpp b/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp
index 69cc4ccc01..69cc4ccc01 100644
--- a/tests/auto/qfileopenevent/test/tst_qfileopenevent.cpp
+++ b/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp
diff --git a/tests/auto/qguivariant/.gitignore b/tests/auto/gui/kernel/qguivariant/.gitignore
index ea64ae90a0..ea64ae90a0 100644
--- a/tests/auto/qguivariant/.gitignore
+++ b/tests/auto/gui/kernel/qguivariant/.gitignore
diff --git a/tests/auto/qguivariant/qguivariant.pro b/tests/auto/gui/kernel/qguivariant/qguivariant.pro
index 68082f0037..68082f0037 100644
--- a/tests/auto/qguivariant/qguivariant.pro
+++ b/tests/auto/gui/kernel/qguivariant/qguivariant.pro
diff --git a/tests/auto/qguivariant/tst_qguivariant.cpp b/tests/auto/gui/kernel/qguivariant/tst_qguivariant.cpp
index 988580b874..988580b874 100644
--- a/tests/auto/qguivariant/tst_qguivariant.cpp
+++ b/tests/auto/gui/kernel/qguivariant/tst_qguivariant.cpp
diff --git a/tests/auto/qkeysequence/.gitignore b/tests/auto/gui/kernel/qkeysequence/.gitignore
index e06a7b0f43..e06a7b0f43 100644
--- a/tests/auto/qkeysequence/.gitignore
+++ b/tests/auto/gui/kernel/qkeysequence/.gitignore
diff --git a/tests/auto/qkeysequence/keys_de.qm b/tests/auto/gui/kernel/qkeysequence/keys_de.qm
index 5d7aedd765..5d7aedd765 100644
--- a/tests/auto/qkeysequence/keys_de.qm
+++ b/tests/auto/gui/kernel/qkeysequence/keys_de.qm
diff --git a/tests/auto/qkeysequence/keys_de.ts b/tests/auto/gui/kernel/qkeysequence/keys_de.ts
index 1db18f1fdd..1db18f1fdd 100644
--- a/tests/auto/qkeysequence/keys_de.ts
+++ b/tests/auto/gui/kernel/qkeysequence/keys_de.ts
diff --git a/tests/auto/qkeysequence/qkeysequence.pro b/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro
index 6cfbe459ea..6cfbe459ea 100644
--- a/tests/auto/qkeysequence/qkeysequence.pro
+++ b/tests/auto/gui/kernel/qkeysequence/qkeysequence.pro
diff --git a/tests/auto/qkeysequence/qkeysequence.qrc b/tests/auto/gui/kernel/qkeysequence/qkeysequence.qrc
index e224faaddd..e224faaddd 100644
--- a/tests/auto/qkeysequence/qkeysequence.qrc
+++ b/tests/auto/gui/kernel/qkeysequence/qkeysequence.qrc
diff --git a/tests/auto/qkeysequence/qt_de.qm b/tests/auto/gui/kernel/qkeysequence/qt_de.qm
index 595e4d7e8f..595e4d7e8f 100644
--- a/tests/auto/qkeysequence/qt_de.qm
+++ b/tests/auto/gui/kernel/qkeysequence/qt_de.qm
diff --git a/tests/auto/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
index 5753fb8df4..5753fb8df4 100644
--- a/tests/auto/qkeysequence/tst_qkeysequence.cpp
+++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
diff --git a/tests/auto/qmouseevent/.gitignore b/tests/auto/gui/kernel/qmouseevent/.gitignore
index 17cd6be116..17cd6be116 100644
--- a/tests/auto/qmouseevent/.gitignore
+++ b/tests/auto/gui/kernel/qmouseevent/.gitignore
diff --git a/tests/auto/qmouseevent/qmouseevent.pro b/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro
index 58cebd3d06..58cebd3d06 100644
--- a/tests/auto/qmouseevent/qmouseevent.pro
+++ b/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro
diff --git a/tests/auto/qmouseevent/tst_qmouseevent.cpp b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
index 5998aa0c08..5998aa0c08 100644
--- a/tests/auto/qmouseevent/tst_qmouseevent.cpp
+++ b/tests/auto/gui/kernel/qmouseevent/tst_qmouseevent.cpp
diff --git a/tests/auto/qmouseevent_modal/.gitignore b/tests/auto/gui/kernel/qmouseevent_modal/.gitignore
index e15c9eb18c..e15c9eb18c 100644
--- a/tests/auto/qmouseevent_modal/.gitignore
+++ b/tests/auto/gui/kernel/qmouseevent_modal/.gitignore
diff --git a/tests/auto/qmouseevent_modal/qmouseevent_modal.pro b/tests/auto/gui/kernel/qmouseevent_modal/qmouseevent_modal.pro
index 2f28de2675..2f28de2675 100644
--- a/tests/auto/qmouseevent_modal/qmouseevent_modal.pro
+++ b/tests/auto/gui/kernel/qmouseevent_modal/qmouseevent_modal.pro
diff --git a/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
index 7006feeeb8..7006feeeb8 100644
--- a/tests/auto/qmouseevent_modal/tst_qmouseevent_modal.cpp
+++ b/tests/auto/gui/kernel/qmouseevent_modal/tst_qmouseevent_modal.cpp
diff --git a/tests/auto/qpalette/.gitignore b/tests/auto/gui/kernel/qpalette/.gitignore
index 3c1aebac19..3c1aebac19 100644
--- a/tests/auto/qpalette/.gitignore
+++ b/tests/auto/gui/kernel/qpalette/.gitignore
diff --git a/tests/auto/qpalette/qpalette.pro b/tests/auto/gui/kernel/qpalette/qpalette.pro
index 4b240e5f9c..4b240e5f9c 100644
--- a/tests/auto/qpalette/qpalette.pro
+++ b/tests/auto/gui/kernel/qpalette/qpalette.pro
diff --git a/tests/auto/qpalette/tst_qpalette.cpp b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
index b63b8bf7b0..b63b8bf7b0 100644
--- a/tests/auto/qpalette/tst_qpalette.cpp
+++ b/tests/auto/gui/kernel/qpalette/tst_qpalette.cpp
diff --git a/tests/auto/qshortcut/.gitignore b/tests/auto/gui/kernel/qshortcut/.gitignore
index 3a17eb18e3..3a17eb18e3 100644
--- a/tests/auto/qshortcut/.gitignore
+++ b/tests/auto/gui/kernel/qshortcut/.gitignore
diff --git a/tests/auto/qshortcut/qshortcut.pro b/tests/auto/gui/kernel/qshortcut/qshortcut.pro
index 3f68d2377e..3f68d2377e 100644
--- a/tests/auto/qshortcut/qshortcut.pro
+++ b/tests/auto/gui/kernel/qshortcut/qshortcut.pro
diff --git a/tests/auto/qshortcut/tst_qshortcut.cpp b/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp
index a78e8cfd27..a78e8cfd27 100644
--- a/tests/auto/qshortcut/tst_qshortcut.cpp
+++ b/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp
diff --git a/tests/auto/qtouchevent/qtouchevent.pro b/tests/auto/gui/kernel/qtouchevent/qtouchevent.pro
index 55f99b6cdd..55f99b6cdd 100644
--- a/tests/auto/qtouchevent/qtouchevent.pro
+++ b/tests/auto/gui/kernel/qtouchevent/qtouchevent.pro
diff --git a/tests/auto/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
index f0347e39ff..f0347e39ff 100644
--- a/tests/auto/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
diff --git a/tests/auto/gui/math3d/math3d.pro b/tests/auto/gui/math3d/math3d.pro
new file mode 100644
index 0000000000..d977afa6e0
--- /dev/null
+++ b/tests/auto/gui/math3d/math3d.pro
@@ -0,0 +1,6 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qquaternion \
+   qvectornd \
+   qmatrixnxn \
+
diff --git a/tests/auto/qmatrixnxn/qmatrixnxn.pro b/tests/auto/gui/math3d/qmatrixnxn/qmatrixnxn.pro
index cf6e4a128e..cf6e4a128e 100644
--- a/tests/auto/qmatrixnxn/qmatrixnxn.pro
+++ b/tests/auto/gui/math3d/qmatrixnxn/qmatrixnxn.pro
diff --git a/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
index 98a559af85..98a559af85 100644
--- a/tests/auto/qmatrixnxn/tst_qmatrixnxn.cpp
+++ b/tests/auto/gui/math3d/qmatrixnxn/tst_qmatrixnxn.cpp
diff --git a/tests/auto/qquaternion/qquaternion.pro b/tests/auto/gui/math3d/qquaternion/qquaternion.pro
index 6f740cfd42..6f740cfd42 100644
--- a/tests/auto/qquaternion/qquaternion.pro
+++ b/tests/auto/gui/math3d/qquaternion/qquaternion.pro
diff --git a/tests/auto/qquaternion/tst_qquaternion.cpp b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp
index 7bc50efeeb..7bc50efeeb 100644
--- a/tests/auto/qquaternion/tst_qquaternion.cpp
+++ b/tests/auto/gui/math3d/qquaternion/tst_qquaternion.cpp
diff --git a/tests/auto/qvectornd/qvectornd.pro b/tests/auto/gui/math3d/qvectornd/qvectornd.pro
index 6346199444..6346199444 100644
--- a/tests/auto/qvectornd/qvectornd.pro
+++ b/tests/auto/gui/math3d/qvectornd/qvectornd.pro
diff --git a/tests/auto/qvectornd/tst_qvectornd.cpp b/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp
index 37c1949dc2..37c1949dc2 100644
--- a/tests/auto/qvectornd/tst_qvectornd.cpp
+++ b/tests/auto/gui/math3d/qvectornd/tst_qvectornd.cpp
diff --git a/tests/auto/gui/painting/painting.pro b/tests/auto/gui/painting/painting.pro
new file mode 100644
index 0000000000..62230eeac7
--- /dev/null
+++ b/tests/auto/gui/painting/painting.pro
@@ -0,0 +1,21 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qpainterpath \
+   qpainterpathstroker \
+   qcolor \
+   qbrush \
+   qregion \
+   qpainter \
+   qpathclipper \
+   qprinterinfo \
+   qpen \
+   qpaintengine \
+   qtransform \
+   qwmatrix \
+   qprinter \
+   qpolygon \
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+    qpathclipper \
+
+
diff --git a/tests/auto/qbrush/.gitignore b/tests/auto/gui/painting/qbrush/.gitignore
index e9321a18bd..e9321a18bd 100644
--- a/tests/auto/qbrush/.gitignore
+++ b/tests/auto/gui/painting/qbrush/.gitignore
diff --git a/tests/auto/qbrush/qbrush.pro b/tests/auto/gui/painting/qbrush/qbrush.pro
index 1c3efd46be..1c3efd46be 100644
--- a/tests/auto/qbrush/qbrush.pro
+++ b/tests/auto/gui/painting/qbrush/qbrush.pro
diff --git a/tests/auto/qbrush/tst_qbrush.cpp b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
index 9ee679e0f7..9ee679e0f7 100644
--- a/tests/auto/qbrush/tst_qbrush.cpp
+++ b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
diff --git a/tests/auto/qcolor/.gitignore b/tests/auto/gui/painting/qcolor/.gitignore
index 92f91eb54e..92f91eb54e 100644
--- a/tests/auto/qcolor/.gitignore
+++ b/tests/auto/gui/painting/qcolor/.gitignore
diff --git a/tests/auto/qcolor/qcolor.pro b/tests/auto/gui/painting/qcolor/qcolor.pro
index b9d437ef7c..b9d437ef7c 100644
--- a/tests/auto/qcolor/qcolor.pro
+++ b/tests/auto/gui/painting/qcolor/qcolor.pro
diff --git a/tests/auto/qcolor/tst_qcolor.cpp b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
index 2b6896ae5d..2b6896ae5d 100644
--- a/tests/auto/qcolor/tst_qcolor.cpp
+++ b/tests/auto/gui/painting/qcolor/tst_qcolor.cpp
diff --git a/tests/auto/qpaintengine/.gitignore b/tests/auto/gui/painting/qpaintengine/.gitignore
index e55942ea9f..e55942ea9f 100644
--- a/tests/auto/qpaintengine/.gitignore
+++ b/tests/auto/gui/painting/qpaintengine/.gitignore
diff --git a/tests/auto/qpaintengine/qpaintengine.pro b/tests/auto/gui/painting/qpaintengine/qpaintengine.pro
index e37c1668ac..e37c1668ac 100644
--- a/tests/auto/qpaintengine/qpaintengine.pro
+++ b/tests/auto/gui/painting/qpaintengine/qpaintengine.pro
diff --git a/tests/auto/qpaintengine/tst_qpaintengine.cpp b/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp
index ba9cc62a3d..ba9cc62a3d 100644
--- a/tests/auto/qpaintengine/tst_qpaintengine.cpp
+++ b/tests/auto/gui/painting/qpaintengine/tst_qpaintengine.cpp
diff --git a/tests/auto/qpainter/.gitignore b/tests/auto/gui/painting/qpainter/.gitignore
index 33e0dbe945..33e0dbe945 100644
--- a/tests/auto/qpainter/.gitignore
+++ b/tests/auto/gui/painting/qpainter/.gitignore
diff --git a/tests/auto/qpainter/drawEllipse/10x10SizeAt0x0.png b/tests/auto/gui/painting/qpainter/drawEllipse/10x10SizeAt0x0.png
index f2ab9a776d..f2ab9a776d 100644
--- a/tests/auto/qpainter/drawEllipse/10x10SizeAt0x0.png
+++ b/tests/auto/gui/painting/qpainter/drawEllipse/10x10SizeAt0x0.png
diff --git a/tests/auto/qpainter/drawEllipse/10x10SizeAt100x100.png b/tests/auto/gui/painting/qpainter/drawEllipse/10x10SizeAt100x100.png
index b1c755b5b0..b1c755b5b0 100644
--- a/tests/auto/qpainter/drawEllipse/10x10SizeAt100x100.png
+++ b/tests/auto/gui/painting/qpainter/drawEllipse/10x10SizeAt100x100.png
diff --git a/tests/auto/qpainter/drawEllipse/10x10SizeAt200x200.png b/tests/auto/gui/painting/qpainter/drawEllipse/10x10SizeAt200x200.png
index 0e30498da5..0e30498da5 100644
--- a/tests/auto/qpainter/drawEllipse/10x10SizeAt200x200.png
+++ b/tests/auto/gui/painting/qpainter/drawEllipse/10x10SizeAt200x200.png
diff --git a/tests/auto/qpainter/drawEllipse/13x100SizeAt0x0.png b/tests/auto/gui/painting/qpainter/drawEllipse/13x100SizeAt0x0.png
index f00796a3ad..f00796a3ad 100644
--- a/tests/auto/qpainter/drawEllipse/13x100SizeAt0x0.png
+++ b/tests/auto/gui/painting/qpainter/drawEllipse/13x100SizeAt0x0.png
diff --git a/tests/auto/qpainter/drawEllipse/13x100SizeAt100x100.png b/tests/auto/gui/painting/qpainter/drawEllipse/13x100SizeAt100x100.png
index a9a1a8a536..a9a1a8a536 100644
--- a/tests/auto/qpainter/drawEllipse/13x100SizeAt100x100.png
+++ b/tests/auto/gui/painting/qpainter/drawEllipse/13x100SizeAt100x100.png
diff --git a/tests/auto/qpainter/drawEllipse/13x100SizeAt200x200.png b/tests/auto/gui/painting/qpainter/drawEllipse/13x100SizeAt200x200.png
index 0e30498da5..0e30498da5 100644
--- a/tests/auto/qpainter/drawEllipse/13x100SizeAt200x200.png
+++ b/tests/auto/gui/painting/qpainter/drawEllipse/13x100SizeAt200x200.png
diff --git a/tests/auto/qpainter/drawEllipse/200x200SizeAt0x0.png b/tests/auto/gui/painting/qpainter/drawEllipse/200x200SizeAt0x0.png
index 67db116b90..67db116b90 100644
--- a/tests/auto/qpainter/drawEllipse/200x200SizeAt0x0.png
+++ b/tests/auto/gui/painting/qpainter/drawEllipse/200x200SizeAt0x0.png
diff --git a/tests/auto/qpainter/drawEllipse/200x200SizeAt100x100.png b/tests/auto/gui/painting/qpainter/drawEllipse/200x200SizeAt100x100.png
index 7d32afa4a8..7d32afa4a8 100644
--- a/tests/auto/qpainter/drawEllipse/200x200SizeAt100x100.png
+++ b/tests/auto/gui/painting/qpainter/drawEllipse/200x200SizeAt100x100.png
diff --git a/tests/auto/qpainter/drawEllipse/200x200SizeAt200x200.png b/tests/auto/gui/painting/qpainter/drawEllipse/200x200SizeAt200x200.png
index 0e30498da5..0e30498da5 100644
--- a/tests/auto/qpainter/drawEllipse/200x200SizeAt200x200.png
+++ b/tests/auto/gui/painting/qpainter/drawEllipse/200x200SizeAt200x200.png
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/dst.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/dst.xbm
index e645a0b86b..e645a0b86b 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/dst.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/dst.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_AndNotROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_AndNotROP.xbm
index 303c799264..303c799264 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_AndNotROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_AndNotROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_AndROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_AndROP.xbm
index 31333de879..31333de879 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_AndROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_AndROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_ClearROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_ClearROP.xbm
index 9cc25ea147..9cc25ea147 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_ClearROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_ClearROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_CopyROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_CopyROP.xbm
index 869844dcee..869844dcee 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_CopyROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_CopyROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NandROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NandROP.xbm
index d058484fa8..d058484fa8 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NandROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NandROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NopROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NopROP.xbm
index 3a2bc23468..3a2bc23468 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NopROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NopROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NorROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NorROP.xbm
index c74be41bbd..c74be41bbd 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NorROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NorROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotAndROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotAndROP.xbm
index 0cf8c3a82c..0cf8c3a82c 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotAndROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotAndROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotCopyROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotCopyROP.xbm
index 65474e16c5..65474e16c5 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotCopyROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotCopyROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotOrROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotOrROP.xbm
index 144d8995b6..144d8995b6 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotOrROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotOrROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotROP.xbm
index ccb3d36fb4..ccb3d36fb4 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotXorROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotXorROP.xbm
index 4be8f51a80..4be8f51a80 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_NotXorROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_NotXorROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_OrNotROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_OrNotROP.xbm
index d53fbe00e1..d53fbe00e1 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_OrNotROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_OrNotROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_OrROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_OrROP.xbm
index 06b51fcc68..06b51fcc68 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_OrROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_OrROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_SetROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_SetROP.xbm
index ab42472bb0..ab42472bb0 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_SetROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_SetROP.xbm
diff --git a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_XorROP.xbm b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_XorROP.xbm
index 5ac892dd0b..5ac892dd0b 100644
--- a/tests/auto/qpainter/drawLine_rop_bitmap/res/res_XorROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawLine_rop_bitmap/res/res_XorROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop/dst1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/dst1.png
index 4a7ca7f9b3..4a7ca7f9b3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/dst1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/dst1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/dst2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/dst2.png
index 4a7ca7f9b3..4a7ca7f9b3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/dst2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/dst2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/dst3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/dst3.png
index 8a3d28f3ed..8a3d28f3ed 100644
--- a/tests/auto/qpainter/drawPixmap_rop/dst3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/dst3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP0.png
index fe017ac1ab..fe017ac1ab 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP1.png
index 82d938c023..82d938c023 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP2.png
index 2b67b928e4..2b67b928e4 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP3.png
index c95b5a10ba..c95b5a10ba 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP4.png
index bbe2a24530..bbe2a24530 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP5.png
index 0158278b84..0158278b84 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP6.png
index aa1f403075..aa1f403075 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP7.png
index 8605b64d93..8605b64d93 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndNotROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndNotROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP0.png
index ebf8244eee..ebf8244eee 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP1.png
index 88568bc330..88568bc330 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP2.png
index 0ed6de2865..0ed6de2865 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP3.png
index c2ff341e6b..c2ff341e6b 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP4.png
index e08c9acbe2..e08c9acbe2 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP5.png
index e9d7a57333..e9d7a57333 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP6.png
index 01438a195c..01438a195c 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP7.png
index 4a7ca7f9b3..4a7ca7f9b3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_AndROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_AndROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP0.png
index cff8926587..cff8926587 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP1.png
index cff8926587..cff8926587 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP2.png
index cff8926587..cff8926587 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP3.png
index cff8926587..cff8926587 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP4.png
index cff8926587..cff8926587 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP5.png
index cff8926587..cff8926587 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP6.png
index cff8926587..cff8926587 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP7.png
index cff8926587..cff8926587 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_ClearROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_ClearROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP0.png
index 587623d3e8..587623d3e8 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP1.png
index 10e7ae59d5..10e7ae59d5 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP2.png
index 5c14136eb4..5c14136eb4 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP3.png
index 207f52564b..207f52564b 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP4.png
index 6981cee080..6981cee080 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP5.png
index 8b8de9892a..8b8de9892a 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP6.png
index 9825c0539f..9825c0539f 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP7.png
index 00968ffd06..00968ffd06 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_CopyROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_CopyROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP0.png
index 8d26638c03..8d26638c03 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP1.png
index f5b33589ba..f5b33589ba 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP2.png
index adc4ee3701..adc4ee3701 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP3.png
index dccc94c43b..dccc94c43b 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP4.png
index 4d207e7968..4d207e7968 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP5.png
index aa93d4d4a4..aa93d4d4a4 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP6.png
index ad320f950b..ad320f950b 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP7.png
index 8605b64d93..8605b64d93 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NandROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NandROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP0.png
index 4a7ca7f9b3..4a7ca7f9b3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP1.png
index 4a7ca7f9b3..4a7ca7f9b3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP2.png
index 4a7ca7f9b3..4a7ca7f9b3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP3.png
index 4a7ca7f9b3..4a7ca7f9b3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP4.png
index 4a7ca7f9b3..4a7ca7f9b3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP5.png
index 4a7ca7f9b3..4a7ca7f9b3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP6.png
index 4a7ca7f9b3..4a7ca7f9b3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP7.png
index 4a7ca7f9b3..4a7ca7f9b3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NopROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NopROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP0.png
index 3e33bb1078..3e33bb1078 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP1.png
index ce2b6f4e15..ce2b6f4e15 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP2.png
index 9eddc9840b..9eddc9840b 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP3.png
index 4ea9669dd3..4ea9669dd3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP4.png
index c64e0a5630..c64e0a5630 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP5.png
index 1fe3def383..1fe3def383 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP6.png
index 9c294b04d9..9c294b04d9 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP7.png
index cff8926587..cff8926587 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NorROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NorROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP0.png
index 01c694cdcc..01c694cdcc 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP1.png
index 4b11aa9c41..4b11aa9c41 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP2.png
index accbe42112..accbe42112 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP3.png
index 3c58d4fac7..3c58d4fac7 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP4.png
index 3b0a41c396..3b0a41c396 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP5.png
index 045ef33012..045ef33012 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP6.png
index 3a83725938..3a83725938 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP7.png
index cff8926587..cff8926587 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotAndROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotAndROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP0.png
index 7c51fc16fa..7c51fc16fa 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP1.png
index 8f519e8c52..8f519e8c52 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP2.png
index a0f9f60653..a0f9f60653 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP3.png
index 95931a4317..95931a4317 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP4.png
index f825d523b0..f825d523b0 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP5.png
index 245a27ea2f..245a27ea2f 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP6.png
index b32020675b..b32020675b 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP7.png
index cff8926587..cff8926587 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotCopyROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotCopyROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP0.png
index 3622f3a2b1..3622f3a2b1 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP1.png
index e31793e4a3..e31793e4a3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP2.png
index 8e8237548b..8e8237548b 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP3.png
index f4b98914b4..f4b98914b4 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP4.png
index b14fdba341..b14fdba341 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP5.png
index 129d7f3dc6..129d7f3dc6 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP6.png
index d894c5cb68..d894c5cb68 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP7.png
index 4a7ca7f9b3..4a7ca7f9b3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotOrROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotOrROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP0.png
index 8605b64d93..8605b64d93 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP1.png
index 8605b64d93..8605b64d93 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP2.png
index 8605b64d93..8605b64d93 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP3.png
index 8605b64d93..8605b64d93 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP4.png
index 8605b64d93..8605b64d93 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP5.png
index 8605b64d93..8605b64d93 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP6.png
index 8605b64d93..8605b64d93 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP7.png
index 8605b64d93..8605b64d93 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP0.png
index b1e61504cd..b1e61504cd 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP1.png
index 8cf29cde81..8cf29cde81 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP2.png
index 99fedf8c04..99fedf8c04 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP3.png
index bc220f546e..bc220f546e 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP4.png
index f48e8b9f4d..f48e8b9f4d 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP5.png
index c5e3c0fc63..c5e3c0fc63 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP6.png
index 13bb69f91b..13bb69f91b 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP7.png
index 4a7ca7f9b3..4a7ca7f9b3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_NotXorROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_NotXorROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP0.png
index 85b964301d..85b964301d 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP1.png
index d92bf16044..d92bf16044 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP2.png
index bb81c5abe8..bb81c5abe8 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP3.png
index 9378f166cd..9378f166cd 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP4.png
index 2ea026eb6c..2ea026eb6c 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP5.png
index 8366d37eda..8366d37eda 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP6.png
index 39c36d1b52..39c36d1b52 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP7.png
index 00968ffd06..00968ffd06 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrNotROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrNotROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP0.png
index beb2bc35b8..beb2bc35b8 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP1.png
index 6ed17a72ed..6ed17a72ed 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP2.png
index 9e0b63c220..9e0b63c220 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP3.png
index 6471b4aaa4..6471b4aaa4 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP4.png
index c158ea0d01..c158ea0d01 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP5.png
index eb3deacc86..eb3deacc86 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP6.png
index 51948b0ac9..51948b0ac9 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP7.png
index 00968ffd06..00968ffd06 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_OrROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_OrROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP0.png
index 00968ffd06..00968ffd06 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP1.png
index 00968ffd06..00968ffd06 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP2.png
index 00968ffd06..00968ffd06 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP3.png
index 00968ffd06..00968ffd06 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP4.png
index 00968ffd06..00968ffd06 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP5.png
index 00968ffd06..00968ffd06 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP6.png
index 00968ffd06..00968ffd06 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP7.png
index 00968ffd06..00968ffd06 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_SetROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_SetROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP0.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP0.png
index c2b009cac3..c2b009cac3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP0.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP0.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP1.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP1.png
index 42b0b3c308..42b0b3c308 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP1.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP1.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP2.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP2.png
index bc43614ab3..bc43614ab3 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP2.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP2.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP3.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP3.png
index 7486d4b3f4..7486d4b3f4 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP3.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP3.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP4.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP4.png
index 8098634be4..8098634be4 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP4.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP4.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP5.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP5.png
index 8c5b9feb7c..8c5b9feb7c 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP5.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP5.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP6.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP6.png
index c7e51a1410..c7e51a1410 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP6.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP6.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP7.png b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP7.png
index 8605b64d93..8605b64d93 100644
--- a/tests/auto/qpainter/drawPixmap_rop/res/res_XorROP7.png
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/res/res_XorROP7.png
diff --git a/tests/auto/qpainter/drawPixmap_rop/src1.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop/src1.xbm
index f088d28c8c..f088d28c8c 100644
--- a/tests/auto/qpainter/drawPixmap_rop/src1.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/src1.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop/src2-mask.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop/src2-mask.xbm
index bd73f9433c..bd73f9433c 100644
--- a/tests/auto/qpainter/drawPixmap_rop/src2-mask.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/src2-mask.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop/src2.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop/src2.xbm
index 40126a9d17..40126a9d17 100644
--- a/tests/auto/qpainter/drawPixmap_rop/src2.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/src2.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop/src3.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop/src3.xbm
index 2f2d5472a4..2f2d5472a4 100644
--- a/tests/auto/qpainter/drawPixmap_rop/src3.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop/src3.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/dst.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/dst.xbm
index 45543c8ebf..45543c8ebf 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/dst.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/dst.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_AndNotROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_AndNotROP.xbm
index 303c799264..303c799264 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_AndNotROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_AndNotROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_AndROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_AndROP.xbm
index 31333de879..31333de879 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_AndROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_AndROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_ClearROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_ClearROP.xbm
index 9cc25ea147..9cc25ea147 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_ClearROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_ClearROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_CopyROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_CopyROP.xbm
index 869844dcee..869844dcee 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_CopyROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_CopyROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NandROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NandROP.xbm
index d058484fa8..d058484fa8 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NandROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NandROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NopROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NopROP.xbm
index 3a2bc23468..3a2bc23468 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NopROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NopROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NorROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NorROP.xbm
index c74be41bbd..c74be41bbd 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NorROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NorROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotAndROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotAndROP.xbm
index 0cf8c3a82c..0cf8c3a82c 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotAndROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotAndROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotCopyROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotCopyROP.xbm
index 65474e16c5..65474e16c5 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotCopyROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotCopyROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotOrROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotOrROP.xbm
index 144d8995b6..144d8995b6 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotOrROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotOrROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotROP.xbm
index ccb3d36fb4..ccb3d36fb4 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotXorROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotXorROP.xbm
index 4be8f51a80..4be8f51a80 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_NotXorROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_NotXorROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_OrNotROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_OrNotROP.xbm
index d53fbe00e1..d53fbe00e1 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_OrNotROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_OrNotROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_OrROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_OrROP.xbm
index 06b51fcc68..06b51fcc68 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_OrROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_OrROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_SetROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_SetROP.xbm
index ab42472bb0..ab42472bb0 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_SetROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_SetROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_XorROP.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_XorROP.xbm
index 5ac892dd0b..5ac892dd0b 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/res/res_XorROP.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/res/res_XorROP.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/src1-mask.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/src1-mask.xbm
index ac9031f1f1..ac9031f1f1 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/src1-mask.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/src1-mask.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/src1.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/src1.xbm
index d883569db2..d883569db2 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/src1.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/src1.xbm
diff --git a/tests/auto/qpainter/drawPixmap_rop_bitmap/src2.xbm b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/src2.xbm
index fb203df28a..fb203df28a 100644
--- a/tests/auto/qpainter/drawPixmap_rop_bitmap/src2.xbm
+++ b/tests/auto/gui/painting/qpainter/drawPixmap_rop_bitmap/src2.xbm
diff --git a/tests/auto/qpainter/qpainter.pro b/tests/auto/gui/painting/qpainter/qpainter.pro
index 00307d3e58..00307d3e58 100644
--- a/tests/auto/qpainter/qpainter.pro
+++ b/tests/auto/gui/painting/qpainter/qpainter.pro
diff --git a/tests/auto/qpainter/task217400.png b/tests/auto/gui/painting/qpainter/task217400.png
index c12a602ba6..c12a602ba6 100644
--- a/tests/auto/qpainter/task217400.png
+++ b/tests/auto/gui/painting/qpainter/task217400.png
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index ff4f7ad8eb..c2c9002023 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -41,7 +41,7 @@
 
 
 #include <QtTest/QtTest>
-#include "../../shared/util.h"
+#include "../../../../shared/util.h"
 
 #include <qpainter.h>
 #include <qapplication.h>
diff --git a/tests/auto/qpainter/utils/createImages/createImages.pro b/tests/auto/gui/painting/qpainter/utils/createImages/createImages.pro
index ce2d341e92..ce2d341e92 100644
--- a/tests/auto/qpainter/utils/createImages/createImages.pro
+++ b/tests/auto/gui/painting/qpainter/utils/createImages/createImages.pro
diff --git a/tests/auto/qpainter/utils/createImages/main.cpp b/tests/auto/gui/painting/qpainter/utils/createImages/main.cpp
index 418c385717..418c385717 100644
--- a/tests/auto/qpainter/utils/createImages/main.cpp
+++ b/tests/auto/gui/painting/qpainter/utils/createImages/main.cpp
diff --git a/tests/auto/qpainterpath/.gitignore b/tests/auto/gui/painting/qpainterpath/.gitignore
index 4e0e797989..4e0e797989 100644
--- a/tests/auto/qpainterpath/.gitignore
+++ b/tests/auto/gui/painting/qpainterpath/.gitignore
diff --git a/tests/auto/qpainterpath/qpainterpath.pro b/tests/auto/gui/painting/qpainterpath/qpainterpath.pro
index 9708222c99..9708222c99 100644
--- a/tests/auto/qpainterpath/qpainterpath.pro
+++ b/tests/auto/gui/painting/qpainterpath/qpainterpath.pro
diff --git a/tests/auto/qpainterpath/tst_qpainterpath.cpp b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
index 33315adc06..33315adc06 100644
--- a/tests/auto/qpainterpath/tst_qpainterpath.cpp
+++ b/tests/auto/gui/painting/qpainterpath/tst_qpainterpath.cpp
diff --git a/tests/auto/qpainterpathstroker/.gitignore b/tests/auto/gui/painting/qpainterpathstroker/.gitignore
index e171c5da31..e171c5da31 100644
--- a/tests/auto/qpainterpathstroker/.gitignore
+++ b/tests/auto/gui/painting/qpainterpathstroker/.gitignore
diff --git a/tests/auto/qpainterpathstroker/qpainterpathstroker.pro b/tests/auto/gui/painting/qpainterpathstroker/qpainterpathstroker.pro
index b6f62a2eee..b6f62a2eee 100644
--- a/tests/auto/qpainterpathstroker/qpainterpathstroker.pro
+++ b/tests/auto/gui/painting/qpainterpathstroker/qpainterpathstroker.pro
diff --git a/tests/auto/qpainterpathstroker/tst_qpainterpathstroker.cpp b/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp
index 288263e5d7..288263e5d7 100644
--- a/tests/auto/qpainterpathstroker/tst_qpainterpathstroker.cpp
+++ b/tests/auto/gui/painting/qpainterpathstroker/tst_qpainterpathstroker.cpp
diff --git a/tests/auto/qpathclipper/.gitignore b/tests/auto/gui/painting/qpathclipper/.gitignore
index a689eef0f6..a689eef0f6 100644
--- a/tests/auto/qpathclipper/.gitignore
+++ b/tests/auto/gui/painting/qpathclipper/.gitignore
diff --git a/tests/auto/qpathclipper/pathcompare.h b/tests/auto/gui/painting/qpathclipper/pathcompare.h
index d80c189665..d80c189665 100644
--- a/tests/auto/qpathclipper/pathcompare.h
+++ b/tests/auto/gui/painting/qpathclipper/pathcompare.h
diff --git a/tests/auto/qpathclipper/paths.cpp b/tests/auto/gui/painting/qpathclipper/paths.cpp
index 950c34614e..950c34614e 100644
--- a/tests/auto/qpathclipper/paths.cpp
+++ b/tests/auto/gui/painting/qpathclipper/paths.cpp
diff --git a/tests/auto/qpathclipper/paths.h b/tests/auto/gui/painting/qpathclipper/paths.h
index 89ef785857..89ef785857 100644
--- a/tests/auto/qpathclipper/paths.h
+++ b/tests/auto/gui/painting/qpathclipper/paths.h
diff --git a/tests/auto/qpathclipper/qpathclipper.pro b/tests/auto/gui/painting/qpathclipper/qpathclipper.pro
index 2becd7dd03..2becd7dd03 100644
--- a/tests/auto/qpathclipper/qpathclipper.pro
+++ b/tests/auto/gui/painting/qpathclipper/qpathclipper.pro
diff --git a/tests/auto/qpathclipper/tst_qpathclipper.cpp b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp
index 57a56b2d1a..57a56b2d1a 100644
--- a/tests/auto/qpathclipper/tst_qpathclipper.cpp
+++ b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp
diff --git a/tests/auto/qpen/.gitignore b/tests/auto/gui/painting/qpen/.gitignore
index a9187367dc..a9187367dc 100644
--- a/tests/auto/qpen/.gitignore
+++ b/tests/auto/gui/painting/qpen/.gitignore
diff --git a/tests/auto/qpen/qpen.pro b/tests/auto/gui/painting/qpen/qpen.pro
index 53bd5e2b6e..53bd5e2b6e 100644
--- a/tests/auto/qpen/qpen.pro
+++ b/tests/auto/gui/painting/qpen/qpen.pro
diff --git a/tests/auto/qpen/tst_qpen.cpp b/tests/auto/gui/painting/qpen/tst_qpen.cpp
index 64d725bc50..64d725bc50 100644
--- a/tests/auto/qpen/tst_qpen.cpp
+++ b/tests/auto/gui/painting/qpen/tst_qpen.cpp
diff --git a/tests/auto/qpolygon/.gitignore b/tests/auto/gui/painting/qpolygon/.gitignore
index 7c9d48c848..7c9d48c848 100644
--- a/tests/auto/qpolygon/.gitignore
+++ b/tests/auto/gui/painting/qpolygon/.gitignore
diff --git a/tests/auto/qpolygon/qpolygon.pro b/tests/auto/gui/painting/qpolygon/qpolygon.pro
index 186b704d17..186b704d17 100644
--- a/tests/auto/qpolygon/qpolygon.pro
+++ b/tests/auto/gui/painting/qpolygon/qpolygon.pro
diff --git a/tests/auto/qpolygon/tst_qpolygon.cpp b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp
index f47073a048..f47073a048 100644
--- a/tests/auto/qpolygon/tst_qpolygon.cpp
+++ b/tests/auto/gui/painting/qpolygon/tst_qpolygon.cpp
diff --git a/tests/auto/qprinter/.gitignore b/tests/auto/gui/painting/qprinter/.gitignore
index 85de0e9675..85de0e9675 100644
--- a/tests/auto/qprinter/.gitignore
+++ b/tests/auto/gui/painting/qprinter/.gitignore
diff --git a/tests/auto/qprinter/qprinter.pro b/tests/auto/gui/painting/qprinter/qprinter.pro
index cbe4ad7986..cbe4ad7986 100644
--- a/tests/auto/qprinter/qprinter.pro
+++ b/tests/auto/gui/painting/qprinter/qprinter.pro
diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp
index a6b6895981..a6b6895981 100644
--- a/tests/auto/qprinter/tst_qprinter.cpp
+++ b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp
diff --git a/tests/auto/qprinterinfo/.gitignore b/tests/auto/gui/painting/qprinterinfo/.gitignore
index fcef7c1997..fcef7c1997 100644
--- a/tests/auto/qprinterinfo/.gitignore
+++ b/tests/auto/gui/painting/qprinterinfo/.gitignore
diff --git a/tests/auto/qprinterinfo/qprinterinfo.pro b/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro
index 1bf799d6ce..1bf799d6ce 100644
--- a/tests/auto/qprinterinfo/qprinterinfo.pro
+++ b/tests/auto/gui/painting/qprinterinfo/qprinterinfo.pro
diff --git a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp b/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp
index 7e5da4a6f8..7e5da4a6f8 100644
--- a/tests/auto/qprinterinfo/tst_qprinterinfo.cpp
+++ b/tests/auto/gui/painting/qprinterinfo/tst_qprinterinfo.cpp
diff --git a/tests/auto/qregion/.gitignore b/tests/auto/gui/painting/qregion/.gitignore
index 8be21c3736..8be21c3736 100644
--- a/tests/auto/qregion/.gitignore
+++ b/tests/auto/gui/painting/qregion/.gitignore
diff --git a/tests/auto/qregion/qregion.pro b/tests/auto/gui/painting/qregion/qregion.pro
index 8dbb4844a0..8dbb4844a0 100644
--- a/tests/auto/qregion/qregion.pro
+++ b/tests/auto/gui/painting/qregion/qregion.pro
diff --git a/tests/auto/qregion/tst_qregion.cpp b/tests/auto/gui/painting/qregion/tst_qregion.cpp
index 58d2034e41..58d2034e41 100644
--- a/tests/auto/qregion/tst_qregion.cpp
+++ b/tests/auto/gui/painting/qregion/tst_qregion.cpp
diff --git a/tests/auto/qtransform/.gitignore b/tests/auto/gui/painting/qtransform/.gitignore
index f1da0161e7..f1da0161e7 100644
--- a/tests/auto/qtransform/.gitignore
+++ b/tests/auto/gui/painting/qtransform/.gitignore
diff --git a/tests/auto/qtransform/qtransform.pro b/tests/auto/gui/painting/qtransform/qtransform.pro
index 92bef8ce38..92bef8ce38 100644
--- a/tests/auto/qtransform/qtransform.pro
+++ b/tests/auto/gui/painting/qtransform/qtransform.pro
diff --git a/tests/auto/qtransform/tst_qtransform.cpp b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
index f8319c9e13..f8319c9e13 100644
--- a/tests/auto/qtransform/tst_qtransform.cpp
+++ b/tests/auto/gui/painting/qtransform/tst_qtransform.cpp
diff --git a/tests/auto/qwmatrix/.gitignore b/tests/auto/gui/painting/qwmatrix/.gitignore
index c983191769..c983191769 100644
--- a/tests/auto/qwmatrix/.gitignore
+++ b/tests/auto/gui/painting/qwmatrix/.gitignore
diff --git a/tests/auto/qwmatrix/qwmatrix.pro b/tests/auto/gui/painting/qwmatrix/qwmatrix.pro
index bab298bc93..bab298bc93 100644
--- a/tests/auto/qwmatrix/qwmatrix.pro
+++ b/tests/auto/gui/painting/qwmatrix/qwmatrix.pro
diff --git a/tests/auto/qwmatrix/tst_qwmatrix.cpp b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
index 0e7372d9d8..0e7372d9d8 100644
--- a/tests/auto/qwmatrix/tst_qwmatrix.cpp
+++ b/tests/auto/gui/painting/qwmatrix/tst_qwmatrix.cpp
diff --git a/tests/auto/qabstracttextdocumentlayout/.gitignore b/tests/auto/gui/text/qabstracttextdocumentlayout/.gitignore
index d747466790..d747466790 100644
--- a/tests/auto/qabstracttextdocumentlayout/.gitignore
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/.gitignore
diff --git a/tests/auto/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro b/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro
index 22b013e37e..22b013e37e 100644
--- a/tests/auto/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro
diff --git a/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
index 90f212e832..90f212e832 100644
--- a/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
+++ b/tests/auto/gui/text/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
diff --git a/tests/auto/qcssparser/.gitignore b/tests/auto/gui/text/qcssparser/.gitignore
index 6cc99800e0..6cc99800e0 100644
--- a/tests/auto/qcssparser/.gitignore
+++ b/tests/auto/gui/text/qcssparser/.gitignore
diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/gui/text/qcssparser/qcssparser.pro
index 16fa265231..16fa265231 100644
--- a/tests/auto/qcssparser/qcssparser.pro
+++ b/tests/auto/gui/text/qcssparser/qcssparser.pro
diff --git a/tests/auto/qcssparser/testdata/scanner/comments/input b/tests/auto/gui/text/qcssparser/testdata/scanner/comments/input
index af2b659a5b..af2b659a5b 100644
--- a/tests/auto/qcssparser/testdata/scanner/comments/input
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/comments/input
diff --git a/tests/auto/qcssparser/testdata/scanner/comments/output b/tests/auto/gui/text/qcssparser/testdata/scanner/comments/output
index 80ede0ba22..80ede0ba22 100644
--- a/tests/auto/qcssparser/testdata/scanner/comments/output
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/comments/output
diff --git a/tests/auto/qcssparser/testdata/scanner/comments2/input b/tests/auto/gui/text/qcssparser/testdata/scanner/comments2/input
index 3135acd78c..3135acd78c 100644
--- a/tests/auto/qcssparser/testdata/scanner/comments2/input
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/comments2/input
diff --git a/tests/auto/qcssparser/testdata/scanner/comments2/output b/tests/auto/gui/text/qcssparser/testdata/scanner/comments2/output
index d1f1259869..d1f1259869 100644
--- a/tests/auto/qcssparser/testdata/scanner/comments2/output
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/comments2/output
diff --git a/tests/auto/qcssparser/testdata/scanner/comments3/input b/tests/auto/gui/text/qcssparser/testdata/scanner/comments3/input
index 8634543a8f..8634543a8f 100644
--- a/tests/auto/qcssparser/testdata/scanner/comments3/input
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/comments3/input
diff --git a/tests/auto/qcssparser/testdata/scanner/comments3/output b/tests/auto/gui/text/qcssparser/testdata/scanner/comments3/output
index af7bad752a..af7bad752a 100644
--- a/tests/auto/qcssparser/testdata/scanner/comments3/output
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/comments3/output
diff --git a/tests/auto/qcssparser/testdata/scanner/comments4/input b/tests/auto/gui/text/qcssparser/testdata/scanner/comments4/input
index 62d039b00c..62d039b00c 100644
--- a/tests/auto/qcssparser/testdata/scanner/comments4/input
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/comments4/input
diff --git a/tests/auto/qcssparser/testdata/scanner/comments4/output b/tests/auto/gui/text/qcssparser/testdata/scanner/comments4/output
index eb86e7bd15..eb86e7bd15 100644
--- a/tests/auto/qcssparser/testdata/scanner/comments4/output
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/comments4/output
diff --git a/tests/auto/qcssparser/testdata/scanner/quotedstring/input b/tests/auto/gui/text/qcssparser/testdata/scanner/quotedstring/input
index deae3a8dab..deae3a8dab 100644
--- a/tests/auto/qcssparser/testdata/scanner/quotedstring/input
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/quotedstring/input
diff --git a/tests/auto/qcssparser/testdata/scanner/quotedstring/output b/tests/auto/gui/text/qcssparser/testdata/scanner/quotedstring/output
index ed52419594..ed52419594 100644
--- a/tests/auto/qcssparser/testdata/scanner/quotedstring/output
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/quotedstring/output
diff --git a/tests/auto/qcssparser/testdata/scanner/simple/input b/tests/auto/gui/text/qcssparser/testdata/scanner/simple/input
index b37e587661..b37e587661 100644
--- a/tests/auto/qcssparser/testdata/scanner/simple/input
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/simple/input
diff --git a/tests/auto/qcssparser/testdata/scanner/simple/output b/tests/auto/gui/text/qcssparser/testdata/scanner/simple/output
index 71c60ec9bf..71c60ec9bf 100644
--- a/tests/auto/qcssparser/testdata/scanner/simple/output
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/simple/output
diff --git a/tests/auto/qcssparser/testdata/scanner/unicode/input b/tests/auto/gui/text/qcssparser/testdata/scanner/unicode/input
index 2c33f7be97..2c33f7be97 100644
--- a/tests/auto/qcssparser/testdata/scanner/unicode/input
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/unicode/input
diff --git a/tests/auto/qcssparser/testdata/scanner/unicode/output b/tests/auto/gui/text/qcssparser/testdata/scanner/unicode/output
index 0829c37e28..0829c37e28 100644
--- a/tests/auto/qcssparser/testdata/scanner/unicode/output
+++ b/tests/auto/gui/text/qcssparser/testdata/scanner/unicode/output
diff --git a/tests/auto/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
index 1e82431a48..1e82431a48 100644
--- a/tests/auto/qcssparser/tst_qcssparser.cpp
+++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
diff --git a/tests/auto/qfont/.gitignore b/tests/auto/gui/text/qfont/.gitignore
index 61aa3df16c..61aa3df16c 100644
--- a/tests/auto/qfont/.gitignore
+++ b/tests/auto/gui/text/qfont/.gitignore
diff --git a/tests/auto/qfont/qfont.pro b/tests/auto/gui/text/qfont/qfont.pro
index 891cb0a093..891cb0a093 100644
--- a/tests/auto/qfont/qfont.pro
+++ b/tests/auto/gui/text/qfont/qfont.pro
diff --git a/tests/auto/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index a564e71e19..a564e71e19 100644
--- a/tests/auto/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
diff --git a/tests/auto/qfontdatabase/.gitignore b/tests/auto/gui/text/qfontdatabase/.gitignore
index 65edf9b279..65edf9b279 100644
--- a/tests/auto/qfontdatabase/.gitignore
+++ b/tests/auto/gui/text/qfontdatabase/.gitignore
diff --git a/tests/auto/qfontdatabase/FreeMono.ttf b/tests/auto/gui/text/qfontdatabase/FreeMono.ttf
index d7ce52ddc7..d7ce52ddc7 100644
--- a/tests/auto/qfontdatabase/FreeMono.ttf
+++ b/tests/auto/gui/text/qfontdatabase/FreeMono.ttf
diff --git a/tests/auto/qfontdatabase/qfontdatabase.pro b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
index e7dfc3c73d..e7dfc3c73d 100644
--- a/tests/auto/qfontdatabase/qfontdatabase.pro
+++ b/tests/auto/gui/text/qfontdatabase/qfontdatabase.pro
diff --git a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index 1df61d0a06..1df61d0a06 100644
--- a/tests/auto/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
diff --git a/tests/auto/qfontmetrics/.gitignore b/tests/auto/gui/text/qfontmetrics/.gitignore
index 0b428672a3..0b428672a3 100644
--- a/tests/auto/qfontmetrics/.gitignore
+++ b/tests/auto/gui/text/qfontmetrics/.gitignore
diff --git a/tests/auto/qfontmetrics/qfontmetrics.pro b/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro
index c0dc1abbe6..c0dc1abbe6 100644
--- a/tests/auto/qfontmetrics/qfontmetrics.pro
+++ b/tests/auto/gui/text/qfontmetrics/qfontmetrics.pro
diff --git a/tests/auto/qfontmetrics/testfont.qrc b/tests/auto/gui/text/qfontmetrics/testfont.qrc
index bc0c0b0959..bc0c0b0959 100644
--- a/tests/auto/qfontmetrics/testfont.qrc
+++ b/tests/auto/gui/text/qfontmetrics/testfont.qrc
diff --git a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
index 982cfc11d9..982cfc11d9 100644
--- a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp
+++ b/tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
diff --git a/tests/auto/qfontmetrics/ucs4font.ttf b/tests/auto/gui/text/qfontmetrics/ucs4font.ttf
index 31b6997779..31b6997779 100644
--- a/tests/auto/qfontmetrics/ucs4font.ttf
+++ b/tests/auto/gui/text/qfontmetrics/ucs4font.ttf
diff --git a/tests/auto/qglyphrun/qglyphrun.pro b/tests/auto/gui/text/qglyphrun/qglyphrun.pro
index 480ad5b9a4..480ad5b9a4 100644
--- a/tests/auto/qglyphrun/qglyphrun.pro
+++ b/tests/auto/gui/text/qglyphrun/qglyphrun.pro
diff --git a/tests/auto/qglyphrun/test.ttf b/tests/auto/gui/text/qglyphrun/test.ttf
index 9043a576ef..9043a576ef 100644
--- a/tests/auto/qglyphrun/test.ttf
+++ b/tests/auto/gui/text/qglyphrun/test.ttf
diff --git a/tests/auto/qglyphrun/tst_qglyphrun.cpp b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
index e84915428f..e84915428f 100644
--- a/tests/auto/qglyphrun/tst_qglyphrun.cpp
+++ b/tests/auto/gui/text/qglyphrun/tst_qglyphrun.cpp
diff --git a/tests/auto/qrawfont/qrawfont.pro b/tests/auto/gui/text/qrawfont/qrawfont.pro
index 1f73055b00..1f73055b00 100644
--- a/tests/auto/qrawfont/qrawfont.pro
+++ b/tests/auto/gui/text/qrawfont/qrawfont.pro
diff --git a/tests/auto/qrawfont/testfont.ttf b/tests/auto/gui/text/qrawfont/testfont.ttf
index d6042d2e58..d6042d2e58 100644
--- a/tests/auto/qrawfont/testfont.ttf
+++ b/tests/auto/gui/text/qrawfont/testfont.ttf
diff --git a/tests/auto/qrawfont/testfont_bold_italic.ttf b/tests/auto/gui/text/qrawfont/testfont_bold_italic.ttf
index 9f65ac8df7..9f65ac8df7 100644
--- a/tests/auto/qrawfont/testfont_bold_italic.ttf
+++ b/tests/auto/gui/text/qrawfont/testfont_bold_italic.ttf
diff --git a/tests/auto/qrawfont/tst_qrawfont.cpp b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
index 1c18f2f1e8..1c18f2f1e8 100644
--- a/tests/auto/qrawfont/tst_qrawfont.cpp
+++ b/tests/auto/gui/text/qrawfont/tst_qrawfont.cpp
diff --git a/tests/auto/qstatictext/qstatictext.pro b/tests/auto/gui/text/qstatictext/qstatictext.pro
index c8c36f81f7..c8c36f81f7 100644
--- a/tests/auto/qstatictext/qstatictext.pro
+++ b/tests/auto/gui/text/qstatictext/qstatictext.pro
diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
index 79cbd692ea..79cbd692ea 100644
--- a/tests/auto/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp
diff --git a/tests/auto/qsyntaxhighlighter/.gitignore b/tests/auto/gui/text/qsyntaxhighlighter/.gitignore
index 3efe6efbe5..3efe6efbe5 100644
--- a/tests/auto/qsyntaxhighlighter/.gitignore
+++ b/tests/auto/gui/text/qsyntaxhighlighter/.gitignore
diff --git a/tests/auto/qsyntaxhighlighter/qsyntaxhighlighter.pro b/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro
index 30fb3a5283..30fb3a5283 100644
--- a/tests/auto/qsyntaxhighlighter/qsyntaxhighlighter.pro
+++ b/tests/auto/gui/text/qsyntaxhighlighter/qsyntaxhighlighter.pro
diff --git a/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
index 24ade2dc91..24ade2dc91 100644
--- a/tests/auto/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
+++ b/tests/auto/gui/text/qsyntaxhighlighter/tst_qsyntaxhighlighter.cpp
diff --git a/tests/auto/qtextblock/.gitignore b/tests/auto/gui/text/qtextblock/.gitignore
index 648a522140..648a522140 100644
--- a/tests/auto/qtextblock/.gitignore
+++ b/tests/auto/gui/text/qtextblock/.gitignore
diff --git a/tests/auto/qtextblock/qtextblock.pro b/tests/auto/gui/text/qtextblock/qtextblock.pro
index d50ef5ca78..d50ef5ca78 100644
--- a/tests/auto/qtextblock/qtextblock.pro
+++ b/tests/auto/gui/text/qtextblock/qtextblock.pro
diff --git a/tests/auto/qtextblock/tst_qtextblock.cpp b/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp
index b04a6f5559..b04a6f5559 100644
--- a/tests/auto/qtextblock/tst_qtextblock.cpp
+++ b/tests/auto/gui/text/qtextblock/tst_qtextblock.cpp
diff --git a/tests/auto/qtextcursor/.gitignore b/tests/auto/gui/text/qtextcursor/.gitignore
index b9b1f8e7d6..b9b1f8e7d6 100644
--- a/tests/auto/qtextcursor/.gitignore
+++ b/tests/auto/gui/text/qtextcursor/.gitignore
diff --git a/tests/auto/qtextcursor/qtextcursor.pro b/tests/auto/gui/text/qtextcursor/qtextcursor.pro
index 828b90ca16..828b90ca16 100644
--- a/tests/auto/qtextcursor/qtextcursor.pro
+++ b/tests/auto/gui/text/qtextcursor/qtextcursor.pro
diff --git a/tests/auto/qtextcursor/tst_qtextcursor.cpp b/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
index 2b0ba422e0..2b0ba422e0 100644
--- a/tests/auto/qtextcursor/tst_qtextcursor.cpp
+++ b/tests/auto/gui/text/qtextcursor/tst_qtextcursor.cpp
diff --git a/tests/auto/qtextdocument/.gitignore b/tests/auto/gui/text/qtextdocument/.gitignore
index c14f0e2422..c14f0e2422 100644
--- a/tests/auto/qtextdocument/.gitignore
+++ b/tests/auto/gui/text/qtextdocument/.gitignore
diff --git a/tests/auto/qtextdocument/common.h b/tests/auto/gui/text/qtextdocument/common.h
index 1eaefdbfbe..1eaefdbfbe 100644
--- a/tests/auto/qtextdocument/common.h
+++ b/tests/auto/gui/text/qtextdocument/common.h
diff --git a/tests/auto/qtextdocument/qtextdocument.pro b/tests/auto/gui/text/qtextdocument/qtextdocument.pro
index 69517589cc..69517589cc 100644
--- a/tests/auto/qtextdocument/qtextdocument.pro
+++ b/tests/auto/gui/text/qtextdocument/qtextdocument.pro
diff --git a/tests/auto/qtextdocument/tst_qtextdocument.cpp b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
index c98a703acc..c98a703acc 100644
--- a/tests/auto/qtextdocument/tst_qtextdocument.cpp
+++ b/tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
diff --git a/tests/auto/qtextdocumentfragment/.gitignore b/tests/auto/gui/text/qtextdocumentfragment/.gitignore
index 5c569834d3..5c569834d3 100644
--- a/tests/auto/qtextdocumentfragment/.gitignore
+++ b/tests/auto/gui/text/qtextdocumentfragment/.gitignore
diff --git a/tests/auto/qtextdocumentfragment/qtextdocumentfragment.pro b/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro
index e6ddd45f85..e6ddd45f85 100644
--- a/tests/auto/qtextdocumentfragment/qtextdocumentfragment.pro
+++ b/tests/auto/gui/text/qtextdocumentfragment/qtextdocumentfragment.pro
diff --git a/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 68c7a285ef..68c7a285ef 100644
--- a/tests/auto/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
diff --git a/tests/auto/qtextdocumentlayout/.gitignore b/tests/auto/gui/text/qtextdocumentlayout/.gitignore
index 80671c70d0..80671c70d0 100644
--- a/tests/auto/qtextdocumentlayout/.gitignore
+++ b/tests/auto/gui/text/qtextdocumentlayout/.gitignore
diff --git a/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro b/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro
index 32b05ce061..32b05ce061 100644
--- a/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro
+++ b/tests/auto/gui/text/qtextdocumentlayout/qtextdocumentlayout.pro
diff --git a/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
index f5c72cd4d0..f5c72cd4d0 100644
--- a/tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
+++ b/tests/auto/gui/text/qtextdocumentlayout/tst_qtextdocumentlayout.cpp
diff --git a/tests/auto/qtextformat/.gitignore b/tests/auto/gui/text/qtextformat/.gitignore
index 3e3be422fe..3e3be422fe 100644
--- a/tests/auto/qtextformat/.gitignore
+++ b/tests/auto/gui/text/qtextformat/.gitignore
diff --git a/tests/auto/qtextformat/qtextformat.pro b/tests/auto/gui/text/qtextformat/qtextformat.pro
index 30f6e50c61..30f6e50c61 100644
--- a/tests/auto/qtextformat/qtextformat.pro
+++ b/tests/auto/gui/text/qtextformat/qtextformat.pro
diff --git a/tests/auto/qtextformat/tst_qtextformat.cpp b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
index b235b112b6..b235b112b6 100644
--- a/tests/auto/qtextformat/tst_qtextformat.cpp
+++ b/tests/auto/gui/text/qtextformat/tst_qtextformat.cpp
diff --git a/tests/auto/qtextlayout/.gitignore b/tests/auto/gui/text/qtextlayout/.gitignore
index 11758969db..11758969db 100644
--- a/tests/auto/qtextlayout/.gitignore
+++ b/tests/auto/gui/text/qtextlayout/.gitignore
diff --git a/tests/auto/qtextlayout/qtextlayout.pro b/tests/auto/gui/text/qtextlayout/qtextlayout.pro
index 6bf0065e4f..6bf0065e4f 100644
--- a/tests/auto/qtextlayout/qtextlayout.pro
+++ b/tests/auto/gui/text/qtextlayout/qtextlayout.pro
diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index 2414ab3e37..2414ab3e37 100644
--- a/tests/auto/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
diff --git a/tests/auto/qtextlist/.gitignore b/tests/auto/gui/text/qtextlist/.gitignore
index f1c4f6acab..f1c4f6acab 100644
--- a/tests/auto/qtextlist/.gitignore
+++ b/tests/auto/gui/text/qtextlist/.gitignore
diff --git a/tests/auto/qtextlist/qtextlist.pro b/tests/auto/gui/text/qtextlist/qtextlist.pro
index f66fb96dd0..f66fb96dd0 100644
--- a/tests/auto/qtextlist/qtextlist.pro
+++ b/tests/auto/gui/text/qtextlist/qtextlist.pro
diff --git a/tests/auto/qtextlist/tst_qtextlist.cpp b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
index 164dd6fc68..164dd6fc68 100644
--- a/tests/auto/qtextlist/tst_qtextlist.cpp
+++ b/tests/auto/gui/text/qtextlist/tst_qtextlist.cpp
diff --git a/tests/auto/qtextobject/.gitignore b/tests/auto/gui/text/qtextobject/.gitignore
index 6a3da09549..6a3da09549 100644
--- a/tests/auto/qtextobject/.gitignore
+++ b/tests/auto/gui/text/qtextobject/.gitignore
diff --git a/tests/auto/qtextobject/qtextobject.pro b/tests/auto/gui/text/qtextobject/qtextobject.pro
index e87a364ab6..e87a364ab6 100644
--- a/tests/auto/qtextobject/qtextobject.pro
+++ b/tests/auto/gui/text/qtextobject/qtextobject.pro
diff --git a/tests/auto/qtextobject/tst_qtextobject.cpp b/tests/auto/gui/text/qtextobject/tst_qtextobject.cpp
index 0d1773e3fa..0d1773e3fa 100644
--- a/tests/auto/qtextobject/tst_qtextobject.cpp
+++ b/tests/auto/gui/text/qtextobject/tst_qtextobject.cpp
diff --git a/tests/auto/qtextodfwriter/.gitignore b/tests/auto/gui/text/qtextodfwriter/.gitignore
index 791445d7a9..791445d7a9 100644
--- a/tests/auto/qtextodfwriter/.gitignore
+++ b/tests/auto/gui/text/qtextodfwriter/.gitignore
diff --git a/tests/auto/qtextodfwriter/qtextodfwriter.pro b/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro
index f5e2c09fa0..25bb5a5ed0 100644
--- a/tests/auto/qtextodfwriter/qtextodfwriter.pro
+++ b/tests/auto/gui/text/qtextodfwriter/qtextodfwriter.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += core-private gui-private
 SOURCES += tst_qtextodfwriter.cpp
 
 !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
diff --git a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp
index 765afce66e..765afce66e 100644
--- a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
+++ b/tests/auto/gui/text/qtextodfwriter/tst_qtextodfwriter.cpp
diff --git a/tests/auto/qtextpiecetable/.gitignore b/tests/auto/gui/text/qtextpiecetable/.gitignore
index 720b01f79f..720b01f79f 100644
--- a/tests/auto/qtextpiecetable/.gitignore
+++ b/tests/auto/gui/text/qtextpiecetable/.gitignore
diff --git a/tests/auto/qtextpiecetable/qtextpiecetable.pro b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro
index cfbbe2bca5..cfbbe2bca5 100644
--- a/tests/auto/qtextpiecetable/qtextpiecetable.pro
+++ b/tests/auto/gui/text/qtextpiecetable/qtextpiecetable.pro
diff --git a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
index ddaf84134d..ddaf84134d 100644
--- a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
+++ b/tests/auto/gui/text/qtextpiecetable/tst_qtextpiecetable.cpp
diff --git a/tests/auto/qtextscriptengine/.gitignore b/tests/auto/gui/text/qtextscriptengine/.gitignore
index e51a335099..e51a335099 100644
--- a/tests/auto/qtextscriptengine/.gitignore
+++ b/tests/auto/gui/text/qtextscriptengine/.gitignore
diff --git a/tests/auto/qtextscriptengine/generate/generate.pro b/tests/auto/gui/text/qtextscriptengine/generate/generate.pro
index 354e0e5cdf..354e0e5cdf 100644
--- a/tests/auto/qtextscriptengine/generate/generate.pro
+++ b/tests/auto/gui/text/qtextscriptengine/generate/generate.pro
diff --git a/tests/auto/qtextscriptengine/generate/main.cpp b/tests/auto/gui/text/qtextscriptengine/generate/main.cpp
index 06caa34b4d..06caa34b4d 100644
--- a/tests/auto/qtextscriptengine/generate/main.cpp
+++ b/tests/auto/gui/text/qtextscriptengine/generate/main.cpp
diff --git a/tests/auto/qtextscriptengine/qtextscriptengine.pro b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro
index 0f5076e2ed..0f5076e2ed 100644
--- a/tests/auto/qtextscriptengine/qtextscriptengine.pro
+++ b/tests/auto/gui/text/qtextscriptengine/qtextscriptengine.pro
diff --git a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
index cbed675cb7..cbed675cb7 100644
--- a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp
+++ b/tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
diff --git a/tests/auto/qtexttable/.gitignore b/tests/auto/gui/text/qtexttable/.gitignore
index 876aa75c0a..876aa75c0a 100644
--- a/tests/auto/qtexttable/.gitignore
+++ b/tests/auto/gui/text/qtexttable/.gitignore
diff --git a/tests/auto/qtexttable/qtexttable.pro b/tests/auto/gui/text/qtexttable/qtexttable.pro
index 611b706fc4..611b706fc4 100644
--- a/tests/auto/qtexttable/qtexttable.pro
+++ b/tests/auto/gui/text/qtexttable/qtexttable.pro
diff --git a/tests/auto/qtexttable/tst_qtexttable.cpp b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
index 83343811d8..83343811d8 100644
--- a/tests/auto/qtexttable/tst_qtexttable.cpp
+++ b/tests/auto/gui/text/qtexttable/tst_qtexttable.cpp
diff --git a/tests/auto/qzip/.gitignore b/tests/auto/gui/text/qzip/.gitignore
index 2d7dfbe70c..2d7dfbe70c 100644
--- a/tests/auto/qzip/.gitignore
+++ b/tests/auto/gui/text/qzip/.gitignore
diff --git a/tests/auto/qzip/qzip.pro b/tests/auto/gui/text/qzip/qzip.pro
index 683da62e37..7631a3e93a 100644
--- a/tests/auto/qzip/qzip.pro
+++ b/tests/auto/gui/text/qzip/qzip.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += gui-private
 SOURCES += tst_qzip.cpp
 
 wince*|symbian: {
diff --git a/tests/auto/qzip/testdata/symlink.zip b/tests/auto/gui/text/qzip/testdata/symlink.zip
index 027f96477a..027f96477a 100644
--- a/tests/auto/qzip/testdata/symlink.zip
+++ b/tests/auto/gui/text/qzip/testdata/symlink.zip
diff --git a/tests/auto/qzip/testdata/test.zip b/tests/auto/gui/text/qzip/testdata/test.zip
index a57ba4e2a9..a57ba4e2a9 100644
--- a/tests/auto/qzip/testdata/test.zip
+++ b/tests/auto/gui/text/qzip/testdata/test.zip
diff --git a/tests/auto/qzip/tst_qzip.cpp b/tests/auto/gui/text/qzip/tst_qzip.cpp
index 0955ac069f..0955ac069f 100644
--- a/tests/auto/qzip/tst_qzip.cpp
+++ b/tests/auto/gui/text/qzip/tst_qzip.cpp
diff --git a/tests/auto/gui/text/text.pro b/tests/auto/gui/text/text.pro
new file mode 100644
index 0000000000..001a967ad6
--- /dev/null
+++ b/tests/auto/gui/text/text.pro
@@ -0,0 +1,32 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qabstracttextdocumentlayout \
+   qcssparser \
+   qfont \
+   qfontdatabase \
+   qfontmetrics \
+   qglyphrun \
+   qrawfont \
+   qstatictext \
+   qsyntaxhighlighter \
+   qtextblock \
+   qtextcursor \
+   qtextdocument \
+   qtextdocumentfragment \
+   qtextdocumentlayout \
+   qtextformat \
+   qtextlayout \
+   qtextlist \
+   qtextobject \
+   qtextpiecetable \
+   qtextscriptengine \
+   qtexttable \
+
+contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter
+
+win32:SUBDIRS -= qtextpiecetable
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+           qcssparser \
+           qtextlayout \
+           qtextpiecetable \
diff --git a/tests/auto/qdesktopservices/.gitignore b/tests/auto/gui/util/qdesktopservices/.gitignore
index c7ce852ccd..c7ce852ccd 100644
--- a/tests/auto/qdesktopservices/.gitignore
+++ b/tests/auto/gui/util/qdesktopservices/.gitignore
diff --git a/tests/auto/qdesktopservices/qdesktopservices.pro b/tests/auto/gui/util/qdesktopservices/qdesktopservices.pro
index 0e51ed0459..0e51ed0459 100644
--- a/tests/auto/qdesktopservices/qdesktopservices.pro
+++ b/tests/auto/gui/util/qdesktopservices/qdesktopservices.pro
diff --git a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp
index 8bea0a245b..8bea0a245b 100644
--- a/tests/auto/qdesktopservices/tst_qdesktopservices.cpp
+++ b/tests/auto/gui/util/qdesktopservices/tst_qdesktopservices.cpp
diff --git a/tests/auto/gui/util/util.pro b/tests/auto/gui/util/util.pro
new file mode 100644
index 0000000000..91313ab85e
--- /dev/null
+++ b/tests/auto/gui/util/util.pro
@@ -0,0 +1,4 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qdesktopservices \
+
diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index 739174de35..48c5dcccdb 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -7,22 +7,15 @@ SUBDIRS=\
            lancelot \
            qalgorithms \
            qcombobox \
-           qcssparser \
            qfocusevent \
-           qimage \
            qitemmodel \
            qlayout \
            qmdiarea \
            qmenu \
            qmenubar \
-           qmouseevent \
-           qpainter \
-           qpixmap \
-           qprinter \
            qsplitter \
            qtabwidget \
            qtextbrowser \
-           qtextdocument \
            qtextedit \
            qtoolbutton \
            qvariant \
@@ -32,7 +25,6 @@ SUBDIRS=\
 
 contains(QT_CONFIG, accessibility):SUBDIRS += qaccessibility
 
-contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter
 mac:!qpa {
     SUBDIRS += macgui \
                macnativeevents \
@@ -56,6 +48,4 @@ symbian {
 # Following tests depends on private API
 !contains(QT_CONFIG, private_tests): SUBDIRS -= \
            qcombobox \
-           qcssparser \
            qtextedit \
-
diff --git a/tests/auto/qgl/qgl.qrc b/tests/auto/qgl/qgl.qrc
index 653794a166..42281afc98 100644
--- a/tests/auto/qgl/qgl.qrc
+++ b/tests/auto/qgl/qgl.qrc
@@ -1,5 +1,5 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource>
-    <file alias="designer.png">../qpixmap/images/designer.png</file>
+    <file alias="designer.png">../gui/image/qpixmap/images/designer.png</file>
 </qresource>
 </RCC>
diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index b8741fe3aa..194e023d05 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -50,7 +50,7 @@
 #include <private/qgraphicssceneindex_p.h>
 #include <math.h>
 #include "../../shared/util.h"
-#include "../qpathclipper/pathcompare.h"
+#include "../gui/painting/qpathclipper/pathcompare.h"
 
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
 #include <windows.h>