765 files changed, 270 insertions, 238 deletions

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 86fe037887..ded314d9ba 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -5,6 +5,7 @@ SUBDIRS += \
     dbus \
     host.pro \
     gui.pro \
+    integrationtests \
     network.pro \
     opengl \
     sql \
@@ -13,6 +14,7 @@ SUBDIRS += \
     v8.pro \
     xml \
     other.pro \
+    widgets \
 
 cross_compile:                              SUBDIRS -= host.pro
 cross_compile:                              SUBDIRS -= tools
diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro
index 7269f890a7..ebdc1cd8c5 100644
--- a/tests/auto/corelib.pro
+++ b/tests/auto/corelib.pro
@@ -1,7 +1,5 @@
 TEMPLATE=subdirs
 SUBDIRS=\
    corelib \
-   collections \
-   exceptionsafety \
    qobjectrace \
    utf8
diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro
index 42fda6f300..552c94d35f 100644
--- a/tests/auto/corelib/kernel/kernel.pro
+++ b/tests/auto/corelib/kernel/kernel.pro
@@ -13,7 +13,7 @@ SUBDIRS=\
     qsignalmapper \
     qsocketnotifier \
     qtimer \
-    # qtipc \ # needs to be moved to qtscript
+    # qtipc \ # needs to be moved to qtscript (and note that it uses private API)
     qtranslator \
     qvariant \
     qwineventnotifier
diff --git a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro
index 50730b371f..eee2222cda 100644
--- a/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro
+++ b/tests/auto/corelib/kernel/qabstractitemmodel/qabstractitemmodel.pro
@@ -1,9 +1,7 @@
 load(qttest_p4)
 
-INCLUDEPATH += $$PWD/../../../modeltest
+mtdir = ../../../integrationtests/modeltest
+INCLUDEPATH += $$PWD/$${mtdir}
 QT += widgets
-SOURCES         += tst_qabstractitemmodel.cpp ../../../modeltest/dynamictreemodel.cpp ../../../modeltest/modeltest.cpp
-HEADERS         += ../../../modeltest/dynamictreemodel.h ../../../modeltest/modeltest.h
-
-
-
+SOURCES         += tst_qabstractitemmodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp
+HEADERS         += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index 7e07df24d8..d876873bd4 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -6,130 +6,9 @@
 TEMPLATE=subdirs
 SUBDIRS=\
     gui \
-    gestures \
-    languagechange \
-    modeltest \
-    qabstractbutton \
-    qabstractitemview \
-    qabstractprintdialog \
-    qabstractproxymodel \
-    qabstractscrollarea \
-    qabstractslider \
-    qabstractspinbox \
-    qaction \
-    qactiongroup \
-    qapplication \
-    qboxlayout \
-    qbuttongroup \
-    qcalendarwidget \
-    qcheckbox \
-    qcolordialog \
-    qcolumnview \
-    qcommandlinkbutton \
-    qcompleter \
-    qcomplextext \
-    qdatawidgetmapper \
-    qdatetimeedit \
-    qdesktopwidget \
-    qdial \
-    qdialog \
-    qdialogbuttonbox \
-    qdirmodel \
-    qdockwidget \
-    qdoublespinbox \
-    qdoublevalidator \
-    qerrormessage \
-    qfiledialog \
-    qfiledialog2 \
-    qfileiconprovider \
-    qfilesystemmodel \
-    qfocusframe \
-    qfontcombobox \
-    qfontdialog \
-    qformlayout \
-    qgraphicsanchorlayout \
-    qgraphicsanchorlayout1 \
-    qgraphicseffect \
-    qgraphicseffectsource \
-    qgraphicsgridlayout \
-    qgraphicsitem \
-    qgraphicsitemanimation \
-    qgraphicslayout \
-    qgraphicslayoutitem \
-    qgraphicslinearlayout \
-    qgraphicsobject \
-    qgraphicspixmapitem \
-    qgraphicspolygonitem \
-    qgraphicsproxywidget \
-    qgraphicsscene \
-    qgraphicssceneindex \
-    qgraphicstransform \
-    qgraphicsview \
-    qgraphicswidget \
-    qgridlayout \
-    qgroupbox \
-    qheaderview \
-    qidentityproxymodel \
-    qinputcontext \
-    qinputdialog \
-    qintvalidator \
-    qitemdelegate \
-    qitemeditorfactory \
-    qitemselectionmodel \
-    qitemview \
-    qlabel \
-    qlcdnumber \
-    qlineedit \
-    qlistview \
-    qlistwidget \
-    qmacstyle \
-    qmainwindow \
-    qmdisubwindow \
-    qmessagebox \
-    qnetworkaccessmanager_and_qprogressdialog \
     qopengl \
-    qplaintextedit \
-    qprogressbar \
-    qprogressdialog \
-    qpushbutton \
-    qradiobutton \
-    qregexpvalidator \
-    qscrollarea \
-    qscrollbar \
-    qscroller \
-    qsharedpointer_and_qwidget \
-    qsidebar \
-    qsizegrip \
-    qslider \
-    qsortfilterproxymodel \
-    qsound \
-    qspinbox \
-    qstackedlayout \
-    qstackedwidget \
-    qstandarditem \
-    qstandarditemmodel \
-    qstatusbar \
-    qstringlistmodel \
-    qstyle \
-    qstyleoption \
-    qstylesheetstyle \
-    qsystemtrayicon \
-    qtabbar \
-    qtableview \
-    qtablewidget \
-    qtoolbar \
-    qtoolbox \
-    qtooltip \
     qtransformedscreen \
-    qtreeview \
-    qtreewidget \
-    qtreewidgetitemiterator \
-    qundogroup \
-    qundostack \
-    qwidget_window \
-    qwidgetaction \
     qwindowsurface \
-    qwizard \
     qwsembedwidget \
     qwsinputmethod \
     qwswindowsystem \
@@ -139,13 +18,6 @@ SUBDIRS=\
 mac*:SUBDIRS -= \
     qwindowsurface \
 
-# This test can only be run on Mac OS
-!mac:SUBDIRS -= \
-    qmacstyle \
-
-# This test takes too long to run on IRIX, so skip it on that platform
-irix-*:SUBDIRS -= qitemview
-
 # These tests are only valid for QWS
 !embedded|wince*:SUBDIRS -= \
     qtransformedscreen \
@@ -153,28 +25,3 @@ irix-*:SUBDIRS -= qitemview
     qwsinputmethod \
     qwswindowsystem \
 
-# These tests require the cleanlooks style
-!contains(styles, cleanlooks):SUBDIRS -= \
-    qgraphicswidget \
-    qgraphicsproxywidget \
-
-win32:SUBDIRS -= qtextpiecetable
-
-!contains(QT_CONFIG, private_tests): SUBDIRS -= \
-           qcolumnview \
-           qgraphicsanchorlayout \
-           qgraphicsanchorlayout1 \
-           qgraphicsitem \
-           qgraphicsscene \
-           qgraphicssceneindex \
-           qlistwidget \
-           qmainwindow \
-           qpathclipper \
-           qpixmapcache \
-           qsidebar \
-           qstylesheetstyle \
-           qtextlayout \
-           qtextpiecetable \
-           qtipc \
-           qtoolbar \
-
diff --git a/tests/auto/collections/.gitignore b/tests/auto/integrationtests/collections/.gitignore
index dcd9d49ec0..dcd9d49ec0 100644
--- a/tests/auto/collections/.gitignore
+++ b/tests/auto/integrationtests/collections/.gitignore
diff --git a/tests/auto/collections/collections.pro b/tests/auto/integrationtests/collections/collections.pro
index 8601ff877d..8601ff877d 100644
--- a/tests/auto/collections/collections.pro
+++ b/tests/auto/integrationtests/collections/collections.pro
diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/integrationtests/collections/tst_collections.cpp
index f09ff06234..f09ff06234 100644
--- a/tests/auto/collections/tst_collections.cpp
+++ b/tests/auto/integrationtests/collections/tst_collections.cpp
diff --git a/tests/auto/exceptionsafety/.gitignore b/tests/auto/integrationtests/exceptionsafety/.gitignore
index 9a854c4c26..9a854c4c26 100644
--- a/tests/auto/exceptionsafety/.gitignore
+++ b/tests/auto/integrationtests/exceptionsafety/.gitignore
diff --git a/tests/auto/exceptionsafety/exceptionsafety.pro b/tests/auto/integrationtests/exceptionsafety/exceptionsafety.pro
index 52ba9e27bd..52ba9e27bd 100644
--- a/tests/auto/exceptionsafety/exceptionsafety.pro
+++ b/tests/auto/integrationtests/exceptionsafety/exceptionsafety.pro
diff --git a/tests/auto/exceptionsafety/tst_exceptionsafety.cpp b/tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp
index 27db9ea7f7..27db9ea7f7 100644
--- a/tests/auto/exceptionsafety/tst_exceptionsafety.cpp
+++ b/tests/auto/integrationtests/exceptionsafety/tst_exceptionsafety.cpp
diff --git a/tests/auto/exceptionsafety_objects/3rdparty/memcheck.h b/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/memcheck.h
index 72a02ca9ba..72a02ca9ba 100644
--- a/tests/auto/exceptionsafety_objects/3rdparty/memcheck.h
+++ b/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/memcheck.h
diff --git a/tests/auto/exceptionsafety_objects/3rdparty/valgrind.h b/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/valgrind.h
index 577c59ab0c..577c59ab0c 100644
--- a/tests/auto/exceptionsafety_objects/3rdparty/valgrind.h
+++ b/tests/auto/integrationtests/exceptionsafety_objects/3rdparty/valgrind.h
diff --git a/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro b/tests/auto/integrationtests/exceptionsafety_objects/exceptionsafety_objects.pro
index d09c349215..d09c349215 100644
--- a/tests/auto/exceptionsafety_objects/exceptionsafety_objects.pro
+++ b/tests/auto/integrationtests/exceptionsafety_objects/exceptionsafety_objects.pro
diff --git a/tests/auto/exceptionsafety_objects/oomsimulator.h b/tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h
index ed4bb53922..ed4bb53922 100644
--- a/tests/auto/exceptionsafety_objects/oomsimulator.h
+++ b/tests/auto/integrationtests/exceptionsafety_objects/oomsimulator.h
diff --git a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
index 0d410a79a2..0d410a79a2 100644
--- a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
+++ b/tests/auto/integrationtests/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
diff --git a/tests/auto/gestures/gestures.pro b/tests/auto/integrationtests/gestures/gestures.pro
index 43ae4a3fa1..43ae4a3fa1 100644
--- a/tests/auto/gestures/gestures.pro
+++ b/tests/auto/integrationtests/gestures/gestures.pro
diff --git a/tests/auto/gestures/tst_gestures.cpp b/tests/auto/integrationtests/gestures/tst_gestures.cpp
index 63345fbe88..63345fbe88 100644
--- a/tests/auto/gestures/tst_gestures.cpp
+++ b/tests/auto/integrationtests/gestures/tst_gestures.cpp
diff --git a/tests/auto/integrationtests/integrationtests.pro b/tests/auto/integrationtests/integrationtests.pro
new file mode 100644
index 0000000000..1d58f2c665
--- /dev/null
+++ b/tests/auto/integrationtests/integrationtests.pro
@@ -0,0 +1,35 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   collections \
+   exceptionsafety \
+   exceptionsafety_objects \
+   gestures \
+   lancelot \
+   languagechange \
+   macgui \
+   macnativeevents \
+   macplist \
+   modeltest \
+   networkselftest \
+   qaccessibility \
+   qcomplextext \
+   qdirectpainter \
+   qfocusevent \
+   qmultiscreen \
+   qnetworkaccessmanager_and_qprogressdialog \
+   qsharedpointer_and_qwidget \
+   windowsmobile \
+
+wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility
+
+!mac|qpa: SUBDIRS -= \
+           macgui \
+           macnativeevents \
+           macplist \
+
+!embedded|wince*: SUBDIRS -= \
+           qdirectpainter \
+           qmultiscreen \
+
+!linux*-g++*:SUBDIRS -= exceptionsafety_objects
+
diff --git a/tests/auto/lancelot/.gitignore b/tests/auto/integrationtests/lancelot/.gitignore
index 0a70416d57..0a70416d57 100644
--- a/tests/auto/lancelot/.gitignore
+++ b/tests/auto/integrationtests/lancelot/.gitignore
diff --git a/tests/auto/lancelot/images.qrc b/tests/auto/integrationtests/lancelot/images.qrc
index 060b52c85a..060b52c85a 100644
--- a/tests/auto/lancelot/images.qrc
+++ b/tests/auto/integrationtests/lancelot/images.qrc
diff --git a/tests/auto/lancelot/images/alpha.png b/tests/auto/integrationtests/lancelot/images/alpha.png
index e465b2586d..e465b2586d 100644
--- a/tests/auto/lancelot/images/alpha.png
+++ b/tests/auto/integrationtests/lancelot/images/alpha.png
diff --git a/tests/auto/lancelot/images/alpha2x2.png b/tests/auto/integrationtests/lancelot/images/alpha2x2.png
index 67ecc04286..67ecc04286 100644
--- a/tests/auto/lancelot/images/alpha2x2.png
+++ b/tests/auto/integrationtests/lancelot/images/alpha2x2.png
diff --git a/tests/auto/lancelot/images/bitmap.png b/tests/auto/integrationtests/lancelot/images/bitmap.png
index d21f8f51bb..d21f8f51bb 100644
--- a/tests/auto/lancelot/images/bitmap.png
+++ b/tests/auto/integrationtests/lancelot/images/bitmap.png
diff --git a/tests/auto/lancelot/images/border.png b/tests/auto/integrationtests/lancelot/images/border.png
index a3d2fed0a3..a3d2fed0a3 100644
--- a/tests/auto/lancelot/images/border.png
+++ b/tests/auto/integrationtests/lancelot/images/border.png
diff --git a/tests/auto/lancelot/images/borderimage.png b/tests/auto/integrationtests/lancelot/images/borderimage.png
index f7f6b66227..f7f6b66227 100644
--- a/tests/auto/lancelot/images/borderimage.png
+++ b/tests/auto/integrationtests/lancelot/images/borderimage.png
diff --git a/tests/auto/lancelot/images/dome_argb32.png b/tests/auto/integrationtests/lancelot/images/dome_argb32.png
index e3ccba0c13..e3ccba0c13 100644
--- a/tests/auto/lancelot/images/dome_argb32.png
+++ b/tests/auto/integrationtests/lancelot/images/dome_argb32.png
diff --git a/tests/auto/lancelot/images/dome_indexed.png b/tests/auto/integrationtests/lancelot/images/dome_indexed.png
index beefcd514e..beefcd514e 100644
--- a/tests/auto/lancelot/images/dome_indexed.png
+++ b/tests/auto/integrationtests/lancelot/images/dome_indexed.png
diff --git a/tests/auto/lancelot/images/dome_indexed_mask.png b/tests/auto/integrationtests/lancelot/images/dome_indexed_mask.png
index a62f29f40e..a62f29f40e 100644
--- a/tests/auto/lancelot/images/dome_indexed_mask.png
+++ b/tests/auto/integrationtests/lancelot/images/dome_indexed_mask.png
diff --git a/tests/auto/lancelot/images/dome_mono.png b/tests/auto/integrationtests/lancelot/images/dome_mono.png
index 950c2a7494..950c2a7494 100644
--- a/tests/auto/lancelot/images/dome_mono.png
+++ b/tests/auto/integrationtests/lancelot/images/dome_mono.png
diff --git a/tests/auto/lancelot/images/dome_mono_128.png b/tests/auto/integrationtests/lancelot/images/dome_mono_128.png
index 77e48aaab7..77e48aaab7 100644
--- a/tests/auto/lancelot/images/dome_mono_128.png
+++ b/tests/auto/integrationtests/lancelot/images/dome_mono_128.png
diff --git a/tests/auto/lancelot/images/dome_mono_palette.png b/tests/auto/integrationtests/lancelot/images/dome_mono_palette.png
index dca3f59245..dca3f59245 100644
--- a/tests/auto/lancelot/images/dome_mono_palette.png
+++ b/tests/auto/integrationtests/lancelot/images/dome_mono_palette.png
diff --git a/tests/auto/lancelot/images/dome_rgb32.png b/tests/auto/integrationtests/lancelot/images/dome_rgb32.png
index 27bc02a545..27bc02a545 100644
--- a/tests/auto/lancelot/images/dome_rgb32.png
+++ b/tests/auto/integrationtests/lancelot/images/dome_rgb32.png
diff --git a/tests/auto/lancelot/images/dot.png b/tests/auto/integrationtests/lancelot/images/dot.png
index 17a7b6a0ba..17a7b6a0ba 100644
--- a/tests/auto/lancelot/images/dot.png
+++ b/tests/auto/integrationtests/lancelot/images/dot.png
diff --git a/tests/auto/lancelot/images/face.png b/tests/auto/integrationtests/lancelot/images/face.png
index 4f6172d83b..4f6172d83b 100644
--- a/tests/auto/lancelot/images/face.png
+++ b/tests/auto/integrationtests/lancelot/images/face.png
diff --git a/tests/auto/lancelot/images/gam030.png b/tests/auto/integrationtests/lancelot/images/gam030.png
index 904c9721bd..904c9721bd 100644
--- a/tests/auto/lancelot/images/gam030.png
+++ b/tests/auto/integrationtests/lancelot/images/gam030.png
diff --git a/tests/auto/lancelot/images/gam045.png b/tests/auto/integrationtests/lancelot/images/gam045.png
index b649a8a54f..b649a8a54f 100644
--- a/tests/auto/lancelot/images/gam045.png
+++ b/tests/auto/integrationtests/lancelot/images/gam045.png
diff --git a/tests/auto/lancelot/images/gam056.png b/tests/auto/integrationtests/lancelot/images/gam056.png
index e5f959dc96..e5f959dc96 100644
--- a/tests/auto/lancelot/images/gam056.png
+++ b/tests/auto/integrationtests/lancelot/images/gam056.png
diff --git a/tests/auto/lancelot/images/gam100.png b/tests/auto/integrationtests/lancelot/images/gam100.png
index 6c7ba5f1ed..6c7ba5f1ed 100644
--- a/tests/auto/lancelot/images/gam100.png
+++ b/tests/auto/integrationtests/lancelot/images/gam100.png
diff --git a/tests/auto/lancelot/images/gam200.png b/tests/auto/integrationtests/lancelot/images/gam200.png
index daa20fcbc4..daa20fcbc4 100644
--- a/tests/auto/lancelot/images/gam200.png
+++ b/tests/auto/integrationtests/lancelot/images/gam200.png
diff --git a/tests/auto/lancelot/images/image.png b/tests/auto/integrationtests/lancelot/images/image.png
index 85d486a790..85d486a790 100644
--- a/tests/auto/lancelot/images/image.png
+++ b/tests/auto/integrationtests/lancelot/images/image.png
diff --git a/tests/auto/lancelot/images/mask.png b/tests/auto/integrationtests/lancelot/images/mask.png
index c3f3b1b6ca..c3f3b1b6ca 100644
--- a/tests/auto/lancelot/images/mask.png
+++ b/tests/auto/integrationtests/lancelot/images/mask.png
diff --git a/tests/auto/lancelot/images/mask_100.png b/tests/auto/integrationtests/lancelot/images/mask_100.png
index fc950dc7ed..fc950dc7ed 100644
--- a/tests/auto/lancelot/images/mask_100.png
+++ b/tests/auto/integrationtests/lancelot/images/mask_100.png
diff --git a/tests/auto/lancelot/images/masked.png b/tests/auto/integrationtests/lancelot/images/masked.png
index 6debec534d..6debec534d 100644
--- a/tests/auto/lancelot/images/masked.png
+++ b/tests/auto/integrationtests/lancelot/images/masked.png
diff --git a/tests/auto/lancelot/images/sign.png b/tests/auto/integrationtests/lancelot/images/sign.png
index 6aac7e150a..6aac7e150a 100644
--- a/tests/auto/lancelot/images/sign.png
+++ b/tests/auto/integrationtests/lancelot/images/sign.png
diff --git a/tests/auto/lancelot/images/solid.png b/tests/auto/integrationtests/lancelot/images/solid.png
index 371e9c1aee..371e9c1aee 100644
--- a/tests/auto/lancelot/images/solid.png
+++ b/tests/auto/integrationtests/lancelot/images/solid.png
diff --git a/tests/auto/lancelot/images/solid2x2.png b/tests/auto/integrationtests/lancelot/images/solid2x2.png
index ad67cd3e12..ad67cd3e12 100644
--- a/tests/auto/lancelot/images/solid2x2.png
+++ b/tests/auto/integrationtests/lancelot/images/solid2x2.png
diff --git a/tests/auto/lancelot/images/struct-image-01.jpg b/tests/auto/integrationtests/lancelot/images/struct-image-01.jpg
index a74e07223b..a74e07223b 100644
--- a/tests/auto/lancelot/images/struct-image-01.jpg
+++ b/tests/auto/integrationtests/lancelot/images/struct-image-01.jpg
diff --git a/tests/auto/lancelot/images/struct-image-01.png b/tests/auto/integrationtests/lancelot/images/struct-image-01.png
index 4ed08406dc..4ed08406dc 100644
--- a/tests/auto/lancelot/images/struct-image-01.png
+++ b/tests/auto/integrationtests/lancelot/images/struct-image-01.png
diff --git a/tests/auto/lancelot/images/zebra.png b/tests/auto/integrationtests/lancelot/images/zebra.png
index ef35f20785..ef35f20785 100644
--- a/tests/auto/lancelot/images/zebra.png
+++ b/tests/auto/integrationtests/lancelot/images/zebra.png
diff --git a/tests/auto/lancelot/lancelot.pro b/tests/auto/integrationtests/lancelot/lancelot.pro
index 5b61c32aa5..d34732e06e 100644
--- a/tests/auto/lancelot/lancelot.pro
+++ b/tests/auto/integrationtests/lancelot/lancelot.pro
@@ -7,7 +7,7 @@ SOURCES += tst_lancelot.cpp \
 HEADERS += paintcommands.h
 RESOURCES += images.qrc
 
-include($$PWD/../../baselineserver/shared/qbaselinetest.pri)
+include($$PWD/../../../baselineserver/shared/qbaselinetest.pri)
 
 !wince*:DEFINES += SRCDIR=\\\"$$PWD\\\"
 linux-g++-maemo:DEFINES += USE_RUNTIME_DIR
diff --git a/tests/auto/lancelot/paintcommands.cpp b/tests/auto/integrationtests/lancelot/paintcommands.cpp
index 9659659973..9659659973 100644
--- a/tests/auto/lancelot/paintcommands.cpp
+++ b/tests/auto/integrationtests/lancelot/paintcommands.cpp
diff --git a/tests/auto/lancelot/paintcommands.h b/tests/auto/integrationtests/lancelot/paintcommands.h
index 925a867f2f..925a867f2f 100644
--- a/tests/auto/lancelot/paintcommands.h
+++ b/tests/auto/integrationtests/lancelot/paintcommands.h
diff --git a/tests/auto/lancelot/scripts/aliasing.qps b/tests/auto/integrationtests/lancelot/scripts/aliasing.qps
index 59878f9c4d..59878f9c4d 100644
--- a/tests/auto/lancelot/scripts/aliasing.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/aliasing.qps
diff --git a/tests/auto/lancelot/scripts/arcs.qps b/tests/auto/integrationtests/lancelot/scripts/arcs.qps
index 8a7a468df1..8a7a468df1 100644
--- a/tests/auto/lancelot/scripts/arcs.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/arcs.qps
diff --git a/tests/auto/lancelot/scripts/arcs2.qps b/tests/auto/integrationtests/lancelot/scripts/arcs2.qps
index 411ff08014..411ff08014 100644
--- a/tests/auto/lancelot/scripts/arcs2.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/arcs2.qps
diff --git a/tests/auto/lancelot/scripts/background.qps b/tests/auto/integrationtests/lancelot/scripts/background.qps
index 000cfcdd91..000cfcdd91 100644
--- a/tests/auto/lancelot/scripts/background.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/background.qps
diff --git a/tests/auto/lancelot/scripts/background_brush.qps b/tests/auto/integrationtests/lancelot/scripts/background_brush.qps
index ca1f944964..ca1f944964 100644
--- a/tests/auto/lancelot/scripts/background_brush.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/background_brush.qps
diff --git a/tests/auto/lancelot/scripts/beziers.qps b/tests/auto/integrationtests/lancelot/scripts/beziers.qps
index 9b47cd05ac..9b47cd05ac 100644
--- a/tests/auto/lancelot/scripts/beziers.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/beziers.qps
diff --git a/tests/auto/lancelot/scripts/bitmaps.qps b/tests/auto/integrationtests/lancelot/scripts/bitmaps.qps
index a816b9d497..a816b9d497 100644
--- a/tests/auto/lancelot/scripts/bitmaps.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/bitmaps.qps
diff --git a/tests/auto/lancelot/scripts/borderimage.qps b/tests/auto/integrationtests/lancelot/scripts/borderimage.qps
index ebd4f4d249..ebd4f4d249 100644
--- a/tests/auto/lancelot/scripts/borderimage.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/borderimage.qps
diff --git a/tests/auto/lancelot/scripts/brush_pens.qps b/tests/auto/integrationtests/lancelot/scripts/brush_pens.qps
index b9a2bc0ada..b9a2bc0ada 100644
--- a/tests/auto/lancelot/scripts/brush_pens.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/brush_pens.qps
diff --git a/tests/auto/lancelot/scripts/brushes.qps b/tests/auto/integrationtests/lancelot/scripts/brushes.qps
index 82cbff48b9..82cbff48b9 100644
--- a/tests/auto/lancelot/scripts/brushes.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/brushes.qps
diff --git a/tests/auto/lancelot/scripts/clippaths.qps b/tests/auto/integrationtests/lancelot/scripts/clippaths.qps
index fba89784df..fba89784df 100644
--- a/tests/auto/lancelot/scripts/clippaths.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/clippaths.qps
diff --git a/tests/auto/lancelot/scripts/clipping.qps b/tests/auto/integrationtests/lancelot/scripts/clipping.qps
index 3694ff2ba7..3694ff2ba7 100644
--- a/tests/auto/lancelot/scripts/clipping.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/clipping.qps
diff --git a/tests/auto/lancelot/scripts/clipping_state.qps b/tests/auto/integrationtests/lancelot/scripts/clipping_state.qps
index a29d3738c8..a29d3738c8 100644
--- a/tests/auto/lancelot/scripts/clipping_state.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/clipping_state.qps
diff --git a/tests/auto/lancelot/scripts/cliprects.qps b/tests/auto/integrationtests/lancelot/scripts/cliprects.qps
index 0d28b035b4..0d28b035b4 100644
--- a/tests/auto/lancelot/scripts/cliprects.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/cliprects.qps
diff --git a/tests/auto/lancelot/scripts/conical_gradients.qps b/tests/auto/integrationtests/lancelot/scripts/conical_gradients.qps
index 2e897b1813..2e897b1813 100644
--- a/tests/auto/lancelot/scripts/conical_gradients.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/conical_gradients.qps
diff --git a/tests/auto/lancelot/scripts/conical_gradients_perspectives.qps b/tests/auto/integrationtests/lancelot/scripts/conical_gradients_perspectives.qps
index a9c14f1ce7..a9c14f1ce7 100644
--- a/tests/auto/lancelot/scripts/conical_gradients_perspectives.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/conical_gradients_perspectives.qps
diff --git a/tests/auto/lancelot/scripts/dashes.qps b/tests/auto/integrationtests/lancelot/scripts/dashes.qps
index 649f56cf66..649f56cf66 100644
--- a/tests/auto/lancelot/scripts/dashes.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/dashes.qps
diff --git a/tests/auto/lancelot/scripts/degeneratebeziers.qps b/tests/auto/integrationtests/lancelot/scripts/degeneratebeziers.qps
index fb223d5b1f..fb223d5b1f 100644
--- a/tests/auto/lancelot/scripts/degeneratebeziers.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/degeneratebeziers.qps
diff --git a/tests/auto/lancelot/scripts/deviceclipping.qps b/tests/auto/integrationtests/lancelot/scripts/deviceclipping.qps
index cedfc1e363..cedfc1e363 100644
--- a/tests/auto/lancelot/scripts/deviceclipping.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/deviceclipping.qps
diff --git a/tests/auto/lancelot/scripts/drawpoints.qps b/tests/auto/integrationtests/lancelot/scripts/drawpoints.qps
index c02cd85737..c02cd85737 100644
--- a/tests/auto/lancelot/scripts/drawpoints.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/drawpoints.qps
diff --git a/tests/auto/lancelot/scripts/ellipses.qps b/tests/auto/integrationtests/lancelot/scripts/ellipses.qps
index e2cffd7f27..e2cffd7f27 100644
--- a/tests/auto/lancelot/scripts/ellipses.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/ellipses.qps
diff --git a/tests/auto/lancelot/scripts/filltest.qps b/tests/auto/integrationtests/lancelot/scripts/filltest.qps
index 2eeba2ecf6..2eeba2ecf6 100644
--- a/tests/auto/lancelot/scripts/filltest.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/filltest.qps
diff --git a/tests/auto/lancelot/scripts/gradients.qps b/tests/auto/integrationtests/lancelot/scripts/gradients.qps
index eb3cda9cad..eb3cda9cad 100644
--- a/tests/auto/lancelot/scripts/gradients.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/gradients.qps
diff --git a/tests/auto/lancelot/scripts/hinting.qps b/tests/auto/integrationtests/lancelot/scripts/hinting.qps
index 7ce21b287a..7ce21b287a 100644
--- a/tests/auto/lancelot/scripts/hinting.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/hinting.qps
diff --git a/tests/auto/lancelot/scripts/image_formats.qps b/tests/auto/integrationtests/lancelot/scripts/image_formats.qps
index d817d04bf8..d817d04bf8 100644
--- a/tests/auto/lancelot/scripts/image_formats.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/image_formats.qps
diff --git a/tests/auto/lancelot/scripts/images.qps b/tests/auto/integrationtests/lancelot/scripts/images.qps
index 3f892400e2..3f892400e2 100644
--- a/tests/auto/lancelot/scripts/images.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/images.qps
diff --git a/tests/auto/lancelot/scripts/images2.qps b/tests/auto/integrationtests/lancelot/scripts/images2.qps
index 5159abc928..5159abc928 100644
--- a/tests/auto/lancelot/scripts/images2.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/images2.qps
diff --git a/tests/auto/lancelot/scripts/join_cap_styles.qps b/tests/auto/integrationtests/lancelot/scripts/join_cap_styles.qps
index ed823f53f5..ed823f53f5 100644
--- a/tests/auto/lancelot/scripts/join_cap_styles.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/join_cap_styles.qps
diff --git a/tests/auto/lancelot/scripts/join_cap_styles_duplicate_control_points.qps b/tests/auto/integrationtests/lancelot/scripts/join_cap_styles_duplicate_control_points.qps
index b4630148e2..b4630148e2 100644
--- a/tests/auto/lancelot/scripts/join_cap_styles_duplicate_control_points.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/join_cap_styles_duplicate_control_points.qps
diff --git a/tests/auto/lancelot/scripts/linear_gradients.qps b/tests/auto/integrationtests/lancelot/scripts/linear_gradients.qps
index b1b8dd69e7..b1b8dd69e7 100644
--- a/tests/auto/lancelot/scripts/linear_gradients.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/linear_gradients.qps
diff --git a/tests/auto/lancelot/scripts/linear_gradients_perspectives.qps b/tests/auto/integrationtests/lancelot/scripts/linear_gradients_perspectives.qps
index 3ea39fbe46..3ea39fbe46 100644
--- a/tests/auto/lancelot/scripts/linear_gradients_perspectives.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/linear_gradients_perspectives.qps
diff --git a/tests/auto/lancelot/scripts/linear_resolving_gradients.qps b/tests/auto/integrationtests/lancelot/scripts/linear_resolving_gradients.qps
index 779760cb9a..779760cb9a 100644
--- a/tests/auto/lancelot/scripts/linear_resolving_gradients.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/linear_resolving_gradients.qps
diff --git a/tests/auto/lancelot/scripts/lineconsistency.qps b/tests/auto/integrationtests/lancelot/scripts/lineconsistency.qps
index 0b40577659..0b40577659 100644
--- a/tests/auto/lancelot/scripts/lineconsistency.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/lineconsistency.qps
diff --git a/tests/auto/lancelot/scripts/linedashes.qps b/tests/auto/integrationtests/lancelot/scripts/linedashes.qps
index ee7d18b156..ee7d18b156 100644
--- a/tests/auto/lancelot/scripts/linedashes.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/linedashes.qps
diff --git a/tests/auto/lancelot/scripts/linedashes2.qps b/tests/auto/integrationtests/lancelot/scripts/linedashes2.qps
index 1dc4fd310e..1dc4fd310e 100644
--- a/tests/auto/lancelot/scripts/linedashes2.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/linedashes2.qps
diff --git a/tests/auto/lancelot/scripts/linedashes2_aa.qps b/tests/auto/integrationtests/lancelot/scripts/linedashes2_aa.qps
index c818ab62fe..c818ab62fe 100644
--- a/tests/auto/lancelot/scripts/linedashes2_aa.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/linedashes2_aa.qps
diff --git a/tests/auto/lancelot/scripts/lines.qps b/tests/auto/integrationtests/lancelot/scripts/lines.qps
index c0daffb1b0..c0daffb1b0 100644
--- a/tests/auto/lancelot/scripts/lines.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/lines.qps
diff --git a/tests/auto/lancelot/scripts/lines2.qps b/tests/auto/integrationtests/lancelot/scripts/lines2.qps
index af6ad65939..af6ad65939 100644
--- a/tests/auto/lancelot/scripts/lines2.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/lines2.qps
diff --git a/tests/auto/lancelot/scripts/pathfill.qps b/tests/auto/integrationtests/lancelot/scripts/pathfill.qps
index 821b4684c9..821b4684c9 100644
--- a/tests/auto/lancelot/scripts/pathfill.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/pathfill.qps
diff --git a/tests/auto/lancelot/scripts/paths.qps b/tests/auto/integrationtests/lancelot/scripts/paths.qps
index 083026ee17..083026ee17 100644
--- a/tests/auto/lancelot/scripts/paths.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/paths.qps
diff --git a/tests/auto/lancelot/scripts/paths_aa.qps b/tests/auto/integrationtests/lancelot/scripts/paths_aa.qps
index 4812e2fa5f..4812e2fa5f 100644
--- a/tests/auto/lancelot/scripts/paths_aa.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/paths_aa.qps
diff --git a/tests/auto/lancelot/scripts/pens.qps b/tests/auto/integrationtests/lancelot/scripts/pens.qps
index c72636dcef..c72636dcef 100644
--- a/tests/auto/lancelot/scripts/pens.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/pens.qps
diff --git a/tests/auto/lancelot/scripts/pens_aa.qps b/tests/auto/integrationtests/lancelot/scripts/pens_aa.qps
index 066cac365f..066cac365f 100644
--- a/tests/auto/lancelot/scripts/pens_aa.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/pens_aa.qps
diff --git a/tests/auto/lancelot/scripts/pens_cosmetic.qps b/tests/auto/integrationtests/lancelot/scripts/pens_cosmetic.qps
index d1a60d150d..d1a60d150d 100644
--- a/tests/auto/lancelot/scripts/pens_cosmetic.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/pens_cosmetic.qps
diff --git a/tests/auto/lancelot/scripts/perspectives.qps b/tests/auto/integrationtests/lancelot/scripts/perspectives.qps
index 0b903e5260..0b903e5260 100644
--- a/tests/auto/lancelot/scripts/perspectives.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/perspectives.qps
diff --git a/tests/auto/lancelot/scripts/perspectives2.qps b/tests/auto/integrationtests/lancelot/scripts/perspectives2.qps
index 2f6d1d653c..2f6d1d653c 100644
--- a/tests/auto/lancelot/scripts/perspectives2.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/perspectives2.qps
diff --git a/tests/auto/lancelot/scripts/pixmap_rotation.qps b/tests/auto/integrationtests/lancelot/scripts/pixmap_rotation.qps
index 2f1ffb53e6..2f1ffb53e6 100644
--- a/tests/auto/lancelot/scripts/pixmap_rotation.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/pixmap_rotation.qps
diff --git a/tests/auto/lancelot/scripts/pixmap_scaling.qps b/tests/auto/integrationtests/lancelot/scripts/pixmap_scaling.qps
index 651896f4a3..651896f4a3 100644
--- a/tests/auto/lancelot/scripts/pixmap_scaling.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/pixmap_scaling.qps
diff --git a/tests/auto/lancelot/scripts/pixmap_subpixel.qps b/tests/auto/integrationtests/lancelot/scripts/pixmap_subpixel.qps
index 908f7c3465..908f7c3465 100644
--- a/tests/auto/lancelot/scripts/pixmap_subpixel.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/pixmap_subpixel.qps
diff --git a/tests/auto/lancelot/scripts/pixmaps.qps b/tests/auto/integrationtests/lancelot/scripts/pixmaps.qps
index 8e60997acc..8e60997acc 100644
--- a/tests/auto/lancelot/scripts/pixmaps.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/pixmaps.qps
diff --git a/tests/auto/lancelot/scripts/porter_duff.qps b/tests/auto/integrationtests/lancelot/scripts/porter_duff.qps
index 166e48a57f..166e48a57f 100644
--- a/tests/auto/lancelot/scripts/porter_duff.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/porter_duff.qps
diff --git a/tests/auto/lancelot/scripts/porter_duff2.qps b/tests/auto/integrationtests/lancelot/scripts/porter_duff2.qps
index a792d9b278..a792d9b278 100644
--- a/tests/auto/lancelot/scripts/porter_duff2.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/porter_duff2.qps
diff --git a/tests/auto/lancelot/scripts/primitives.qps b/tests/auto/integrationtests/lancelot/scripts/primitives.qps
index f44ba27566..f44ba27566 100644
--- a/tests/auto/lancelot/scripts/primitives.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/primitives.qps
diff --git a/tests/auto/lancelot/scripts/radial_gradients.qps b/tests/auto/integrationtests/lancelot/scripts/radial_gradients.qps
index b55df8bde6..b55df8bde6 100644
--- a/tests/auto/lancelot/scripts/radial_gradients.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/radial_gradients.qps
diff --git a/tests/auto/lancelot/scripts/radial_gradients_perspectives.qps b/tests/auto/integrationtests/lancelot/scripts/radial_gradients_perspectives.qps
index 4557354dce..4557354dce 100644
--- a/tests/auto/lancelot/scripts/radial_gradients_perspectives.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/radial_gradients_perspectives.qps
diff --git a/tests/auto/lancelot/scripts/rasterops.qps b/tests/auto/integrationtests/lancelot/scripts/rasterops.qps
index 21f943b543..21f943b543 100644
--- a/tests/auto/lancelot/scripts/rasterops.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/rasterops.qps
diff --git a/tests/auto/lancelot/scripts/sizes.qps b/tests/auto/integrationtests/lancelot/scripts/sizes.qps
index 68e01c3262..68e01c3262 100644
--- a/tests/auto/lancelot/scripts/sizes.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/sizes.qps
diff --git a/tests/auto/lancelot/scripts/statictext.qps b/tests/auto/integrationtests/lancelot/scripts/statictext.qps
index b62b623462..b62b623462 100644
--- a/tests/auto/lancelot/scripts/statictext.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/statictext.qps
diff --git a/tests/auto/lancelot/scripts/text.qps b/tests/auto/integrationtests/lancelot/scripts/text.qps
index d7ee83290b..d7ee83290b 100644
--- a/tests/auto/lancelot/scripts/text.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/text.qps
diff --git a/tests/auto/lancelot/scripts/text_perspectives.qps b/tests/auto/integrationtests/lancelot/scripts/text_perspectives.qps
index 4c74306265..4c74306265 100644
--- a/tests/auto/lancelot/scripts/text_perspectives.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/text_perspectives.qps
diff --git a/tests/auto/lancelot/scripts/tiled_pixmap.qps b/tests/auto/integrationtests/lancelot/scripts/tiled_pixmap.qps
index 9cb5e0dd1f..9cb5e0dd1f 100644
--- a/tests/auto/lancelot/scripts/tiled_pixmap.qps
+++ b/tests/auto/integrationtests/lancelot/scripts/tiled_pixmap.qps
diff --git a/tests/auto/lancelot/tst_lancelot.cpp b/tests/auto/integrationtests/lancelot/tst_lancelot.cpp
index 07ed74ec6a..07ed74ec6a 100644
--- a/tests/auto/lancelot/tst_lancelot.cpp
+++ b/tests/auto/integrationtests/lancelot/tst_lancelot.cpp
diff --git a/tests/auto/languagechange/.gitignore b/tests/auto/integrationtests/languagechange/.gitignore
index 1b14ad1503..1b14ad1503 100644
--- a/tests/auto/languagechange/.gitignore
+++ b/tests/auto/integrationtests/languagechange/.gitignore
diff --git a/tests/auto/languagechange/languagechange.pro b/tests/auto/integrationtests/languagechange/languagechange.pro
index c51c42ebe1..c51c42ebe1 100644
--- a/tests/auto/languagechange/languagechange.pro
+++ b/tests/auto/integrationtests/languagechange/languagechange.pro
diff --git a/tests/auto/languagechange/tst_languagechange.cpp b/tests/auto/integrationtests/languagechange/tst_languagechange.cpp
index 5e97fd709e..5e97fd709e 100644
--- a/tests/auto/languagechange/tst_languagechange.cpp
+++ b/tests/auto/integrationtests/languagechange/tst_languagechange.cpp
diff --git a/tests/auto/macgui/.gitignore b/tests/auto/integrationtests/macgui/.gitignore
index 2b13357fac..2b13357fac 100644
--- a/tests/auto/macgui/.gitignore
+++ b/tests/auto/integrationtests/macgui/.gitignore
diff --git a/tests/auto/macgui/guitest.cpp b/tests/auto/integrationtests/macgui/guitest.cpp
index 521134f6b8..521134f6b8 100644
--- a/tests/auto/macgui/guitest.cpp
+++ b/tests/auto/integrationtests/macgui/guitest.cpp
diff --git a/tests/auto/macgui/guitest.h b/tests/auto/integrationtests/macgui/guitest.h
index 432021c54a..432021c54a 100644
--- a/tests/auto/macgui/guitest.h
+++ b/tests/auto/integrationtests/macgui/guitest.h
diff --git a/tests/auto/macgui/macgui.pro b/tests/auto/integrationtests/macgui/macgui.pro
index 3fbe74f7c8..3fbe74f7c8 100644
--- a/tests/auto/macgui/macgui.pro
+++ b/tests/auto/integrationtests/macgui/macgui.pro
diff --git a/tests/auto/macgui/tst_macgui.cpp b/tests/auto/integrationtests/macgui/tst_macgui.cpp
index 1552db21ab..1552db21ab 100644
--- a/tests/auto/macgui/tst_macgui.cpp
+++ b/tests/auto/integrationtests/macgui/tst_macgui.cpp
diff --git a/tests/auto/macnativeevents/expectedeventlist.cpp b/tests/auto/integrationtests/macnativeevents/expectedeventlist.cpp
index d603f82f27..d603f82f27 100644
--- a/tests/auto/macnativeevents/expectedeventlist.cpp
+++ b/tests/auto/integrationtests/macnativeevents/expectedeventlist.cpp
diff --git a/tests/auto/macnativeevents/expectedeventlist.h b/tests/auto/integrationtests/macnativeevents/expectedeventlist.h
index e3fef2d56d..e3fef2d56d 100644
--- a/tests/auto/macnativeevents/expectedeventlist.h
+++ b/tests/auto/integrationtests/macnativeevents/expectedeventlist.h
diff --git a/tests/auto/macnativeevents/macnativeevents.pro b/tests/auto/integrationtests/macnativeevents/macnativeevents.pro
index 0a0f6c8743..0a0f6c8743 100644
--- a/tests/auto/macnativeevents/macnativeevents.pro
+++ b/tests/auto/integrationtests/macnativeevents/macnativeevents.pro
diff --git a/tests/auto/macnativeevents/nativeeventlist.cpp b/tests/auto/integrationtests/macnativeevents/nativeeventlist.cpp
index 8c7f609d9f..8c7f609d9f 100644
--- a/tests/auto/macnativeevents/nativeeventlist.cpp
+++ b/tests/auto/integrationtests/macnativeevents/nativeeventlist.cpp
diff --git a/tests/auto/macnativeevents/nativeeventlist.h b/tests/auto/integrationtests/macnativeevents/nativeeventlist.h
index 6bebca1613..6bebca1613 100644
--- a/tests/auto/macnativeevents/nativeeventlist.h
+++ b/tests/auto/integrationtests/macnativeevents/nativeeventlist.h
diff --git a/tests/auto/macnativeevents/qnativeevents.cpp b/tests/auto/integrationtests/macnativeevents/qnativeevents.cpp
index b530d7bbe3..b530d7bbe3 100644
--- a/tests/auto/macnativeevents/qnativeevents.cpp
+++ b/tests/auto/integrationtests/macnativeevents/qnativeevents.cpp
diff --git a/tests/auto/macnativeevents/qnativeevents.h b/tests/auto/integrationtests/macnativeevents/qnativeevents.h
index 276afc4fb7..276afc4fb7 100644
--- a/tests/auto/macnativeevents/qnativeevents.h
+++ b/tests/auto/integrationtests/macnativeevents/qnativeevents.h
diff --git a/tests/auto/macnativeevents/qnativeevents_mac.cpp b/tests/auto/integrationtests/macnativeevents/qnativeevents_mac.cpp
index 8987a8d502..8987a8d502 100644
--- a/tests/auto/macnativeevents/qnativeevents_mac.cpp
+++ b/tests/auto/integrationtests/macnativeevents/qnativeevents_mac.cpp
diff --git a/tests/auto/macnativeevents/tst_macnativeevents.cpp b/tests/auto/integrationtests/macnativeevents/tst_macnativeevents.cpp
index ea30b0b5c2..ea30b0b5c2 100644
--- a/tests/auto/macnativeevents/tst_macnativeevents.cpp
+++ b/tests/auto/integrationtests/macnativeevents/tst_macnativeevents.cpp
diff --git a/tests/auto/macplist/app/app.pro b/tests/auto/integrationtests/macplist/app/app.pro
index c1cf52e0ef..c1cf52e0ef 100644
--- a/tests/auto/macplist/app/app.pro
+++ b/tests/auto/integrationtests/macplist/app/app.pro
diff --git a/tests/auto/macplist/app/main.cpp b/tests/auto/integrationtests/macplist/app/main.cpp
index ddc47a9a5f..ddc47a9a5f 100644
--- a/tests/auto/macplist/app/main.cpp
+++ b/tests/auto/integrationtests/macplist/app/main.cpp
diff --git a/tests/auto/macplist/macplist.pro b/tests/auto/integrationtests/macplist/macplist.pro
index 3a0e2d43d3..3a0e2d43d3 100644
--- a/tests/auto/macplist/macplist.pro
+++ b/tests/auto/integrationtests/macplist/macplist.pro
diff --git a/tests/auto/macplist/test/test.pro b/tests/auto/integrationtests/macplist/test/test.pro
index 4751b47e00..4751b47e00 100644
--- a/tests/auto/macplist/test/test.pro
+++ b/tests/auto/integrationtests/macplist/test/test.pro
diff --git a/tests/auto/macplist/tst_macplist.cpp b/tests/auto/integrationtests/macplist/tst_macplist.cpp
index 5b48c586b5..5b48c586b5 100644
--- a/tests/auto/macplist/tst_macplist.cpp
+++ b/tests/auto/integrationtests/macplist/tst_macplist.cpp
diff --git a/tests/auto/modeltest/dynamictreemodel.cpp b/tests/auto/integrationtests/modeltest/dynamictreemodel.cpp
index 2f8bb0a730..2f8bb0a730 100644
--- a/tests/auto/modeltest/dynamictreemodel.cpp
+++ b/tests/auto/integrationtests/modeltest/dynamictreemodel.cpp
diff --git a/tests/auto/modeltest/dynamictreemodel.h b/tests/auto/integrationtests/modeltest/dynamictreemodel.h
index 81ef80cc40..81ef80cc40 100644
--- a/tests/auto/modeltest/dynamictreemodel.h
+++ b/tests/auto/integrationtests/modeltest/dynamictreemodel.h
diff --git a/tests/auto/modeltest/modeltest.cpp b/tests/auto/integrationtests/modeltest/modeltest.cpp
index 76803dfbe5..76803dfbe5 100644
--- a/tests/auto/modeltest/modeltest.cpp
+++ b/tests/auto/integrationtests/modeltest/modeltest.cpp
diff --git a/tests/auto/modeltest/modeltest.h b/tests/auto/integrationtests/modeltest/modeltest.h
index e4ef478c5e..e4ef478c5e 100644
--- a/tests/auto/modeltest/modeltest.h
+++ b/tests/auto/integrationtests/modeltest/modeltest.h
diff --git a/tests/auto/modeltest/modeltest.pro b/tests/auto/integrationtests/modeltest/modeltest.pro
index d4a8ba971d..d4a8ba971d 100644
--- a/tests/auto/modeltest/modeltest.pro
+++ b/tests/auto/integrationtests/modeltest/modeltest.pro
diff --git a/tests/auto/modeltest/tst_modeltest.cpp b/tests/auto/integrationtests/modeltest/tst_modeltest.cpp
index 434537a81f..434537a81f 100644
--- a/tests/auto/modeltest/tst_modeltest.cpp
+++ b/tests/auto/integrationtests/modeltest/tst_modeltest.cpp
diff --git a/tests/auto/networkselftest/networkselftest.pro b/tests/auto/integrationtests/networkselftest/networkselftest.pro
index 4440dc6cfd..4440dc6cfd 100644
--- a/tests/auto/networkselftest/networkselftest.pro
+++ b/tests/auto/integrationtests/networkselftest/networkselftest.pro
diff --git a/tests/auto/networkselftest/rfc3252.txt b/tests/auto/integrationtests/networkselftest/rfc3252.txt
index b80c61bf0a..b80c61bf0a 100644
--- a/tests/auto/networkselftest/rfc3252.txt
+++ b/tests/auto/integrationtests/networkselftest/rfc3252.txt
diff --git a/tests/auto/networkselftest/tst_networkselftest.cpp b/tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp
index 033ee57cdd..341054c533 100644
--- a/tests/auto/networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/integrationtests/networkselftest/tst_networkselftest.cpp
@@ -50,7 +50,7 @@
 #include <QtNetwork/qnetworksession.h>
 #endif
 
-#include "../network-settings.h"
+#include "../../network-settings.h"
 
 class tst_NetworkSelfTest: public QObject
 {
diff --git a/tests/auto/qaccessibility/.gitignore b/tests/auto/integrationtests/qaccessibility/.gitignore
index 6fd6ae2d48..6fd6ae2d48 100644
--- a/tests/auto/qaccessibility/.gitignore
+++ b/tests/auto/integrationtests/qaccessibility/.gitignore
diff --git a/tests/auto/qaccessibility/qaccessibility.pro b/tests/auto/integrationtests/qaccessibility/qaccessibility.pro
index ae046cc3c3..ae046cc3c3 100644
--- a/tests/auto/qaccessibility/qaccessibility.pro
+++ b/tests/auto/integrationtests/qaccessibility/qaccessibility.pro
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp
index e1bd968534..e1bd968534 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/integrationtests/qaccessibility/tst_qaccessibility.cpp
diff --git a/tests/auto/qcomplextext/.gitignore b/tests/auto/integrationtests/qcomplextext/.gitignore
index 8929cd2f89..8929cd2f89 100644
--- a/tests/auto/qcomplextext/.gitignore
+++ b/tests/auto/integrationtests/qcomplextext/.gitignore
diff --git a/tests/auto/qcomplextext/bidireorderstring.h b/tests/auto/integrationtests/qcomplextext/bidireorderstring.h
index e0bbf6e80b..e0bbf6e80b 100644
--- a/tests/auto/qcomplextext/bidireorderstring.h
+++ b/tests/auto/integrationtests/qcomplextext/bidireorderstring.h
diff --git a/tests/auto/qcomplextext/qcomplextext.pro b/tests/auto/integrationtests/qcomplextext/qcomplextext.pro
index e04ebcbc69..e04ebcbc69 100644
--- a/tests/auto/qcomplextext/qcomplextext.pro
+++ b/tests/auto/integrationtests/qcomplextext/qcomplextext.pro
diff --git a/tests/auto/qcomplextext/tst_qcomplextext.cpp b/tests/auto/integrationtests/qcomplextext/tst_qcomplextext.cpp
index c72393cfe6..c72393cfe6 100644
--- a/tests/auto/qcomplextext/tst_qcomplextext.cpp
+++ b/tests/auto/integrationtests/qcomplextext/tst_qcomplextext.cpp
diff --git a/tests/auto/qdirectpainter/.gitignore b/tests/auto/integrationtests/qdirectpainter/.gitignore
index 615dfa8ddc..615dfa8ddc 100644
--- a/tests/auto/qdirectpainter/.gitignore
+++ b/tests/auto/integrationtests/qdirectpainter/.gitignore
diff --git a/tests/auto/qdirectpainter/qdirectpainter.pro b/tests/auto/integrationtests/qdirectpainter/qdirectpainter.pro
index e86b3427eb..e86b3427eb 100644
--- a/tests/auto/qdirectpainter/qdirectpainter.pro
+++ b/tests/auto/integrationtests/qdirectpainter/qdirectpainter.pro
diff --git a/tests/auto/qdirectpainter/runDirectPainter/main.cpp b/tests/auto/integrationtests/qdirectpainter/runDirectPainter/main.cpp
index af3dd90beb..af3dd90beb 100644
--- a/tests/auto/qdirectpainter/runDirectPainter/main.cpp
+++ b/tests/auto/integrationtests/qdirectpainter/runDirectPainter/main.cpp
diff --git a/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro b/tests/auto/integrationtests/qdirectpainter/runDirectPainter/runDirectPainter.pro
index 09524e90c3..09524e90c3 100644
--- a/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro
+++ b/tests/auto/integrationtests/qdirectpainter/runDirectPainter/runDirectPainter.pro
diff --git a/tests/auto/qdirectpainter/test/test.pro b/tests/auto/integrationtests/qdirectpainter/test/test.pro
index 3621e11fa9..3621e11fa9 100644
--- a/tests/auto/qdirectpainter/test/test.pro
+++ b/tests/auto/integrationtests/qdirectpainter/test/test.pro
diff --git a/tests/auto/qdirectpainter/tst_qdirectpainter.cpp b/tests/auto/integrationtests/qdirectpainter/tst_qdirectpainter.cpp
index 550c2e96c0..550c2e96c0 100644
--- a/tests/auto/qdirectpainter/tst_qdirectpainter.cpp
+++ b/tests/auto/integrationtests/qdirectpainter/tst_qdirectpainter.cpp
diff --git a/tests/auto/qfocusevent/.gitignore b/tests/auto/integrationtests/qfocusevent/.gitignore
index f189d8aeb9..f189d8aeb9 100644
--- a/tests/auto/qfocusevent/.gitignore
+++ b/tests/auto/integrationtests/qfocusevent/.gitignore
diff --git a/tests/auto/qfocusevent/qfocusevent.pro b/tests/auto/integrationtests/qfocusevent/qfocusevent.pro
index d904a0b0bf..d904a0b0bf 100644
--- a/tests/auto/qfocusevent/qfocusevent.pro
+++ b/tests/auto/integrationtests/qfocusevent/qfocusevent.pro
diff --git a/tests/auto/qfocusevent/tst_qfocusevent.cpp b/tests/auto/integrationtests/qfocusevent/tst_qfocusevent.cpp
index 931059b211..931059b211 100644
--- a/tests/auto/qfocusevent/tst_qfocusevent.cpp
+++ b/tests/auto/integrationtests/qfocusevent/tst_qfocusevent.cpp
diff --git a/tests/auto/qmultiscreen/.gitignore b/tests/auto/integrationtests/qmultiscreen/.gitignore
index 82e8d449ad..82e8d449ad 100644
--- a/tests/auto/qmultiscreen/.gitignore
+++ b/tests/auto/integrationtests/qmultiscreen/.gitignore
diff --git a/tests/auto/qmultiscreen/qmultiscreen.pro b/tests/auto/integrationtests/qmultiscreen/qmultiscreen.pro
index c4a983c5be..c4a983c5be 100644
--- a/tests/auto/qmultiscreen/qmultiscreen.pro
+++ b/tests/auto/integrationtests/qmultiscreen/qmultiscreen.pro
diff --git a/tests/auto/qmultiscreen/tst_qmultiscreen.cpp b/tests/auto/integrationtests/qmultiscreen/tst_qmultiscreen.cpp
index 9d74d59f85..9d74d59f85 100644
--- a/tests/auto/qmultiscreen/tst_qmultiscreen.cpp
+++ b/tests/auto/integrationtests/qmultiscreen/tst_qmultiscreen.cpp
diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro b/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
index 9e3fcf28ba..9e3fcf28ba 100644
--- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
+++ b/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/qnetworkaccessmanager_and_qprogressdialog.pro
diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
index d22f72261b..abf5aa528c 100644
--- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
+++ b/tests/auto/integrationtests/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
@@ -49,7 +49,7 @@
 #include <QtNetwork/QNetworkReply>
 #include <qdebug.h>
 
-#include "../network-settings.h"
+#include "../../network-settings.h"
 
 
 class tst_QNetworkAccessManager_And_QProgressDialog : public QObject
diff --git a/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro b/tests/auto/integrationtests/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro
index c947e7a246..c947e7a246 100644
--- a/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro
+++ b/tests/auto/integrationtests/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro
diff --git a/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp b/tests/auto/integrationtests/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp
index 90b71c517c..90b71c517c 100644
--- a/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp
+++ b/tests/auto/integrationtests/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp
diff --git a/tests/auto/windowsmobile/test/ddhelper.cpp b/tests/auto/integrationtests/windowsmobile/test/ddhelper.cpp
index 55469f5901..55469f5901 100644
--- a/tests/auto/windowsmobile/test/ddhelper.cpp
+++ b/tests/auto/integrationtests/windowsmobile/test/ddhelper.cpp
diff --git a/tests/auto/windowsmobile/test/ddhelper.h b/tests/auto/integrationtests/windowsmobile/test/ddhelper.h
index 3d2f06aa36..3d2f06aa36 100644
--- a/tests/auto/windowsmobile/test/ddhelper.h
+++ b/tests/auto/integrationtests/windowsmobile/test/ddhelper.h
diff --git a/tests/auto/windowsmobile/test/test.pro b/tests/auto/integrationtests/windowsmobile/test/test.pro
index 595a619d2a..595a619d2a 100644
--- a/tests/auto/windowsmobile/test/test.pro
+++ b/tests/auto/integrationtests/windowsmobile/test/test.pro
diff --git a/tests/auto/windowsmobile/test/testQMenuBar_current.png b/tests/auto/integrationtests/windowsmobile/test/testQMenuBar_current.png
index f0042b8fe0..f0042b8fe0 100644
--- a/tests/auto/windowsmobile/test/testQMenuBar_current.png
+++ b/tests/auto/integrationtests/windowsmobile/test/testQMenuBar_current.png
diff --git a/tests/auto/windowsmobile/test/testSimpleWidget_current.png b/tests/auto/integrationtests/windowsmobile/test/testSimpleWidget_current.png
index 8086c41ce9..8086c41ce9 100644
--- a/tests/auto/windowsmobile/test/testSimpleWidget_current.png
+++ b/tests/auto/integrationtests/windowsmobile/test/testSimpleWidget_current.png
diff --git a/tests/auto/windowsmobile/test/tst_windowsmobile.cpp b/tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp
index 0dc7f578c1..0dc7f578c1 100644
--- a/tests/auto/windowsmobile/test/tst_windowsmobile.cpp
+++ b/tests/auto/integrationtests/windowsmobile/test/tst_windowsmobile.cpp
diff --git a/tests/auto/windowsmobile/test/windowsmobile.qrc b/tests/auto/integrationtests/windowsmobile/test/windowsmobile.qrc
index 5d6f61459e..5d6f61459e 100644
--- a/tests/auto/windowsmobile/test/windowsmobile.qrc
+++ b/tests/auto/integrationtests/windowsmobile/test/windowsmobile.qrc
diff --git a/tests/auto/windowsmobile/testQMenuBar/main.cpp b/tests/auto/integrationtests/windowsmobile/testQMenuBar/main.cpp
index c2099a648b..c2099a648b 100644
--- a/tests/auto/windowsmobile/testQMenuBar/main.cpp
+++ b/tests/auto/integrationtests/windowsmobile/testQMenuBar/main.cpp
diff --git a/tests/auto/windowsmobile/testQMenuBar/testQMenuBar.pro b/tests/auto/integrationtests/windowsmobile/testQMenuBar/testQMenuBar.pro
index 6b84ae937c..6b84ae937c 100644
--- a/tests/auto/windowsmobile/testQMenuBar/testQMenuBar.pro
+++ b/tests/auto/integrationtests/windowsmobile/testQMenuBar/testQMenuBar.pro
diff --git a/tests/auto/windowsmobile/windowsmobile.pro b/tests/auto/integrationtests/windowsmobile/windowsmobile.pro
index 2e6b444d7b..2e6b444d7b 100644
--- a/tests/auto/windowsmobile/windowsmobile.pro
+++ b/tests/auto/integrationtests/windowsmobile/windowsmobile.pro
diff --git a/tests/auto/network.pro b/tests/auto/network.pro
index 21388bc281..d4d07fa426 100644
--- a/tests/auto/network.pro
+++ b/tests/auto/network.pro
@@ -5,5 +5,4 @@
 TEMPLATE=subdirs
 SUBDIRS=\
     network \
-    networkselftest \
     qobjectperformance 
diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index 5848cdb755..f15811940b 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -4,45 +4,4 @@
 TEMPLATE=subdirs
 SUBDIRS=\
            other \
-#           baselineexample \ Just an example demonstrating qbaselinetest usage
-           exceptionsafety_objects \
-           lancelot \
-           macgui \
-           macnativeevents \
-           macplist \
-           qaccessibility \
-           qcombobox \
-           qdirectpainter \
-           qfocusevent \
-           qlayout \
-           qmdiarea \
-           qmenu \
-           qmenubar \
-           qmultiscreen \
-           qsplitter \
-           qtabwidget \
-           qtextbrowser \
-           qtextedit \
-           qtoolbutton \
-           qwidget \
-           qworkspace \
-           windowsmobile \
            qmetaobjectbuilder
-
-wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility
-
-!mac|qpa: SUBDIRS -= \
-           macgui \
-           macnativeevents \
-           macplist \
-
-!embedded|wince*: SUBDIRS -= \
-           qdirectpainter \
-           qmultiscreen \
-
-!linux*-g++*:SUBDIRS -= exceptionsafety_objects
-
-# Following tests depends on private API
-!contains(QT_CONFIG, private_tests): SUBDIRS -= \
-           qcombobox \
-           qtextedit \
diff --git a/tests/auto/qidentityproxymodel/qidentityproxymodel.pro b/tests/auto/qidentityproxymodel/qidentityproxymodel.pro
deleted file mode 100644
index 7df0e65d03..0000000000
--- a/tests/auto/qidentityproxymodel/qidentityproxymodel.pro
+++ /dev/null
@@ -1,7 +0,0 @@
-load(qttest_p4)
-
-INCLUDEPATH += $$PWD/../modeltest
-
-QT += widgets
-SOURCES         += tst_qidentityproxymodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp
-HEADERS         += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h
diff --git a/tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro b/tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro
deleted file mode 100644
index a60fbac944..0000000000
--- a/tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-load(qttest_p4)
-
-QT += gui widgets
-
-INCLUDEPATH += $$PWD/../modeltest
-
-SOURCES         += tst_qsortfilterproxymodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp
-HEADERS         += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h
-
diff --git a/tests/auto/widgets/dialogs/dialogs.pro b/tests/auto/widgets/dialogs/dialogs.pro
new file mode 100644
index 0000000000..e74323a305
--- /dev/null
+++ b/tests/auto/widgets/dialogs/dialogs.pro
@@ -0,0 +1,18 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qabstractprintdialog \
+   qcolordialog \
+   qdialog \
+   qerrormessage \
+   qfiledialog \
+   qfiledialog2 \
+   qfilesystemmodel \
+   qfontdialog \
+   qinputdialog \
+   qmessagebox \
+   qprogressdialog \
+   qsidebar \
+   qwizard \
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+          qsidebar \
diff --git a/tests/auto/qabstractprintdialog/.gitignore b/tests/auto/widgets/dialogs/qabstractprintdialog/.gitignore
index a768494da5..a768494da5 100644
--- a/tests/auto/qabstractprintdialog/.gitignore
+++ b/tests/auto/widgets/dialogs/qabstractprintdialog/.gitignore
diff --git a/tests/auto/qabstractprintdialog/qabstractprintdialog.pro b/tests/auto/widgets/dialogs/qabstractprintdialog/qabstractprintdialog.pro
index fb72bbf7a9..fb72bbf7a9 100644
--- a/tests/auto/qabstractprintdialog/qabstractprintdialog.pro
+++ b/tests/auto/widgets/dialogs/qabstractprintdialog/qabstractprintdialog.pro
diff --git a/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp
index 5d6165d174..5d6165d174 100644
--- a/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp
+++ b/tests/auto/widgets/dialogs/qabstractprintdialog/tst_qabstractprintdialog.cpp
diff --git a/tests/auto/qcolordialog/.gitignore b/tests/auto/widgets/dialogs/qcolordialog/.gitignore
index b7a8ebd8f8..b7a8ebd8f8 100644
--- a/tests/auto/qcolordialog/.gitignore
+++ b/tests/auto/widgets/dialogs/qcolordialog/.gitignore
diff --git a/tests/auto/qcolordialog/qcolordialog.pro b/tests/auto/widgets/dialogs/qcolordialog/qcolordialog.pro
index 4f195dac2b..4f195dac2b 100644
--- a/tests/auto/qcolordialog/qcolordialog.pro
+++ b/tests/auto/widgets/dialogs/qcolordialog/qcolordialog.pro
diff --git a/tests/auto/qcolordialog/tst_qcolordialog.cpp b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp
index 3ae1e63a8e..3ae1e63a8e 100644
--- a/tests/auto/qcolordialog/tst_qcolordialog.cpp
+++ b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp
diff --git a/tests/auto/qdialog/.gitignore b/tests/auto/widgets/dialogs/qdialog/.gitignore
index 4a4b5ebcbe..4a4b5ebcbe 100644
--- a/tests/auto/qdialog/.gitignore
+++ b/tests/auto/widgets/dialogs/qdialog/.gitignore
diff --git a/tests/auto/qdialog/qdialog.pro b/tests/auto/widgets/dialogs/qdialog/qdialog.pro
index a3596b60f6..a3596b60f6 100644
--- a/tests/auto/qdialog/qdialog.pro
+++ b/tests/auto/widgets/dialogs/qdialog/qdialog.pro
diff --git a/tests/auto/qdialog/tst_qdialog.cpp b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
index 0f4acdcc9e..0f4acdcc9e 100644
--- a/tests/auto/qdialog/tst_qdialog.cpp
+++ b/tests/auto/widgets/dialogs/qdialog/tst_qdialog.cpp
diff --git a/tests/auto/qerrormessage/.gitignore b/tests/auto/widgets/dialogs/qerrormessage/.gitignore
index 1bb653fb72..1bb653fb72 100644
--- a/tests/auto/qerrormessage/.gitignore
+++ b/tests/auto/widgets/dialogs/qerrormessage/.gitignore
diff --git a/tests/auto/qerrormessage/qerrormessage.pro b/tests/auto/widgets/dialogs/qerrormessage/qerrormessage.pro
index 363d085cbf..363d085cbf 100644
--- a/tests/auto/qerrormessage/qerrormessage.pro
+++ b/tests/auto/widgets/dialogs/qerrormessage/qerrormessage.pro
diff --git a/tests/auto/qerrormessage/tst_qerrormessage.cpp b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp
index d3ee640b1a..d3ee640b1a 100644
--- a/tests/auto/qerrormessage/tst_qerrormessage.cpp
+++ b/tests/auto/widgets/dialogs/qerrormessage/tst_qerrormessage.cpp
diff --git a/tests/auto/qfiledialog/.gitignore b/tests/auto/widgets/dialogs/qfiledialog/.gitignore
index a696596ee9..a696596ee9 100644
--- a/tests/auto/qfiledialog/.gitignore
+++ b/tests/auto/widgets/dialogs/qfiledialog/.gitignore
diff --git a/tests/auto/qfiledialog/qfiledialog.pro b/tests/auto/widgets/dialogs/qfiledialog/qfiledialog.pro
index 92fba98796..92fba98796 100644
--- a/tests/auto/qfiledialog/qfiledialog.pro
+++ b/tests/auto/widgets/dialogs/qfiledialog/qfiledialog.pro
diff --git a/tests/auto/qfiledialog/resources/file.txt b/tests/auto/widgets/dialogs/qfiledialog/resources/file.txt
index 8a03e0e55f..8a03e0e55f 100644
--- a/tests/auto/qfiledialog/resources/file.txt
+++ b/tests/auto/widgets/dialogs/qfiledialog/resources/file.txt
diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
index 2a14ecbc28..9abcd407d0 100644
--- a/tests/auto/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
@@ -68,7 +68,7 @@
 #include <QFileDialog>
 #include <QFileSystemModel>
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qfiledialog2/qfiledialog2.pro b/tests/auto/widgets/dialogs/qfiledialog2/qfiledialog2.pro
index a2149c8a39..a2149c8a39 100644
--- a/tests/auto/qfiledialog2/qfiledialog2.pro
+++ b/tests/auto/widgets/dialogs/qfiledialog2/qfiledialog2.pro
diff --git a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
index dad1e903f9..a2d18eb847 100644
--- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
@@ -60,11 +60,11 @@
 #include <qsortfilterproxymodel.h>
 #include <qlineedit.h>
 #include <qlayout.h>
-#include "../../../src/widgets/dialogs/qsidebar_p.h"
-#include "../../../src/widgets/dialogs/qfilesystemmodel_p.h"
-#include "../../../src/widgets/dialogs/qfiledialog_p.h"
+#include "../../../../../src/widgets/dialogs/qsidebar_p.h"
+#include "../../../../../src/widgets/dialogs/qfilesystemmodel_p.h"
+#include "../../../../../src/widgets/dialogs/qfiledialog_p.h"
 
-#include "../network-settings.h"
+#include "../../../network-settings.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qfilesystemmodel/.gitignore b/tests/auto/widgets/dialogs/qfilesystemmodel/.gitignore
index 9804e5a3d7..9804e5a3d7 100644
--- a/tests/auto/qfilesystemmodel/.gitignore
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/.gitignore
diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/widgets/dialogs/qfilesystemmodel/qfilesystemmodel.pro
index a7d042ce5e..a7d042ce5e 100644
--- a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/qfilesystemmodel.pro
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
index 26fa58e649..26fa58e649 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
diff --git a/tests/auto/qfontdialog/.gitignore b/tests/auto/widgets/dialogs/qfontdialog/.gitignore
index 5bd48d4951..5bd48d4951 100644
--- a/tests/auto/qfontdialog/.gitignore
+++ b/tests/auto/widgets/dialogs/qfontdialog/.gitignore
diff --git a/tests/auto/qfontdialog/qfontdialog.pro b/tests/auto/widgets/dialogs/qfontdialog/qfontdialog.pro
index 5a0c2b66bf..5a0c2b66bf 100644
--- a/tests/auto/qfontdialog/qfontdialog.pro
+++ b/tests/auto/widgets/dialogs/qfontdialog/qfontdialog.pro
diff --git a/tests/auto/qfontdialog/tst_qfontdialog.cpp b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
index 3f12b7501c..3f12b7501c 100644
--- a/tests/auto/qfontdialog/tst_qfontdialog.cpp
+++ b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog.cpp
diff --git a/tests/auto/qfontdialog/tst_qfontdialog_mac_helpers.mm b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog_mac_helpers.mm
index d12f696f7e..d12f696f7e 100644
--- a/tests/auto/qfontdialog/tst_qfontdialog_mac_helpers.mm
+++ b/tests/auto/widgets/dialogs/qfontdialog/tst_qfontdialog_mac_helpers.mm
diff --git a/tests/auto/qinputdialog/.gitignore b/tests/auto/widgets/dialogs/qinputdialog/.gitignore
index b62797193c..b62797193c 100644
--- a/tests/auto/qinputdialog/.gitignore
+++ b/tests/auto/widgets/dialogs/qinputdialog/.gitignore
diff --git a/tests/auto/qinputdialog/qinputdialog.pro b/tests/auto/widgets/dialogs/qinputdialog/qinputdialog.pro
index f7e56bd783..f7e56bd783 100644
--- a/tests/auto/qinputdialog/qinputdialog.pro
+++ b/tests/auto/widgets/dialogs/qinputdialog/qinputdialog.pro
diff --git a/tests/auto/qinputdialog/tst_qinputdialog.cpp b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
index 5c74ab217b..5c74ab217b 100644
--- a/tests/auto/qinputdialog/tst_qinputdialog.cpp
+++ b/tests/auto/widgets/dialogs/qinputdialog/tst_qinputdialog.cpp
diff --git a/tests/auto/qmessagebox/.gitignore b/tests/auto/widgets/dialogs/qmessagebox/.gitignore
index 19a0a35121..19a0a35121 100644
--- a/tests/auto/qmessagebox/.gitignore
+++ b/tests/auto/widgets/dialogs/qmessagebox/.gitignore
diff --git a/tests/auto/qmessagebox/qmessagebox.pro b/tests/auto/widgets/dialogs/qmessagebox/qmessagebox.pro
index e3f6ddb1f6..e3f6ddb1f6 100644
--- a/tests/auto/qmessagebox/qmessagebox.pro
+++ b/tests/auto/widgets/dialogs/qmessagebox/qmessagebox.pro
diff --git a/tests/auto/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
index a07d7cf7a9..a07d7cf7a9 100644
--- a/tests/auto/qmessagebox/tst_qmessagebox.cpp
+++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp
diff --git a/tests/auto/qprogressdialog/.gitignore b/tests/auto/widgets/dialogs/qprogressdialog/.gitignore
index ce3cd0d7dd..ce3cd0d7dd 100644
--- a/tests/auto/qprogressdialog/.gitignore
+++ b/tests/auto/widgets/dialogs/qprogressdialog/.gitignore
diff --git a/tests/auto/qprogressdialog/qprogressdialog.pro b/tests/auto/widgets/dialogs/qprogressdialog/qprogressdialog.pro
index f3861e4cd3..f3861e4cd3 100644
--- a/tests/auto/qprogressdialog/qprogressdialog.pro
+++ b/tests/auto/widgets/dialogs/qprogressdialog/qprogressdialog.pro
diff --git a/tests/auto/qprogressdialog/tst_qprogressdialog.cpp b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp
index 5fbd5d747a..5fbd5d747a 100644
--- a/tests/auto/qprogressdialog/tst_qprogressdialog.cpp
+++ b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp
diff --git a/tests/auto/qsidebar/.gitignore b/tests/auto/widgets/dialogs/qsidebar/.gitignore
index 194ca9f244..194ca9f244 100644
--- a/tests/auto/qsidebar/.gitignore
+++ b/tests/auto/widgets/dialogs/qsidebar/.gitignore
diff --git a/tests/auto/qsidebar/qsidebar.pro b/tests/auto/widgets/dialogs/qsidebar/qsidebar.pro
index 9f6e094784..9f6e094784 100644
--- a/tests/auto/qsidebar/qsidebar.pro
+++ b/tests/auto/widgets/dialogs/qsidebar/qsidebar.pro
diff --git a/tests/auto/qsidebar/tst_qsidebar.cpp b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
index 912719f76a..912719f76a 100644
--- a/tests/auto/qsidebar/tst_qsidebar.cpp
+++ b/tests/auto/widgets/dialogs/qsidebar/tst_qsidebar.cpp
diff --git a/tests/auto/qwizard/.gitignore b/tests/auto/widgets/dialogs/qwizard/.gitignore
index 9494c96da2..9494c96da2 100644
--- a/tests/auto/qwizard/.gitignore
+++ b/tests/auto/widgets/dialogs/qwizard/.gitignore
diff --git a/tests/auto/qwizard/images/background.png b/tests/auto/widgets/dialogs/qwizard/images/background.png
index db7d67dc3d..db7d67dc3d 100644
--- a/tests/auto/qwizard/images/background.png
+++ b/tests/auto/widgets/dialogs/qwizard/images/background.png
diff --git a/tests/auto/qwizard/images/banner.png b/tests/auto/widgets/dialogs/qwizard/images/banner.png
index be36202d99..be36202d99 100644
--- a/tests/auto/qwizard/images/banner.png
+++ b/tests/auto/widgets/dialogs/qwizard/images/banner.png
diff --git a/tests/auto/qwizard/images/logo.png b/tests/auto/widgets/dialogs/qwizard/images/logo.png
index 9cf3350c4b..9cf3350c4b 100644
--- a/tests/auto/qwizard/images/logo.png
+++ b/tests/auto/widgets/dialogs/qwizard/images/logo.png
diff --git a/tests/auto/qwizard/images/watermark.png b/tests/auto/widgets/dialogs/qwizard/images/watermark.png
index 9305675549..9305675549 100644
--- a/tests/auto/qwizard/images/watermark.png
+++ b/tests/auto/widgets/dialogs/qwizard/images/watermark.png
diff --git a/tests/auto/qwizard/qwizard.pro b/tests/auto/widgets/dialogs/qwizard/qwizard.pro
index c27801b82f..c27801b82f 100644
--- a/tests/auto/qwizard/qwizard.pro
+++ b/tests/auto/widgets/dialogs/qwizard/qwizard.pro
diff --git a/tests/auto/qwizard/qwizard.qrc b/tests/auto/widgets/dialogs/qwizard/qwizard.qrc
index 471da9def6..471da9def6 100644
--- a/tests/auto/qwizard/qwizard.qrc
+++ b/tests/auto/widgets/dialogs/qwizard/qwizard.qrc
diff --git a/tests/auto/qwizard/tst_qwizard.cpp b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
index 2e05eb5bab..2e05eb5bab 100644
--- a/tests/auto/qwizard/tst_qwizard.cpp
+++ b/tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
diff --git a/tests/auto/widgets/effects/effects.pro b/tests/auto/widgets/effects/effects.pro
new file mode 100644
index 0000000000..fab24d6296
--- /dev/null
+++ b/tests/auto/widgets/effects/effects.pro
@@ -0,0 +1,4 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qgraphicseffect \
+
diff --git a/tests/auto/qgraphicseffect/qgraphicseffect.pro b/tests/auto/widgets/effects/qgraphicseffect/qgraphicseffect.pro
index 171ab3ffda..171ab3ffda 100644
--- a/tests/auto/qgraphicseffect/qgraphicseffect.pro
+++ b/tests/auto/widgets/effects/qgraphicseffect/qgraphicseffect.pro
diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp
index e72dd45667..2d9d87a2c5 100644
--- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
+++ b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp
@@ -50,7 +50,7 @@
 #include <QtWidgets/qstyleoption.h>
 
 #include <private/qgraphicseffect_p.h>
-#include "../platformquirks.h"
+#include "../../../platformquirks.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/widgets/graphicsview/graphicsview.pro b/tests/auto/widgets/graphicsview/graphicsview.pro
new file mode 100644
index 0000000000..9955e45b64
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/graphicsview.pro
@@ -0,0 +1,32 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qgraphicsanchorlayout \
+   qgraphicsanchorlayout1 \
+   qgraphicseffectsource \
+   qgraphicsgridlayout \
+   qgraphicsitem \
+   qgraphicsitemanimation \
+   qgraphicslayout \
+   qgraphicslayoutitem \
+   qgraphicslinearlayout \
+   qgraphicsobject \
+   qgraphicspixmapitem \
+   qgraphicspolygonitem \
+   qgraphicsproxywidget \
+   qgraphicsscene \
+   qgraphicssceneindex \
+   qgraphicstransform \
+   qgraphicsview \
+   qgraphicswidget \
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+           qgraphicsanchorlayout \
+           qgraphicsanchorlayout1 \
+           qgraphicsitem \
+           qgraphicsscene \
+           qgraphicssceneindex \
+
+# These tests require the cleanlooks style
+!contains(styles, cleanlooks):SUBDIRS -= \
+    qgraphicsproxywidget \
+    qgraphicswidget \
diff --git a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
index 5aa2936e3e..5aa2936e3e 100644
--- a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index 5dbe501ea8..5dbe501ea8 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
diff --git a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro
index bcad43fc12..bcad43fc12 100644
--- a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro
diff --git a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
index 05f08e8719..05f08e8719 100644
--- a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
diff --git a/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro b/tests/auto/widgets/graphicsview/qgraphicseffectsource/qgraphicseffectsource.pro
index 44ec70eef3..44ec70eef3 100644
--- a/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/qgraphicseffectsource.pro
diff --git a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
index 4f39f991c6..4f39f991c6 100644
--- a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
diff --git a/tests/auto/qgraphicsgridlayout/.gitignore b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/.gitignore
index e3a8cc317c..e3a8cc317c 100644
--- a/tests/auto/qgraphicsgridlayout/.gitignore
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/.gitignore
diff --git a/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/qgraphicsgridlayout.pro
index 7db7c1ae6f..7db7c1ae6f 100644
--- a/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/qgraphicsgridlayout.pro
diff --git a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
index e9d9cb67bb..e9d9cb67bb 100644
--- a/tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
diff --git a/tests/auto/qgraphicsitem/.gitignore b/tests/auto/widgets/graphicsview/qgraphicsitem/.gitignore
index b766388e3e..b766388e3e 100644
--- a/tests/auto/qgraphicsitem/.gitignore
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/.gitignore
diff --git a/tests/auto/qgraphicsitem/qgraphicsitem.pro b/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro
index 51a4426680..51a4426680 100644
--- a/tests/auto/qgraphicsitem/qgraphicsitem.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/qgraphicsitem.pro
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
index 64824b2048..8ac1f6b5c5 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -93,7 +93,7 @@ Q_DECLARE_METATYPE(QRectF)
 #define COMPARE_REGIONS QTRY_COMPARE
 #endif
 
-#include "../platformquirks.h"
+#include "../../../platformquirks.h"
 
 static QGraphicsRectItem staticItem; //QTBUG-7629, we should not crash at exit.
 
diff --git a/tests/auto/qgraphicsitemanimation/.gitignore b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/.gitignore
index fe9fe0b8ec..fe9fe0b8ec 100644
--- a/tests/auto/qgraphicsitemanimation/.gitignore
+++ b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/.gitignore
diff --git a/tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/qgraphicsitemanimation.pro
index 5d723da32e..5d723da32e 100644
--- a/tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/qgraphicsitemanimation.pro
diff --git a/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp
index f7cf393253..f7cf393253 100644
--- a/tests/auto/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsitemanimation/tst_qgraphicsitemanimation.cpp
diff --git a/tests/auto/qgraphicslayout/.gitignore b/tests/auto/widgets/graphicsview/qgraphicslayout/.gitignore
index b3b27f68a1..b3b27f68a1 100644
--- a/tests/auto/qgraphicslayout/.gitignore
+++ b/tests/auto/widgets/graphicsview/qgraphicslayout/.gitignore
diff --git a/tests/auto/qgraphicslayout/qgraphicslayout.pro b/tests/auto/widgets/graphicsview/qgraphicslayout/qgraphicslayout.pro
index ea176c98fe..ea176c98fe 100644
--- a/tests/auto/qgraphicslayout/qgraphicslayout.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicslayout/qgraphicslayout.pro
diff --git a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
index 3eac04e4e5..3eac04e4e5 100644
--- a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslayout/tst_qgraphicslayout.cpp
diff --git a/tests/auto/qgraphicslayoutitem/.gitignore b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/.gitignore
index 55a8d18acb..55a8d18acb 100644
--- a/tests/auto/qgraphicslayoutitem/.gitignore
+++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/.gitignore
diff --git a/tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/qgraphicslayoutitem.pro
index ed9adf87fd..ed9adf87fd 100644
--- a/tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/qgraphicslayoutitem.pro
diff --git a/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
index a8b6c0854e..a8b6c0854e 100644
--- a/tests/auto/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslayoutitem/tst_qgraphicslayoutitem.cpp
diff --git a/tests/auto/qgraphicslinearlayout/.gitignore b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/.gitignore
index 95c7dac979..95c7dac979 100644
--- a/tests/auto/qgraphicslinearlayout/.gitignore
+++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/.gitignore
diff --git a/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro
index 1f7ff0cc6e..1f7ff0cc6e 100644
--- a/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/qgraphicslinearlayout.pro
diff --git a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
index 873a711127..873a711127 100644
--- a/tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp
diff --git a/tests/auto/qgraphicsobject/qgraphicsobject.pro b/tests/auto/widgets/graphicsview/qgraphicsobject/qgraphicsobject.pro
index 5232ec8372..5232ec8372 100644
--- a/tests/auto/qgraphicsobject/qgraphicsobject.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsobject/qgraphicsobject.pro
diff --git a/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp
index 85e36b74b2..85e36b74b2 100644
--- a/tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsobject/tst_qgraphicsobject.cpp
diff --git a/tests/auto/qgraphicspixmapitem/.gitignore b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/.gitignore
index 1e92419fd0..1e92419fd0 100644
--- a/tests/auto/qgraphicspixmapitem/.gitignore
+++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/.gitignore
diff --git a/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/qgraphicspixmapitem.pro
index 6b1ad34057..6b1ad34057 100644
--- a/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/qgraphicspixmapitem.pro
diff --git a/tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
index b2dccb0b09..b2dccb0b09 100644
--- a/tests/auto/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicspixmapitem/tst_qgraphicspixmapitem.cpp
diff --git a/tests/auto/qgraphicspolygonitem/.gitignore b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/.gitignore
index 595076024b..595076024b 100644
--- a/tests/auto/qgraphicspolygonitem/.gitignore
+++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/.gitignore
diff --git a/tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/qgraphicspolygonitem.pro
index 2aa16751e6..2aa16751e6 100644
--- a/tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/qgraphicspolygonitem.pro
diff --git a/tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp
index 061b3eda81..061b3eda81 100644
--- a/tests/auto/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicspolygonitem/tst_qgraphicspolygonitem.cpp
diff --git a/tests/auto/qgraphicsproxywidget/.gitignore b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/.gitignore
index 530452478b..530452478b 100644
--- a/tests/auto/qgraphicsproxywidget/.gitignore
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/.gitignore
diff --git a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro
index a649ae1a3c..a649ae1a3c 100644
--- a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/qgraphicsproxywidget.pro
diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index 78c545e25a..78c545e25a 100644
--- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
diff --git a/tests/auto/qgraphicsscene/.gitignore b/tests/auto/widgets/graphicsview/qgraphicsscene/.gitignore
index df1097ad74..df1097ad74 100644
--- a/tests/auto/qgraphicsscene/.gitignore
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/.gitignore
diff --git a/tests/auto/qgraphicsscene/Ash_European.jpg b/tests/auto/widgets/graphicsview/qgraphicsscene/Ash_European.jpg
index 8581d322ba..8581d322ba 100644
--- a/tests/auto/qgraphicsscene/Ash_European.jpg
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/Ash_European.jpg
diff --git a/tests/auto/qgraphicsscene/graphicsScene_selection.data b/tests/auto/widgets/graphicsview/qgraphicsscene/graphicsScene_selection.data
index 8ff3feebb1..8ff3feebb1 100644
--- a/tests/auto/qgraphicsscene/graphicsScene_selection.data
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/graphicsScene_selection.data
diff --git a/tests/auto/qgraphicsscene/images.qrc b/tests/auto/widgets/graphicsview/qgraphicsscene/images.qrc
index cac10bef82..cac10bef82 100644
--- a/tests/auto/qgraphicsscene/images.qrc
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/images.qrc
diff --git a/tests/auto/qgraphicsscene/qgraphicsscene.pro b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro
index 75b4d84fb4..75b4d84fb4 100644
--- a/tests/auto/qgraphicsscene/qgraphicsscene.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/qgraphicsscene.pro
diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-45-deg-left.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-45-deg-left.png
index 526b897c1c..526b897c1c 100644
--- a/tests/auto/qgraphicsscene/testData/render/all-all-45-deg-left.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-45-deg-left.png
diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-45-deg-right.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-45-deg-right.png
index 83563872c1..83563872c1 100644
--- a/tests/auto/qgraphicsscene/testData/render/all-all-45-deg-right.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-45-deg-right.png
diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-scale-2x.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-scale-2x.png
index a929621bca..a929621bca 100644
--- a/tests/auto/qgraphicsscene/testData/render/all-all-scale-2x.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-scale-2x.png
diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-translate-0-50.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-translate-0-50.png
index aeaf20ae41..aeaf20ae41 100644
--- a/tests/auto/qgraphicsscene/testData/render/all-all-translate-0-50.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-translate-0-50.png
diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-translate-50-0.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-translate-50-0.png
index ed80dba118..ed80dba118 100644
--- a/tests/auto/qgraphicsscene/testData/render/all-all-translate-50-0.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-translate-50-0.png
diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-ellipse.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-untransformed-clip-ellipse.png
index 9b401b41c7..9b401b41c7 100644
--- a/tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-ellipse.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-untransformed-clip-ellipse.png
diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-rect.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-untransformed-clip-rect.png
index 1c5969870d..1c5969870d 100644
--- a/tests/auto/qgraphicsscene/testData/render/all-all-untransformed-clip-rect.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-untransformed-clip-rect.png
diff --git a/tests/auto/qgraphicsscene/testData/render/all-all-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-untransformed.png
index 3592744bda..3592744bda 100644
--- a/tests/auto/qgraphicsscene/testData/render/all-all-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-all-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/all-bottomleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-bottomleft-untransformed.png
index ab15e7228b..ab15e7228b 100644
--- a/tests/auto/qgraphicsscene/testData/render/all-bottomleft-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-bottomleft-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/all-bottomright-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-bottomright-untransformed.png
index 82e25762fa..82e25762fa 100644
--- a/tests/auto/qgraphicsscene/testData/render/all-bottomright-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-bottomright-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/all-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-topleft-untransformed.png
index 934ee4679b..934ee4679b 100644
--- a/tests/auto/qgraphicsscene/testData/render/all-topleft-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-topleft-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/all-topright-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-topright-untransformed.png
index aced485c75..aced485c75 100644
--- a/tests/auto/qgraphicsscene/testData/render/all-topright-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/all-topright-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/bottom-bottomright-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottom-bottomright-untransformed.png
index 5df8ab0612..5df8ab0612 100644
--- a/tests/auto/qgraphicsscene/testData/render/bottom-bottomright-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottom-bottomright-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/bottom-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottom-topleft-untransformed.png
index bb04881763..bb04881763 100644
--- a/tests/auto/qgraphicsscene/testData/render/bottom-topleft-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottom-topleft-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/bottomleft-all-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomleft-all-untransformed.png
index 907dec647d..907dec647d 100644
--- a/tests/auto/qgraphicsscene/testData/render/bottomleft-all-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomleft-all-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/bottomleft-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomleft-topleft-untransformed.png
index d37313c06d..d37313c06d 100644
--- a/tests/auto/qgraphicsscene/testData/render/bottomleft-topleft-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomleft-topleft-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/bottomright-all-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomright-all-untransformed.png
index 9fbafe48d5..9fbafe48d5 100644
--- a/tests/auto/qgraphicsscene/testData/render/bottomright-all-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomright-all-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/bottomright-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomright-topleft-untransformed.png
index 1d0253796e..1d0253796e 100644
--- a/tests/auto/qgraphicsscene/testData/render/bottomright-topleft-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/bottomright-topleft-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/left-bottomright-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/left-bottomright-untransformed.png
index bcfda9968b..bcfda9968b 100644
--- a/tests/auto/qgraphicsscene/testData/render/left-bottomright-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/left-bottomright-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/left-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/left-topleft-untransformed.png
index b443a4f991..b443a4f991 100644
--- a/tests/auto/qgraphicsscene/testData/render/left-topleft-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/left-topleft-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/right-bottomright-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/right-bottomright-untransformed.png
index e6922e0920..e6922e0920 100644
--- a/tests/auto/qgraphicsscene/testData/render/right-bottomright-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/right-bottomright-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/right-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/right-topleft-untransformed.png
index a74f218876..a74f218876 100644
--- a/tests/auto/qgraphicsscene/testData/render/right-topleft-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/right-topleft-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/top-bottomright-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/top-bottomright-untransformed.png
index 6c51907a6d..6c51907a6d 100644
--- a/tests/auto/qgraphicsscene/testData/render/top-bottomright-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/top-bottomright-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/top-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/top-topleft-untransformed.png
index 0a37133e31..0a37133e31 100644
--- a/tests/auto/qgraphicsscene/testData/render/top-topleft-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/top-topleft-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/topleft-all-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topleft-all-untransformed.png
index edc7dc9ce6..edc7dc9ce6 100644
--- a/tests/auto/qgraphicsscene/testData/render/topleft-all-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topleft-all-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/topleft-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topleft-topleft-untransformed.png
index e37051f7d2..e37051f7d2 100644
--- a/tests/auto/qgraphicsscene/testData/render/topleft-topleft-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topleft-topleft-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/topright-all-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topright-all-untransformed.png
index a185d14ebd..a185d14ebd 100644
--- a/tests/auto/qgraphicsscene/testData/render/topright-all-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topright-all-untransformed.png
diff --git a/tests/auto/qgraphicsscene/testData/render/topright-topleft-untransformed.png b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topright-topleft-untransformed.png
index 42e07f11ea..42e07f11ea 100644
--- a/tests/auto/qgraphicsscene/testData/render/topright-topleft-untransformed.png
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/testData/render/topright-topleft-untransformed.png
diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
index 0a34573039..9ac1573b2a 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -50,7 +50,7 @@
 #include <private/qgraphicsscene_p.h>
 #include <private/qgraphicssceneindex_p.h>
 #include <math.h>
-#include "../gui/painting/qpathclipper/pathcompare.h"
+#include "../../../gui/painting/qpathclipper/pathcompare.h"
 
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
 #include <windows.h>
diff --git a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro b/tests/auto/widgets/graphicsview/qgraphicssceneindex/qgraphicssceneindex.pro
index 5e61034d7c..5e61034d7c 100644
--- a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/qgraphicssceneindex.pro
diff --git a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
index 7507701267..7507701267 100644
--- a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
diff --git a/tests/auto/qgraphicstransform/qgraphicstransform.pro b/tests/auto/widgets/graphicsview/qgraphicstransform/qgraphicstransform.pro
index de7f01f36f..de7f01f36f 100644
--- a/tests/auto/qgraphicstransform/qgraphicstransform.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicstransform/qgraphicstransform.pro
diff --git a/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp b/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp
index 7d5a9578ad..7d5a9578ad 100644
--- a/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicstransform/tst_qgraphicstransform.cpp
diff --git a/tests/auto/qgraphicsview/.gitignore b/tests/auto/widgets/graphicsview/qgraphicsview/.gitignore
index c8182c9e0d..c8182c9e0d 100644
--- a/tests/auto/qgraphicsview/.gitignore
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/.gitignore
diff --git a/tests/auto/qgraphicsview/qgraphicsview.pro b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
index 9f32522546..9f32522546 100644
--- a/tests/auto/qgraphicsview/qgraphicsview.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/qgraphicsview.pro
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 444e15a788..0a404cab46 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -71,7 +71,7 @@
 #include <QtWidgets/QInputContext>
 #include <QtWidgets/QDesktopWidget>
 #include <private/qgraphicsview_p.h>
-#include "../platformquirks.h"
+#include "../../../platformquirks.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp
index 122ffbc875..122ffbc875 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview_2.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview_2.cpp
diff --git a/tests/auto/qgraphicswidget/.gitignore b/tests/auto/widgets/graphicsview/qgraphicswidget/.gitignore
index ae39b803e5..ae39b803e5 100644
--- a/tests/auto/qgraphicswidget/.gitignore
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/.gitignore
diff --git a/tests/auto/qgraphicswidget/qgraphicswidget.pro b/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro
index 330076eafc..330076eafc 100644
--- a/tests/auto/qgraphicswidget/qgraphicswidget.pro
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/qgraphicswidget.pro
diff --git a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
index e3eb05ca1a..c983016a20 100644
--- a/tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp
@@ -52,7 +52,7 @@
 #include <qboxlayout.h>
 #include <qaction.h>
 #include <qwidgetaction.h>
-#include "../platformquirks.h"
+#include "../../../platformquirks.h"
 
 
 class EventSpy : public QObject
diff --git a/tests/auto/widgets/itemviews/itemviews.pro b/tests/auto/widgets/itemviews/itemviews.pro
new file mode 100644
index 0000000000..fc338fdb7b
--- /dev/null
+++ b/tests/auto/widgets/itemviews/itemviews.pro
@@ -0,0 +1,33 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qabstractitemview \
+   qabstractproxymodel \
+   qcolumnview \
+   qdatawidgetmapper \
+   qdirmodel \
+   qfileiconprovider \
+   qheaderview \
+   qidentityproxymodel \
+   qitemdelegate \
+   qitemeditorfactory \
+   qitemselectionmodel \
+   qitemview \
+   qlistview \
+   qlistwidget \
+   qsortfilterproxymodel \
+   qstandarditem \
+   qstandarditemmodel \
+   qstringlistmodel \
+   qtableview \
+   qtablewidget \
+   qtreeview \
+   qtreewidget \
+   qtreewidgetitemiterator \
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+    qcolumnview \
+    qlistwidget \
+
+# This test takes too long to run on IRIX, so skip it on that platform
+irix-*:SUBDIRS -= qitemview
+
diff --git a/tests/auto/qabstractitemview/.gitignore b/tests/auto/widgets/itemviews/qabstractitemview/.gitignore
index 2f9f90e27e..2f9f90e27e 100644
--- a/tests/auto/qabstractitemview/.gitignore
+++ b/tests/auto/widgets/itemviews/qabstractitemview/.gitignore
diff --git a/tests/auto/qabstractitemview/qabstractitemview.pro b/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro
index 7f6c2cb65c..7f6c2cb65c 100644
--- a/tests/auto/qabstractitemview/qabstractitemview.pro
+++ b/tests/auto/widgets/itemviews/qabstractitemview/qabstractitemview.pro
diff --git a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index b9c652f1d3..b9c652f1d3 100644
--- a/tests/auto/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
diff --git a/tests/auto/qabstractproxymodel/.gitignore b/tests/auto/widgets/itemviews/qabstractproxymodel/.gitignore
index bffc04d632..bffc04d632 100644
--- a/tests/auto/qabstractproxymodel/.gitignore
+++ b/tests/auto/widgets/itemviews/qabstractproxymodel/.gitignore
diff --git a/tests/auto/qabstractproxymodel/qabstractproxymodel.pro b/tests/auto/widgets/itemviews/qabstractproxymodel/qabstractproxymodel.pro
index 7a6a841796..7a6a841796 100644
--- a/tests/auto/qabstractproxymodel/qabstractproxymodel.pro
+++ b/tests/auto/widgets/itemviews/qabstractproxymodel/qabstractproxymodel.pro
diff --git a/tests/auto/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/widgets/itemviews/qabstractproxymodel/tst_qabstractproxymodel.cpp
index b6557c45ec..b6557c45ec 100644
--- a/tests/auto/qabstractproxymodel/tst_qabstractproxymodel.cpp
+++ b/tests/auto/widgets/itemviews/qabstractproxymodel/tst_qabstractproxymodel.cpp
diff --git a/tests/auto/qcolumnview/.gitignore b/tests/auto/widgets/itemviews/qcolumnview/.gitignore
index 580ca0edad..580ca0edad 100644
--- a/tests/auto/qcolumnview/.gitignore
+++ b/tests/auto/widgets/itemviews/qcolumnview/.gitignore
diff --git a/tests/auto/qcolumnview/qcolumnview.pro b/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro
index bca9e75ba5..bca9e75ba5 100644
--- a/tests/auto/qcolumnview/qcolumnview.pro
+++ b/tests/auto/widgets/itemviews/qcolumnview/qcolumnview.pro
diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
index 364f917511..364f917511 100644
--- a/tests/auto/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/widgets/itemviews/qcolumnview/tst_qcolumnview.cpp
diff --git a/tests/auto/qdatawidgetmapper/.gitignore b/tests/auto/widgets/itemviews/qdatawidgetmapper/.gitignore
index 9b0a1e6399..9b0a1e6399 100644
--- a/tests/auto/qdatawidgetmapper/.gitignore
+++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/.gitignore
diff --git a/tests/auto/qdatawidgetmapper/qdatawidgetmapper.pro b/tests/auto/widgets/itemviews/qdatawidgetmapper/qdatawidgetmapper.pro
index 64e3b57291..64e3b57291 100644
--- a/tests/auto/qdatawidgetmapper/qdatawidgetmapper.pro
+++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/qdatawidgetmapper.pro
diff --git a/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
index 7488195497..7488195497 100644
--- a/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
+++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
diff --git a/tests/auto/qdirmodel/.gitignore b/tests/auto/widgets/itemviews/qdirmodel/.gitignore
index 641c99880f..641c99880f 100644
--- a/tests/auto/qdirmodel/.gitignore
+++ b/tests/auto/widgets/itemviews/qdirmodel/.gitignore
diff --git a/tests/auto/qdirmodel/dirtest/test1/dummy b/tests/auto/widgets/itemviews/qdirmodel/dirtest/test1/dummy
index 4d6a3b44f4..4d6a3b44f4 100644
--- a/tests/auto/qdirmodel/dirtest/test1/dummy
+++ b/tests/auto/widgets/itemviews/qdirmodel/dirtest/test1/dummy
diff --git a/tests/auto/qdirmodel/dirtest/test1/test b/tests/auto/widgets/itemviews/qdirmodel/dirtest/test1/test
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qdirmodel/dirtest/test1/test
+++ b/tests/auto/widgets/itemviews/qdirmodel/dirtest/test1/test
diff --git a/tests/auto/qdirmodel/qdirmodel.pro b/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro
index bc4e98d6ff..bc4e98d6ff 100644
--- a/tests/auto/qdirmodel/qdirmodel.pro
+++ b/tests/auto/widgets/itemviews/qdirmodel/qdirmodel.pro
diff --git a/tests/auto/qdirmodel/test/file01.tst b/tests/auto/widgets/itemviews/qdirmodel/test/file01.tst
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qdirmodel/test/file01.tst
+++ b/tests/auto/widgets/itemviews/qdirmodel/test/file01.tst
diff --git a/tests/auto/qdirmodel/test/file02.tst b/tests/auto/widgets/itemviews/qdirmodel/test/file02.tst
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qdirmodel/test/file02.tst
+++ b/tests/auto/widgets/itemviews/qdirmodel/test/file02.tst
diff --git a/tests/auto/qdirmodel/test/file03.tst b/tests/auto/widgets/itemviews/qdirmodel/test/file03.tst
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qdirmodel/test/file03.tst
+++ b/tests/auto/widgets/itemviews/qdirmodel/test/file03.tst
diff --git a/tests/auto/qdirmodel/test/file04.tst b/tests/auto/widgets/itemviews/qdirmodel/test/file04.tst
index e69de29bb2..e69de29bb2 100644
--- a/tests/auto/qdirmodel/test/file04.tst
+++ b/tests/auto/widgets/itemviews/qdirmodel/test/file04.tst
diff --git a/tests/auto/qdirmodel/tst_qdirmodel.cpp b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
index 70eb17b5e6..70eb17b5e6 100644
--- a/tests/auto/qdirmodel/tst_qdirmodel.cpp
+++ b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
diff --git a/tests/auto/qfileiconprovider/.gitignore b/tests/auto/widgets/itemviews/qfileiconprovider/.gitignore
index 1b673b8fd4..1b673b8fd4 100644
--- a/tests/auto/qfileiconprovider/.gitignore
+++ b/tests/auto/widgets/itemviews/qfileiconprovider/.gitignore
diff --git a/tests/auto/qfileiconprovider/qfileiconprovider.pro b/tests/auto/widgets/itemviews/qfileiconprovider/qfileiconprovider.pro
index 1e3d26de00..1e3d26de00 100644
--- a/tests/auto/qfileiconprovider/qfileiconprovider.pro
+++ b/tests/auto/widgets/itemviews/qfileiconprovider/qfileiconprovider.pro
diff --git a/tests/auto/qfileiconprovider/tst_qfileiconprovider.cpp b/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp
index cf53019ff1..cf53019ff1 100644
--- a/tests/auto/qfileiconprovider/tst_qfileiconprovider.cpp
+++ b/tests/auto/widgets/itemviews/qfileiconprovider/tst_qfileiconprovider.cpp
diff --git a/tests/auto/qheaderview/.gitignore b/tests/auto/widgets/itemviews/qheaderview/.gitignore
index dafdb3d2fb..dafdb3d2fb 100644
--- a/tests/auto/qheaderview/.gitignore
+++ b/tests/auto/widgets/itemviews/qheaderview/.gitignore
diff --git a/tests/auto/qheaderview/qheaderview.pro b/tests/auto/widgets/itemviews/qheaderview/qheaderview.pro
index 3b3afa7e49..3b3afa7e49 100644
--- a/tests/auto/qheaderview/qheaderview.pro
+++ b/tests/auto/widgets/itemviews/qheaderview/qheaderview.pro
diff --git a/tests/auto/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
index dd087b0e95..dd087b0e95 100644
--- a/tests/auto/qheaderview/tst_qheaderview.cpp
+++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
diff --git a/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro b/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro
new file mode 100644
index 0000000000..141e72a8c0
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qidentityproxymodel/qidentityproxymodel.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+
+mtdir = ../../../integrationtests/modeltest
+INCLUDEPATH += $$PWD/$${mtdir}
+QT += widgets
+SOURCES         += tst_qidentityproxymodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp
+HEADERS         += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h
diff --git a/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/widgets/itemviews/qidentityproxymodel/tst_qidentityproxymodel.cpp
index 6d73cbe2e1..6d73cbe2e1 100644
--- a/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp
+++ b/tests/auto/widgets/itemviews/qidentityproxymodel/tst_qidentityproxymodel.cpp
diff --git a/tests/auto/qitemdelegate/.gitignore b/tests/auto/widgets/itemviews/qitemdelegate/.gitignore
index 5faa678712..5faa678712 100644
--- a/tests/auto/qitemdelegate/.gitignore
+++ b/tests/auto/widgets/itemviews/qitemdelegate/.gitignore
diff --git a/tests/auto/qitemdelegate/qitemdelegate.pro b/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro
index 9a1a3b5e94..9a1a3b5e94 100644
--- a/tests/auto/qitemdelegate/qitemdelegate.pro
+++ b/tests/auto/widgets/itemviews/qitemdelegate/qitemdelegate.pro
diff --git a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
index e419a7f097..e419a7f097 100644
--- a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp
+++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp
diff --git a/tests/auto/qitemeditorfactory/.gitignore b/tests/auto/widgets/itemviews/qitemeditorfactory/.gitignore
index 33a458e65d..33a458e65d 100644
--- a/tests/auto/qitemeditorfactory/.gitignore
+++ b/tests/auto/widgets/itemviews/qitemeditorfactory/.gitignore
diff --git a/tests/auto/qitemeditorfactory/qitemeditorfactory.pro b/tests/auto/widgets/itemviews/qitemeditorfactory/qitemeditorfactory.pro
index 89bc944c51..89bc944c51 100644
--- a/tests/auto/qitemeditorfactory/qitemeditorfactory.pro
+++ b/tests/auto/widgets/itemviews/qitemeditorfactory/qitemeditorfactory.pro
diff --git a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp b/tests/auto/widgets/itemviews/qitemeditorfactory/tst_qitemeditorfactory.cpp
index 53c00dab0e..53c00dab0e 100644
--- a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
+++ b/tests/auto/widgets/itemviews/qitemeditorfactory/tst_qitemeditorfactory.cpp
diff --git a/tests/auto/qitemselectionmodel/.gitignore b/tests/auto/widgets/itemviews/qitemselectionmodel/.gitignore
index aa543a200a..aa543a200a 100644
--- a/tests/auto/qitemselectionmodel/.gitignore
+++ b/tests/auto/widgets/itemviews/qitemselectionmodel/.gitignore
diff --git a/tests/auto/qitemselectionmodel/qitemselectionmodel.pro b/tests/auto/widgets/itemviews/qitemselectionmodel/qitemselectionmodel.pro
index c675a6eb9d..c675a6eb9d 100644
--- a/tests/auto/qitemselectionmodel/qitemselectionmodel.pro
+++ b/tests/auto/widgets/itemviews/qitemselectionmodel/qitemselectionmodel.pro
diff --git a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp
index f7ce339854..f7ce339854 100644
--- a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/widgets/itemviews/qitemselectionmodel/tst_qitemselectionmodel.cpp
diff --git a/tests/auto/qitemview/.gitignore b/tests/auto/widgets/itemviews/qitemview/.gitignore
index c129cad63c..c129cad63c 100644
--- a/tests/auto/qitemview/.gitignore
+++ b/tests/auto/widgets/itemviews/qitemview/.gitignore
diff --git a/tests/auto/qitemview/qitemview.pro b/tests/auto/widgets/itemviews/qitemview/qitemview.pro
index dbdd4612d5..dbdd4612d5 100644
--- a/tests/auto/qitemview/qitemview.pro
+++ b/tests/auto/widgets/itemviews/qitemview/qitemview.pro
diff --git a/tests/auto/qitemview/tst_qitemview.cpp b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
index 4c64d4c52a..4c64d4c52a 100644
--- a/tests/auto/qitemview/tst_qitemview.cpp
+++ b/tests/auto/widgets/itemviews/qitemview/tst_qitemview.cpp
diff --git a/tests/auto/qitemview/viewstotest.cpp b/tests/auto/widgets/itemviews/qitemview/viewstotest.cpp
index b61ecd5c2a..b61ecd5c2a 100644
--- a/tests/auto/qitemview/viewstotest.cpp
+++ b/tests/auto/widgets/itemviews/qitemview/viewstotest.cpp
diff --git a/tests/auto/qlistview/.gitignore b/tests/auto/widgets/itemviews/qlistview/.gitignore
index a0e31d03d4..a0e31d03d4 100644
--- a/tests/auto/qlistview/.gitignore
+++ b/tests/auto/widgets/itemviews/qlistview/.gitignore
diff --git a/tests/auto/qlistview/qlistview.pro b/tests/auto/widgets/itemviews/qlistview/qlistview.pro
index 07fabbce35..07fabbce35 100644
--- a/tests/auto/qlistview/qlistview.pro
+++ b/tests/auto/widgets/itemviews/qlistview/qlistview.pro
diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index b58a306f94..b58a306f94 100644
--- a/tests/auto/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
diff --git a/tests/auto/qlistwidget/.gitignore b/tests/auto/widgets/itemviews/qlistwidget/.gitignore
index 085486b2de..085486b2de 100644
--- a/tests/auto/qlistwidget/.gitignore
+++ b/tests/auto/widgets/itemviews/qlistwidget/.gitignore
diff --git a/tests/auto/qlistwidget/qlistwidget.pro b/tests/auto/widgets/itemviews/qlistwidget/qlistwidget.pro
index 7343415e4c..7343415e4c 100644
--- a/tests/auto/qlistwidget/qlistwidget.pro
+++ b/tests/auto/widgets/itemviews/qlistwidget/qlistwidget.pro
diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
index 9ede38f553..9ede38f553 100644
--- a/tests/auto/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/widgets/itemviews/qlistwidget/tst_qlistwidget.cpp
diff --git a/tests/auto/qsortfilterproxymodel/.gitignore b/tests/auto/widgets/itemviews/qsortfilterproxymodel/.gitignore
index d3672fe4ae..d3672fe4ae 100644
--- a/tests/auto/qsortfilterproxymodel/.gitignore
+++ b/tests/auto/widgets/itemviews/qsortfilterproxymodel/.gitignore
diff --git a/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro b/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro
new file mode 100644
index 0000000000..65207b6563
--- /dev/null
+++ b/tests/auto/widgets/itemviews/qsortfilterproxymodel/qsortfilterproxymodel.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+
+QT += gui widgets
+mtdir = ../../../integrationtests/modeltest
+
+INCLUDEPATH += $$PWD/$${mtdir}
+SOURCES         += tst_qsortfilterproxymodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp
+HEADERS         += $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h
diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index 96f7249e3c..96f7249e3c 100644
--- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/widgets/itemviews/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
diff --git a/tests/auto/qstandarditem/.gitignore b/tests/auto/widgets/itemviews/qstandarditem/.gitignore
index 6da85cc6c8..6da85cc6c8 100644
--- a/tests/auto/qstandarditem/.gitignore
+++ b/tests/auto/widgets/itemviews/qstandarditem/.gitignore
diff --git a/tests/auto/qstandarditem/qstandarditem.pro b/tests/auto/widgets/itemviews/qstandarditem/qstandarditem.pro
index 1d280fc2f5..1d280fc2f5 100644
--- a/tests/auto/qstandarditem/qstandarditem.pro
+++ b/tests/auto/widgets/itemviews/qstandarditem/qstandarditem.pro
diff --git a/tests/auto/qstandarditem/tst_qstandarditem.cpp b/tests/auto/widgets/itemviews/qstandarditem/tst_qstandarditem.cpp
index 206d469884..206d469884 100644
--- a/tests/auto/qstandarditem/tst_qstandarditem.cpp
+++ b/tests/auto/widgets/itemviews/qstandarditem/tst_qstandarditem.cpp
diff --git a/tests/auto/qstandarditemmodel/.gitignore b/tests/auto/widgets/itemviews/qstandarditemmodel/.gitignore
index c218efce58..c218efce58 100644
--- a/tests/auto/qstandarditemmodel/.gitignore
+++ b/tests/auto/widgets/itemviews/qstandarditemmodel/.gitignore
diff --git a/tests/auto/qstandarditemmodel/qstandarditemmodel.pro b/tests/auto/widgets/itemviews/qstandarditemmodel/qstandarditemmodel.pro
index 8c634b9630..8c634b9630 100644
--- a/tests/auto/qstandarditemmodel/qstandarditemmodel.pro
+++ b/tests/auto/widgets/itemviews/qstandarditemmodel/qstandarditemmodel.pro
diff --git a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/widgets/itemviews/qstandarditemmodel/tst_qstandarditemmodel.cpp
index 84a33107aa..84a33107aa 100644
--- a/tests/auto/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/widgets/itemviews/qstandarditemmodel/tst_qstandarditemmodel.cpp
diff --git a/tests/auto/qstringlistmodel/.gitignore b/tests/auto/widgets/itemviews/qstringlistmodel/.gitignore
index 9c14561e3c..9c14561e3c 100644
--- a/tests/auto/qstringlistmodel/.gitignore
+++ b/tests/auto/widgets/itemviews/qstringlistmodel/.gitignore
diff --git a/tests/auto/qstringlistmodel/qmodellistener.h b/tests/auto/widgets/itemviews/qstringlistmodel/qmodellistener.h
index f3ed3c1793..f3ed3c1793 100644
--- a/tests/auto/qstringlistmodel/qmodellistener.h
+++ b/tests/auto/widgets/itemviews/qstringlistmodel/qmodellistener.h
diff --git a/tests/auto/qstringlistmodel/qstringlistmodel.pro b/tests/auto/widgets/itemviews/qstringlistmodel/qstringlistmodel.pro
index fe70ed7345..fe70ed7345 100644
--- a/tests/auto/qstringlistmodel/qstringlistmodel.pro
+++ b/tests/auto/widgets/itemviews/qstringlistmodel/qstringlistmodel.pro
diff --git a/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp
index 2542496f14..2542496f14 100644
--- a/tests/auto/qstringlistmodel/tst_qstringlistmodel.cpp
+++ b/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp
diff --git a/tests/auto/qtableview/.gitignore b/tests/auto/widgets/itemviews/qtableview/.gitignore
index e2c6365d65..e2c6365d65 100644
--- a/tests/auto/qtableview/.gitignore
+++ b/tests/auto/widgets/itemviews/qtableview/.gitignore
diff --git a/tests/auto/qtableview/qtableview.pro b/tests/auto/widgets/itemviews/qtableview/qtableview.pro
index 408119a782..408119a782 100644
--- a/tests/auto/qtableview/qtableview.pro
+++ b/tests/auto/widgets/itemviews/qtableview/qtableview.pro
diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index 2242490a44..2242490a44 100644
--- a/tests/auto/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
diff --git a/tests/auto/qtablewidget/.gitignore b/tests/auto/widgets/itemviews/qtablewidget/.gitignore
index 13a9c67c0a..13a9c67c0a 100644
--- a/tests/auto/qtablewidget/.gitignore
+++ b/tests/auto/widgets/itemviews/qtablewidget/.gitignore
diff --git a/tests/auto/qtablewidget/qtablewidget.pro b/tests/auto/widgets/itemviews/qtablewidget/qtablewidget.pro
index eff12c83dc..eff12c83dc 100644
--- a/tests/auto/qtablewidget/qtablewidget.pro
+++ b/tests/auto/widgets/itemviews/qtablewidget/qtablewidget.pro
diff --git a/tests/auto/qtablewidget/tst_qtablewidget.cpp b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
index 6c32caadbb..6c32caadbb 100644
--- a/tests/auto/qtablewidget/tst_qtablewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtablewidget/tst_qtablewidget.cpp
diff --git a/tests/auto/qtreeview/.gitignore b/tests/auto/widgets/itemviews/qtreeview/.gitignore
index 4e72cdb157..4e72cdb157 100644
--- a/tests/auto/qtreeview/.gitignore
+++ b/tests/auto/widgets/itemviews/qtreeview/.gitignore
diff --git a/tests/auto/qtreeview/qtreeview.pro b/tests/auto/widgets/itemviews/qtreeview/qtreeview.pro
index ea53bbdc1d..ea53bbdc1d 100644
--- a/tests/auto/qtreeview/qtreeview.pro
+++ b/tests/auto/widgets/itemviews/qtreeview/qtreeview.pro
diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
index d6cdf00218..d6cdf00218 100644
--- a/tests/auto/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp
diff --git a/tests/auto/qtreewidget/.gitignore b/tests/auto/widgets/itemviews/qtreewidget/.gitignore
index 08c63b4b52..08c63b4b52 100644
--- a/tests/auto/qtreewidget/.gitignore
+++ b/tests/auto/widgets/itemviews/qtreewidget/.gitignore
diff --git a/tests/auto/qtreewidget/qtreewidget.pro b/tests/auto/widgets/itemviews/qtreewidget/qtreewidget.pro
index 763c0d3c63..763c0d3c63 100644
--- a/tests/auto/qtreewidget/qtreewidget.pro
+++ b/tests/auto/widgets/itemviews/qtreewidget/qtreewidget.pro
diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index 5e1faf97c4..5e1faf97c4 100644
--- a/tests/auto/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
diff --git a/tests/auto/qtreewidgetitemiterator/.gitignore b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/.gitignore
index 6595518de7..6595518de7 100644
--- a/tests/auto/qtreewidgetitemiterator/.gitignore
+++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/.gitignore
diff --git a/tests/auto/qtreewidgetitemiterator/qtreewidgetitemiterator.pro b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro
index de7762e773..de7762e773 100644
--- a/tests/auto/qtreewidgetitemiterator/qtreewidgetitemiterator.pro
+++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/qtreewidgetitemiterator.pro
diff --git a/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
index 92a1b7cce3..92a1b7cce3 100644
--- a/tests/auto/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/tst_qtreewidgetitemiterator.cpp
diff --git a/tests/auto/widgets/kernel/kernel.pro b/tests/auto/widgets/kernel/kernel.pro
new file mode 100644
index 0000000000..2e55f8eba2
--- /dev/null
+++ b/tests/auto/widgets/kernel/kernel.pro
@@ -0,0 +1,17 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qaction \
+   qactiongroup \
+   qapplication \
+   qboxlayout \
+   qdesktopwidget \
+   qformlayout \
+   qgridlayout \
+   qinputcontext \
+   qlayout \
+   qsound \
+   qstackedlayout \
+   qtooltip \
+   qwidget \
+   qwidget_window \
+   qwidgetaction \
diff --git a/tests/auto/qaction/.gitignore b/tests/auto/widgets/kernel/qaction/.gitignore
index bf81f5bf2c..bf81f5bf2c 100644
--- a/tests/auto/qaction/.gitignore
+++ b/tests/auto/widgets/kernel/qaction/.gitignore
diff --git a/tests/auto/qaction/qaction.pro b/tests/auto/widgets/kernel/qaction/qaction.pro
index 9c3648d52f..9c3648d52f 100644
--- a/tests/auto/qaction/qaction.pro
+++ b/tests/auto/widgets/kernel/qaction/qaction.pro
diff --git a/tests/auto/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
index 637ec144d2..637ec144d2 100644
--- a/tests/auto/qaction/tst_qaction.cpp
+++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
diff --git a/tests/auto/qactiongroup/.gitignore b/tests/auto/widgets/kernel/qactiongroup/.gitignore
index daba003e96..daba003e96 100644
--- a/tests/auto/qactiongroup/.gitignore
+++ b/tests/auto/widgets/kernel/qactiongroup/.gitignore
diff --git a/tests/auto/qactiongroup/qactiongroup.pro b/tests/auto/widgets/kernel/qactiongroup/qactiongroup.pro
index 9b8636968b..9b8636968b 100644
--- a/tests/auto/qactiongroup/qactiongroup.pro
+++ b/tests/auto/widgets/kernel/qactiongroup/qactiongroup.pro
diff --git a/tests/auto/qactiongroup/tst_qactiongroup.cpp b/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp
index 406298807a..406298807a 100644
--- a/tests/auto/qactiongroup/tst_qactiongroup.cpp
+++ b/tests/auto/widgets/kernel/qactiongroup/tst_qactiongroup.cpp
diff --git a/tests/auto/qapplication/.gitignore b/tests/auto/widgets/kernel/qapplication/.gitignore
index ca666e480a..ca666e480a 100644
--- a/tests/auto/qapplication/.gitignore
+++ b/tests/auto/widgets/kernel/qapplication/.gitignore
diff --git a/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro
index 216a9710c7..216a9710c7 100644
--- a/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro
+++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/desktopsettingsaware.pro
diff --git a/tests/auto/qapplication/desktopsettingsaware/main.cpp b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/main.cpp
index 9e2172829a..9e2172829a 100644
--- a/tests/auto/qapplication/desktopsettingsaware/main.cpp
+++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/main.cpp
diff --git a/tests/auto/qapplication/heart.svg b/tests/auto/widgets/kernel/qapplication/heart.svg
index 8c982cd93c..8c982cd93c 100644
--- a/tests/auto/qapplication/heart.svg
+++ b/tests/auto/widgets/kernel/qapplication/heart.svg
diff --git a/tests/auto/qapplication/modal/base.cpp b/tests/auto/widgets/kernel/qapplication/modal/base.cpp
index 2f7b4ad529..2f7b4ad529 100644
--- a/tests/auto/qapplication/modal/base.cpp
+++ b/tests/auto/widgets/kernel/qapplication/modal/base.cpp
diff --git a/tests/auto/qapplication/modal/base.h b/tests/auto/widgets/kernel/qapplication/modal/base.h
index e1f36e11bd..e1f36e11bd 100644
--- a/tests/auto/qapplication/modal/base.h
+++ b/tests/auto/widgets/kernel/qapplication/modal/base.h
diff --git a/tests/auto/qapplication/modal/main.cpp b/tests/auto/widgets/kernel/qapplication/modal/main.cpp
index 53c6008eb5..53c6008eb5 100644
--- a/tests/auto/qapplication/modal/main.cpp
+++ b/tests/auto/widgets/kernel/qapplication/modal/main.cpp
diff --git a/tests/auto/qapplication/modal/modal.pro b/tests/auto/widgets/kernel/qapplication/modal/modal.pro
index 9ed69769bb..9ed69769bb 100644
--- a/tests/auto/qapplication/modal/modal.pro
+++ b/tests/auto/widgets/kernel/qapplication/modal/modal.pro
diff --git a/tests/auto/qapplication/qapplication.pro b/tests/auto/widgets/kernel/qapplication/qapplication.pro
index becc6c6f4b..becc6c6f4b 100644
--- a/tests/auto/qapplication/qapplication.pro
+++ b/tests/auto/widgets/kernel/qapplication/qapplication.pro
diff --git a/tests/auto/qapplication/test/test.pro b/tests/auto/widgets/kernel/qapplication/test/test.pro
index 65aae7b0b9..65aae7b0b9 100644
--- a/tests/auto/qapplication/test/test.pro
+++ b/tests/auto/widgets/kernel/qapplication/test/test.pro
diff --git a/tests/auto/qapplication/tmp/README b/tests/auto/widgets/kernel/qapplication/tmp/README
index e758961ddf..e758961ddf 100644
--- a/tests/auto/qapplication/tmp/README
+++ b/tests/auto/widgets/kernel/qapplication/tmp/README
diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
index c37dfc609e..c37dfc609e 100644
--- a/tests/auto/qapplication/tst_qapplication.cpp
+++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
diff --git a/tests/auto/qapplication/wincmdline/main.cpp b/tests/auto/widgets/kernel/qapplication/wincmdline/main.cpp
index d0f802231a..d0f802231a 100644
--- a/tests/auto/qapplication/wincmdline/main.cpp
+++ b/tests/auto/widgets/kernel/qapplication/wincmdline/main.cpp
diff --git a/tests/auto/qapplication/wincmdline/wincmdline.pro b/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro
index 3ba8f48167..3ba8f48167 100644
--- a/tests/auto/qapplication/wincmdline/wincmdline.pro
+++ b/tests/auto/widgets/kernel/qapplication/wincmdline/wincmdline.pro
diff --git a/tests/auto/qboxlayout/.gitignore b/tests/auto/widgets/kernel/qboxlayout/.gitignore
index 034edba563..034edba563 100644
--- a/tests/auto/qboxlayout/.gitignore
+++ b/tests/auto/widgets/kernel/qboxlayout/.gitignore
diff --git a/tests/auto/qboxlayout/qboxlayout.pro b/tests/auto/widgets/kernel/qboxlayout/qboxlayout.pro
index c37f12f74f..c37f12f74f 100644
--- a/tests/auto/qboxlayout/qboxlayout.pro
+++ b/tests/auto/widgets/kernel/qboxlayout/qboxlayout.pro
diff --git a/tests/auto/qboxlayout/tst_qboxlayout.cpp b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
index 4e5b357de5..4e5b357de5 100644
--- a/tests/auto/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/widgets/kernel/qboxlayout/tst_qboxlayout.cpp
diff --git a/tests/auto/qdesktopwidget/.gitignore b/tests/auto/widgets/kernel/qdesktopwidget/.gitignore
index d6f7cc7ca9..d6f7cc7ca9 100644
--- a/tests/auto/qdesktopwidget/.gitignore
+++ b/tests/auto/widgets/kernel/qdesktopwidget/.gitignore
diff --git a/tests/auto/qdesktopwidget/qdesktopwidget.pro b/tests/auto/widgets/kernel/qdesktopwidget/qdesktopwidget.pro
index 730b273c4f..730b273c4f 100644
--- a/tests/auto/qdesktopwidget/qdesktopwidget.pro
+++ b/tests/auto/widgets/kernel/qdesktopwidget/qdesktopwidget.pro
diff --git a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp b/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp
index e7e3abeb25..e7e3abeb25 100644
--- a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp
+++ b/tests/auto/widgets/kernel/qdesktopwidget/tst_qdesktopwidget.cpp
diff --git a/tests/auto/qformlayout/.gitignore b/tests/auto/widgets/kernel/qformlayout/.gitignore
index 24e93d561f..24e93d561f 100644
--- a/tests/auto/qformlayout/.gitignore
+++ b/tests/auto/widgets/kernel/qformlayout/.gitignore
diff --git a/tests/auto/qformlayout/qformlayout.pro b/tests/auto/widgets/kernel/qformlayout/qformlayout.pro
index 24c452af9f..24c452af9f 100644
--- a/tests/auto/qformlayout/qformlayout.pro
+++ b/tests/auto/widgets/kernel/qformlayout/qformlayout.pro
diff --git a/tests/auto/qformlayout/tst_qformlayout.cpp b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
index 4425205eb9..4425205eb9 100644
--- a/tests/auto/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/widgets/kernel/qformlayout/tst_qformlayout.cpp
diff --git a/tests/auto/qgridlayout/.gitignore b/tests/auto/widgets/kernel/qgridlayout/.gitignore
index bce8f2f91e..bce8f2f91e 100644
--- a/tests/auto/qgridlayout/.gitignore
+++ b/tests/auto/widgets/kernel/qgridlayout/.gitignore
diff --git a/tests/auto/qgridlayout/qgridlayout.pro b/tests/auto/widgets/kernel/qgridlayout/qgridlayout.pro
index 6bd42fe432..6bd42fe432 100644
--- a/tests/auto/qgridlayout/qgridlayout.pro
+++ b/tests/auto/widgets/kernel/qgridlayout/qgridlayout.pro
diff --git a/tests/auto/qgridlayout/sortdialog.ui b/tests/auto/widgets/kernel/qgridlayout/sortdialog.ui
index 04af84d01b..04af84d01b 100644
--- a/tests/auto/qgridlayout/sortdialog.ui
+++ b/tests/auto/widgets/kernel/qgridlayout/sortdialog.ui
diff --git a/tests/auto/qgridlayout/tst_qgridlayout.cpp b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
index 3b352644f3..100b7eb892 100644
--- a/tests/auto/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/widgets/kernel/qgridlayout/tst_qgridlayout.cpp
@@ -54,7 +54,7 @@
 #include <QtWidgets/QWindowsStyle>
 #include <QStyleFactory>
 
-#include "../platformquirks.h"
+#include "../../../platformquirks.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=gui/kernel/qlayout.cpp gui/kernel/qlayout.h
diff --git a/tests/auto/qinputcontext/qinputcontext.pro b/tests/auto/widgets/kernel/qinputcontext/qinputcontext.pro
index cdadb0c5ed..cdadb0c5ed 100644
--- a/tests/auto/qinputcontext/qinputcontext.pro
+++ b/tests/auto/widgets/kernel/qinputcontext/qinputcontext.pro
diff --git a/tests/auto/qinputcontext/tst_qinputcontext.cpp b/tests/auto/widgets/kernel/qinputcontext/tst_qinputcontext.cpp
index 9b6452851e..9b6452851e 100644
--- a/tests/auto/qinputcontext/tst_qinputcontext.cpp
+++ b/tests/auto/widgets/kernel/qinputcontext/tst_qinputcontext.cpp
diff --git a/tests/auto/qlayout/.gitignore b/tests/auto/widgets/kernel/qlayout/.gitignore
index cc058e7cc3..cc058e7cc3 100644
--- a/tests/auto/qlayout/.gitignore
+++ b/tests/auto/widgets/kernel/qlayout/.gitignore
diff --git a/tests/auto/qlayout/baseline/smartmaxsize b/tests/auto/widgets/kernel/qlayout/baseline/smartmaxsize
index 2d3ba2e72f..2d3ba2e72f 100644
--- a/tests/auto/qlayout/baseline/smartmaxsize
+++ b/tests/auto/widgets/kernel/qlayout/baseline/smartmaxsize
diff --git a/tests/auto/qlayout/qlayout.pro b/tests/auto/widgets/kernel/qlayout/qlayout.pro
index 28ca9dc86d..28ca9dc86d 100644
--- a/tests/auto/qlayout/qlayout.pro
+++ b/tests/auto/widgets/kernel/qlayout/qlayout.pro
diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
index ea25700568..ea25700568 100644
--- a/tests/auto/qlayout/tst_qlayout.cpp
+++ b/tests/auto/widgets/kernel/qlayout/tst_qlayout.cpp
diff --git a/tests/auto/qsound/.gitignore b/tests/auto/widgets/kernel/qsound/.gitignore
index c9d313c2cf..c9d313c2cf 100644
--- a/tests/auto/qsound/.gitignore
+++ b/tests/auto/widgets/kernel/qsound/.gitignore
diff --git a/tests/auto/qsound/4.wav b/tests/auto/widgets/kernel/qsound/4.wav
index e31b060908..e31b060908 100644
--- a/tests/auto/qsound/4.wav
+++ b/tests/auto/widgets/kernel/qsound/4.wav
diff --git a/tests/auto/qsound/qsound.pro b/tests/auto/widgets/kernel/qsound/qsound.pro
index 18ebaf16a4..18ebaf16a4 100644
--- a/tests/auto/qsound/qsound.pro
+++ b/tests/auto/widgets/kernel/qsound/qsound.pro
diff --git a/tests/auto/qsound/tst_qsound.cpp b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp
index 7450549f47..7450549f47 100644
--- a/tests/auto/qsound/tst_qsound.cpp
+++ b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp
diff --git a/tests/auto/qstackedlayout/.gitignore b/tests/auto/widgets/kernel/qstackedlayout/.gitignore
index 4dca3e87bd..4dca3e87bd 100644
--- a/tests/auto/qstackedlayout/.gitignore
+++ b/tests/auto/widgets/kernel/qstackedlayout/.gitignore
diff --git a/tests/auto/qstackedlayout/qstackedlayout.pro b/tests/auto/widgets/kernel/qstackedlayout/qstackedlayout.pro
index 30f074d9b1..30f074d9b1 100644
--- a/tests/auto/qstackedlayout/qstackedlayout.pro
+++ b/tests/auto/widgets/kernel/qstackedlayout/qstackedlayout.pro
diff --git a/tests/auto/qstackedlayout/tst_qstackedlayout.cpp b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
index de734877d7..de734877d7 100644
--- a/tests/auto/qstackedlayout/tst_qstackedlayout.cpp
+++ b/tests/auto/widgets/kernel/qstackedlayout/tst_qstackedlayout.cpp
diff --git a/tests/auto/qtooltip/.gitignore b/tests/auto/widgets/kernel/qtooltip/.gitignore
index 552a2a5dc6..552a2a5dc6 100644
--- a/tests/auto/qtooltip/.gitignore
+++ b/tests/auto/widgets/kernel/qtooltip/.gitignore
diff --git a/tests/auto/qtooltip/qtooltip.pro b/tests/auto/widgets/kernel/qtooltip/qtooltip.pro
index 4da8917921..4da8917921 100644
--- a/tests/auto/qtooltip/qtooltip.pro
+++ b/tests/auto/widgets/kernel/qtooltip/qtooltip.pro
diff --git a/tests/auto/qtooltip/tst_qtooltip.cpp b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
index 3ff31ead62..3ff31ead62 100644
--- a/tests/auto/qtooltip/tst_qtooltip.cpp
+++ b/tests/auto/widgets/kernel/qtooltip/tst_qtooltip.cpp
diff --git a/tests/auto/qwidget/.gitignore b/tests/auto/widgets/kernel/qwidget/.gitignore
index 82a0ac9eba..82a0ac9eba 100644
--- a/tests/auto/qwidget/.gitignore
+++ b/tests/auto/widgets/kernel/qwidget/.gitignore
diff --git a/tests/auto/qwidget/geometry-fullscreen.dat b/tests/auto/widgets/kernel/qwidget/geometry-fullscreen.dat
index 9802ee8b9e..9802ee8b9e 100644
--- a/tests/auto/qwidget/geometry-fullscreen.dat
+++ b/tests/auto/widgets/kernel/qwidget/geometry-fullscreen.dat
diff --git a/tests/auto/qwidget/geometry-maximized.dat b/tests/auto/widgets/kernel/qwidget/geometry-maximized.dat
index df5bc2f94e..df5bc2f94e 100644
--- a/tests/auto/qwidget/geometry-maximized.dat
+++ b/tests/auto/widgets/kernel/qwidget/geometry-maximized.dat
diff --git a/tests/auto/qwidget/geometry.dat b/tests/auto/widgets/kernel/qwidget/geometry.dat
index e5dcb2dc44..e5dcb2dc44 100644
--- a/tests/auto/qwidget/geometry.dat
+++ b/tests/auto/widgets/kernel/qwidget/geometry.dat
diff --git a/tests/auto/qwidget/qwidget.pro b/tests/auto/widgets/kernel/qwidget/qwidget.pro
index 9c34e0c254..9c34e0c254 100644
--- a/tests/auto/qwidget/qwidget.pro
+++ b/tests/auto/widgets/kernel/qwidget/qwidget.pro
diff --git a/tests/auto/qwidget/qwidget.qrc b/tests/auto/widgets/kernel/qwidget/qwidget.qrc
index 1399c4c9db..1399c4c9db 100644
--- a/tests/auto/qwidget/qwidget.qrc
+++ b/tests/auto/widgets/kernel/qwidget/qwidget.qrc
diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Motif_data0.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data0.qsnap
index b3473cdefe..b3473cdefe 100644
--- a/tests/auto/qwidget/testdata/paintEvent/res_Motif_data0.qsnap
+++ b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data0.qsnap
diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Motif_data1.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data1.qsnap
index 10007733ca..10007733ca 100644
--- a/tests/auto/qwidget/testdata/paintEvent/res_Motif_data1.qsnap
+++ b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data1.qsnap
diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Motif_data2.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data2.qsnap
index cde5964a30..cde5964a30 100644
--- a/tests/auto/qwidget/testdata/paintEvent/res_Motif_data2.qsnap
+++ b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data2.qsnap
diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Motif_data3.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data3.qsnap
index 23ea1410e4..23ea1410e4 100644
--- a/tests/auto/qwidget/testdata/paintEvent/res_Motif_data3.qsnap
+++ b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Motif_data3.qsnap
diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Windows_data0.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data0.qsnap
index a8918c1d1b..a8918c1d1b 100644
--- a/tests/auto/qwidget/testdata/paintEvent/res_Windows_data0.qsnap
+++ b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data0.qsnap
diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Windows_data1.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data1.qsnap
index 0981cf5dd1..0981cf5dd1 100644
--- a/tests/auto/qwidget/testdata/paintEvent/res_Windows_data1.qsnap
+++ b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data1.qsnap
diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Windows_data2.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data2.qsnap
index 75d09136cf..75d09136cf 100644
--- a/tests/auto/qwidget/testdata/paintEvent/res_Windows_data2.qsnap
+++ b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data2.qsnap
diff --git a/tests/auto/qwidget/testdata/paintEvent/res_Windows_data3.qsnap b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data3.qsnap
index f58f74d030..f58f74d030 100644
--- a/tests/auto/qwidget/testdata/paintEvent/res_Windows_data3.qsnap
+++ b/tests/auto/widgets/kernel/qwidget/testdata/paintEvent/res_Windows_data3.qsnap
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index ded0c5e061..ded0c5e061 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
diff --git a/tests/auto/qwidget/tst_qwidget_mac_helpers.h b/tests/auto/widgets/kernel/qwidget/tst_qwidget_mac_helpers.h
index d7bc3f33c7..d7bc3f33c7 100644
--- a/tests/auto/qwidget/tst_qwidget_mac_helpers.h
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget_mac_helpers.h
diff --git a/tests/auto/qwidget/tst_qwidget_mac_helpers.mm b/tests/auto/widgets/kernel/qwidget/tst_qwidget_mac_helpers.mm
index 10e137c06c..10e137c06c 100644
--- a/tests/auto/qwidget/tst_qwidget_mac_helpers.mm
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget_mac_helpers.mm
diff --git a/tests/auto/qwidget_window/.gitignore b/tests/auto/widgets/kernel/qwidget_window/.gitignore
index 7f0bd8d631..7f0bd8d631 100644
--- a/tests/auto/qwidget_window/.gitignore
+++ b/tests/auto/widgets/kernel/qwidget_window/.gitignore
diff --git a/tests/auto/qwidget_window/qwidget_window.pro b/tests/auto/widgets/kernel/qwidget_window/qwidget_window.pro
index dd5837012c..dd5837012c 100644
--- a/tests/auto/qwidget_window/qwidget_window.pro
+++ b/tests/auto/widgets/kernel/qwidget_window/qwidget_window.pro
diff --git a/tests/auto/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
index eb8b555bd6..eb8b555bd6 100644
--- a/tests/auto/qwidget_window/tst_qwidget_window.cpp
+++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
diff --git a/tests/auto/qwidgetaction/.gitignore b/tests/auto/widgets/kernel/qwidgetaction/.gitignore
index 56d519d851..56d519d851 100644
--- a/tests/auto/qwidgetaction/.gitignore
+++ b/tests/auto/widgets/kernel/qwidgetaction/.gitignore
diff --git a/tests/auto/qwidgetaction/qwidgetaction.pro b/tests/auto/widgets/kernel/qwidgetaction/qwidgetaction.pro
index 3e037c2efb..3e037c2efb 100644
--- a/tests/auto/qwidgetaction/qwidgetaction.pro
+++ b/tests/auto/widgets/kernel/qwidgetaction/qwidgetaction.pro
diff --git a/tests/auto/qwidgetaction/tst_qwidgetaction.cpp b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
index 5f51f6d316..5f51f6d316 100644
--- a/tests/auto/qwidgetaction/tst_qwidgetaction.cpp
+++ b/tests/auto/widgets/kernel/qwidgetaction/tst_qwidgetaction.cpp
diff --git a/tests/auto/qmacstyle/.gitignore b/tests/auto/widgets/styles/qmacstyle/.gitignore
index 9abe0ad6ab..9abe0ad6ab 100644
--- a/tests/auto/qmacstyle/.gitignore
+++ b/tests/auto/widgets/styles/qmacstyle/.gitignore
diff --git a/tests/auto/qmacstyle/qmacstyle.pro b/tests/auto/widgets/styles/qmacstyle/qmacstyle.pro
index 5aad7368c6..5aad7368c6 100644
--- a/tests/auto/qmacstyle/qmacstyle.pro
+++ b/tests/auto/widgets/styles/qmacstyle/qmacstyle.pro
diff --git a/tests/auto/qmacstyle/tst_qmacstyle.cpp b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
index a262712abc..a262712abc 100644
--- a/tests/auto/qmacstyle/tst_qmacstyle.cpp
+++ b/tests/auto/widgets/styles/qmacstyle/tst_qmacstyle.cpp
diff --git a/tests/auto/qstyle/.gitignore b/tests/auto/widgets/styles/qstyle/.gitignore
index 64709f11f7..64709f11f7 100644
--- a/tests/auto/qstyle/.gitignore
+++ b/tests/auto/widgets/styles/qstyle/.gitignore
diff --git a/tests/auto/qstyle/images/mac/button.png b/tests/auto/widgets/styles/qstyle/images/mac/button.png
index 7b11325e87..7b11325e87 100644
--- a/tests/auto/qstyle/images/mac/button.png
+++ b/tests/auto/widgets/styles/qstyle/images/mac/button.png
diff --git a/tests/auto/qstyle/images/mac/combobox.png b/tests/auto/widgets/styles/qstyle/images/mac/combobox.png
index ded0b11f29..ded0b11f29 100644
--- a/tests/auto/qstyle/images/mac/combobox.png
+++ b/tests/auto/widgets/styles/qstyle/images/mac/combobox.png
diff --git a/tests/auto/qstyle/images/mac/lineedit.png b/tests/auto/widgets/styles/qstyle/images/mac/lineedit.png
index 8d2861b65b..8d2861b65b 100644
--- a/tests/auto/qstyle/images/mac/lineedit.png
+++ b/tests/auto/widgets/styles/qstyle/images/mac/lineedit.png
diff --git a/tests/auto/qstyle/images/mac/mdi.png b/tests/auto/widgets/styles/qstyle/images/mac/mdi.png
index 8c09ae4338..8c09ae4338 100644
--- a/tests/auto/qstyle/images/mac/mdi.png
+++ b/tests/auto/widgets/styles/qstyle/images/mac/mdi.png
diff --git a/tests/auto/qstyle/images/mac/menu.png b/tests/auto/widgets/styles/qstyle/images/mac/menu.png
index 5dd9111d69..5dd9111d69 100644
--- a/tests/auto/qstyle/images/mac/menu.png
+++ b/tests/auto/widgets/styles/qstyle/images/mac/menu.png
diff --git a/tests/auto/qstyle/images/mac/radiobutton.png b/tests/auto/widgets/styles/qstyle/images/mac/radiobutton.png
index 8828e220a2..8828e220a2 100644
--- a/tests/auto/qstyle/images/mac/radiobutton.png
+++ b/tests/auto/widgets/styles/qstyle/images/mac/radiobutton.png
diff --git a/tests/auto/qstyle/images/mac/slider.png b/tests/auto/widgets/styles/qstyle/images/mac/slider.png
index fc65035631..fc65035631 100644
--- a/tests/auto/qstyle/images/mac/slider.png
+++ b/tests/auto/widgets/styles/qstyle/images/mac/slider.png
diff --git a/tests/auto/qstyle/images/mac/spinbox.png b/tests/auto/widgets/styles/qstyle/images/mac/spinbox.png
index ee88441ecb..ee88441ecb 100644
--- a/tests/auto/qstyle/images/mac/spinbox.png
+++ b/tests/auto/widgets/styles/qstyle/images/mac/spinbox.png
diff --git a/tests/auto/qstyle/images/vista/button.png b/tests/auto/widgets/styles/qstyle/images/vista/button.png
index a6c45276ca..a6c45276ca 100644
--- a/tests/auto/qstyle/images/vista/button.png
+++ b/tests/auto/widgets/styles/qstyle/images/vista/button.png
diff --git a/tests/auto/qstyle/images/vista/combobox.png b/tests/auto/widgets/styles/qstyle/images/vista/combobox.png
index 9b82f64d32..9b82f64d32 100644
--- a/tests/auto/qstyle/images/vista/combobox.png
+++ b/tests/auto/widgets/styles/qstyle/images/vista/combobox.png
diff --git a/tests/auto/qstyle/images/vista/lineedit.png b/tests/auto/widgets/styles/qstyle/images/vista/lineedit.png
index b2c6ac1ae4..b2c6ac1ae4 100644
--- a/tests/auto/qstyle/images/vista/lineedit.png
+++ b/tests/auto/widgets/styles/qstyle/images/vista/lineedit.png
diff --git a/tests/auto/qstyle/images/vista/menu.png b/tests/auto/widgets/styles/qstyle/images/vista/menu.png
index b114099cc3..b114099cc3 100644
--- a/tests/auto/qstyle/images/vista/menu.png
+++ b/tests/auto/widgets/styles/qstyle/images/vista/menu.png
diff --git a/tests/auto/qstyle/images/vista/radiobutton.png b/tests/auto/widgets/styles/qstyle/images/vista/radiobutton.png
index c8aa7864df..c8aa7864df 100644
--- a/tests/auto/qstyle/images/vista/radiobutton.png
+++ b/tests/auto/widgets/styles/qstyle/images/vista/radiobutton.png
diff --git a/tests/auto/qstyle/images/vista/slider.png b/tests/auto/widgets/styles/qstyle/images/vista/slider.png
index 7c156ded9d..7c156ded9d 100644
--- a/tests/auto/qstyle/images/vista/slider.png
+++ b/tests/auto/widgets/styles/qstyle/images/vista/slider.png
diff --git a/tests/auto/qstyle/images/vista/spinbox.png b/tests/auto/widgets/styles/qstyle/images/vista/spinbox.png
index b8d0823ab2..b8d0823ab2 100644
--- a/tests/auto/qstyle/images/vista/spinbox.png
+++ b/tests/auto/widgets/styles/qstyle/images/vista/spinbox.png
diff --git a/tests/auto/qstyle/qstyle.pro b/tests/auto/widgets/styles/qstyle/qstyle.pro
index 2016316737..2016316737 100644
--- a/tests/auto/qstyle/qstyle.pro
+++ b/tests/auto/widgets/styles/qstyle/qstyle.pro
diff --git a/tests/auto/qstyle/task_25863.png b/tests/auto/widgets/styles/qstyle/task_25863.png
index a2de8d6f78..a2de8d6f78 100644
--- a/tests/auto/qstyle/task_25863.png
+++ b/tests/auto/widgets/styles/qstyle/task_25863.png
diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
index 0045dbbb52..0045dbbb52 100644
--- a/tests/auto/qstyle/tst_qstyle.cpp
+++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp
diff --git a/tests/auto/qstyleoption/.gitignore b/tests/auto/widgets/styles/qstyleoption/.gitignore
index 70bf7781ce..70bf7781ce 100644
--- a/tests/auto/qstyleoption/.gitignore
+++ b/tests/auto/widgets/styles/qstyleoption/.gitignore
diff --git a/tests/auto/qstyleoption/qstyleoption.pro b/tests/auto/widgets/styles/qstyleoption/qstyleoption.pro
index ccbb39d55b..ccbb39d55b 100644
--- a/tests/auto/qstyleoption/qstyleoption.pro
+++ b/tests/auto/widgets/styles/qstyleoption/qstyleoption.pro
diff --git a/tests/auto/qstyleoption/tst_qstyleoption.cpp b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp
index c1d4bd8166..c1d4bd8166 100644
--- a/tests/auto/qstyleoption/tst_qstyleoption.cpp
+++ b/tests/auto/widgets/styles/qstyleoption/tst_qstyleoption.cpp
diff --git a/tests/auto/qstylesheetstyle/.gitignore b/tests/auto/widgets/styles/qstylesheetstyle/.gitignore
index df0251385e..df0251385e 100644
--- a/tests/auto/qstylesheetstyle/.gitignore
+++ b/tests/auto/widgets/styles/qstylesheetstyle/.gitignore
diff --git a/tests/auto/qstylesheetstyle/images/testimage.png b/tests/auto/widgets/styles/qstylesheetstyle/images/testimage.png
index 06fb34f0d6..06fb34f0d6 100644
--- a/tests/auto/qstylesheetstyle/images/testimage.png
+++ b/tests/auto/widgets/styles/qstylesheetstyle/images/testimage.png
diff --git a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro b/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro
index 9dc296a51c..9dc296a51c 100644
--- a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro
+++ b/tests/auto/widgets/styles/qstylesheetstyle/qstylesheetstyle.pro
diff --git a/tests/auto/qstylesheetstyle/resources.qrc b/tests/auto/widgets/styles/qstylesheetstyle/resources.qrc
index 248bf80f50..248bf80f50 100644
--- a/tests/auto/qstylesheetstyle/resources.qrc
+++ b/tests/auto/widgets/styles/qstylesheetstyle/resources.qrc
diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 98e64eb17d..c5591c48ab 100644
--- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -46,7 +46,7 @@
 #include <QMetaObject>
 
 #include <private/qstylesheetstyle_p.h>
-#include "../platformquirks.h"
+#include "../../../platformquirks.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/widgets/styles/styles.pro b/tests/auto/widgets/styles/styles.pro
new file mode 100644
index 0000000000..7e931582db
--- /dev/null
+++ b/tests/auto/widgets/styles/styles.pro
@@ -0,0 +1,13 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qmacstyle \
+   qstyle \
+   qstyleoption \
+   qstylesheetstyle \
+
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+           qstylesheetstyle \
+
+# This test can only be run on Mac OS:
+!mac:SUBDIRS -= \
+    qmacstyle \
diff --git a/tests/auto/qcompleter/.gitignore b/tests/auto/widgets/util/qcompleter/.gitignore
index 4db1c0d5c2..4db1c0d5c2 100644
--- a/tests/auto/qcompleter/.gitignore
+++ b/tests/auto/widgets/util/qcompleter/.gitignore
diff --git a/tests/auto/qcompleter/qcompleter.pro b/tests/auto/widgets/util/qcompleter/qcompleter.pro
index 4d58e6b813..4d58e6b813 100644
--- a/tests/auto/qcompleter/qcompleter.pro
+++ b/tests/auto/widgets/util/qcompleter/qcompleter.pro
diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
index b0720b8776..ccf3c449b3 100644
--- a/tests/auto/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp
@@ -47,7 +47,7 @@
 #include <QList>
 #include <QPointer>
 
-#include "../../shared/filesystem.h"
+#include "../../../../shared/filesystem.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qscroller/qscroller.pro b/tests/auto/widgets/util/qscroller/qscroller.pro
index de202d66aa..de202d66aa 100644
--- a/tests/auto/qscroller/qscroller.pro
+++ b/tests/auto/widgets/util/qscroller/qscroller.pro
diff --git a/tests/auto/qscroller/tst_qscroller.cpp b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
index 9ed4965d45..9ed4965d45 100644
--- a/tests/auto/qscroller/tst_qscroller.cpp
+++ b/tests/auto/widgets/util/qscroller/tst_qscroller.cpp
diff --git a/tests/auto/qsystemtrayicon/.gitignore b/tests/auto/widgets/util/qsystemtrayicon/.gitignore
index 6da1f79209..6da1f79209 100644
--- a/tests/auto/qsystemtrayicon/.gitignore
+++ b/tests/auto/widgets/util/qsystemtrayicon/.gitignore
diff --git a/tests/auto/qsystemtrayicon/icons/icon.png b/tests/auto/widgets/util/qsystemtrayicon/icons/icon.png
index 7528931ed8..7528931ed8 100644
--- a/tests/auto/qsystemtrayicon/icons/icon.png
+++ b/tests/auto/widgets/util/qsystemtrayicon/icons/icon.png
diff --git a/tests/auto/qsystemtrayicon/qsystemtrayicon.pro b/tests/auto/widgets/util/qsystemtrayicon/qsystemtrayicon.pro
index 8a6ea3d0a9..8a6ea3d0a9 100644
--- a/tests/auto/qsystemtrayicon/qsystemtrayicon.pro
+++ b/tests/auto/widgets/util/qsystemtrayicon/qsystemtrayicon.pro
diff --git a/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
index a4a5ed7ad9..a4a5ed7ad9 100644
--- a/tests/auto/qsystemtrayicon/tst_qsystemtrayicon.cpp
+++ b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
diff --git a/tests/auto/qundogroup/.gitignore b/tests/auto/widgets/util/qundogroup/.gitignore
index bc3e8c4691..bc3e8c4691 100644
--- a/tests/auto/qundogroup/.gitignore
+++ b/tests/auto/widgets/util/qundogroup/.gitignore
diff --git a/tests/auto/qundogroup/qundogroup.pro b/tests/auto/widgets/util/qundogroup/qundogroup.pro
index c2b6ceb038..c2b6ceb038 100644
--- a/tests/auto/qundogroup/qundogroup.pro
+++ b/tests/auto/widgets/util/qundogroup/qundogroup.pro
diff --git a/tests/auto/qundogroup/testdata/qundogroup.ts b/tests/auto/widgets/util/qundogroup/testdata/qundogroup.ts
index a059bcb486..a059bcb486 100644
--- a/tests/auto/qundogroup/testdata/qundogroup.ts
+++ b/tests/auto/widgets/util/qundogroup/testdata/qundogroup.ts
diff --git a/tests/auto/qundogroup/tst_qundogroup.cpp b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
index 6d51252e22..6d51252e22 100644
--- a/tests/auto/qundogroup/tst_qundogroup.cpp
+++ b/tests/auto/widgets/util/qundogroup/tst_qundogroup.cpp
diff --git a/tests/auto/qundostack/.gitignore b/tests/auto/widgets/util/qundostack/.gitignore
index f8faf2771f..f8faf2771f 100644
--- a/tests/auto/qundostack/.gitignore
+++ b/tests/auto/widgets/util/qundostack/.gitignore
diff --git a/tests/auto/qundostack/qundostack.pro b/tests/auto/widgets/util/qundostack/qundostack.pro
index c8cfb70059..c8cfb70059 100644
--- a/tests/auto/qundostack/qundostack.pro
+++ b/tests/auto/widgets/util/qundostack/qundostack.pro
diff --git a/tests/auto/qundostack/testdata/qundostack.ts b/tests/auto/widgets/util/qundostack/testdata/qundostack.ts
index 4584036af2..4584036af2 100644
--- a/tests/auto/qundostack/testdata/qundostack.ts
+++ b/tests/auto/widgets/util/qundostack/testdata/qundostack.ts
diff --git a/tests/auto/qundostack/tst_qundostack.cpp b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
index 834c2d5d50..834c2d5d50 100644
--- a/tests/auto/qundostack/tst_qundostack.cpp
+++ b/tests/auto/widgets/util/qundostack/tst_qundostack.cpp
diff --git a/tests/auto/widgets/util/util.pro b/tests/auto/widgets/util/util.pro
new file mode 100644
index 0000000000..b7fe35ce4c
--- /dev/null
+++ b/tests/auto/widgets/util/util.pro
@@ -0,0 +1,11 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qcompleter \
+   qscroller \
+   qsystemtrayicon \
+   qundogroup \
+   qundostack \
+
+symbian:SUBDIRS -= \
+    qsystemtrayicon \
+
diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro
new file mode 100644
index 0000000000..8b6c4722be
--- /dev/null
+++ b/tests/auto/widgets/widgets.pro
@@ -0,0 +1,10 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+    dialogs \
+    effects \
+    graphicsview \
+    itemviews \
+    kernel \
+    styles \
+    util \
+    widgets \
diff --git a/tests/auto/qabstractbutton/.gitignore b/tests/auto/widgets/widgets/qabstractbutton/.gitignore
index 82f669574c..82f669574c 100644
--- a/tests/auto/qabstractbutton/.gitignore
+++ b/tests/auto/widgets/widgets/qabstractbutton/.gitignore
diff --git a/tests/auto/qabstractbutton/qabstractbutton.pro b/tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro
index 15d90ed4e1..15d90ed4e1 100644
--- a/tests/auto/qabstractbutton/qabstractbutton.pro
+++ b/tests/auto/widgets/widgets/qabstractbutton/qabstractbutton.pro
diff --git a/tests/auto/qabstractbutton/tst_qabstractbutton.cpp b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
index f5f60c8fd3..f5f60c8fd3 100644
--- a/tests/auto/qabstractbutton/tst_qabstractbutton.cpp
+++ b/tests/auto/widgets/widgets/qabstractbutton/tst_qabstractbutton.cpp
diff --git a/tests/auto/qabstractscrollarea/.gitignore b/tests/auto/widgets/widgets/qabstractscrollarea/.gitignore
index ab753b8a0a..ab753b8a0a 100644
--- a/tests/auto/qabstractscrollarea/.gitignore
+++ b/tests/auto/widgets/widgets/qabstractscrollarea/.gitignore
diff --git a/tests/auto/qabstractscrollarea/qabstractscrollarea.pro b/tests/auto/widgets/widgets/qabstractscrollarea/qabstractscrollarea.pro
index e4bc3f6495..e4bc3f6495 100644
--- a/tests/auto/qabstractscrollarea/qabstractscrollarea.pro
+++ b/tests/auto/widgets/widgets/qabstractscrollarea/qabstractscrollarea.pro
diff --git a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp
index 5c9a33cdc6..5c9a33cdc6 100644
--- a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
+++ b/tests/auto/widgets/widgets/qabstractscrollarea/tst_qabstractscrollarea.cpp
diff --git a/tests/auto/qabstractslider/.gitignore b/tests/auto/widgets/widgets/qabstractslider/.gitignore
index cdbb891214..cdbb891214 100644
--- a/tests/auto/qabstractslider/.gitignore
+++ b/tests/auto/widgets/widgets/qabstractslider/.gitignore
diff --git a/tests/auto/qabstractslider/qabstractslider.pro b/tests/auto/widgets/widgets/qabstractslider/qabstractslider.pro
index 4507859ace..4507859ace 100644
--- a/tests/auto/qabstractslider/qabstractslider.pro
+++ b/tests/auto/widgets/widgets/qabstractslider/qabstractslider.pro
diff --git a/tests/auto/qabstractslider/tst_qabstractslider.cpp b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
index e78844524e..e78844524e 100644
--- a/tests/auto/qabstractslider/tst_qabstractslider.cpp
+++ b/tests/auto/widgets/widgets/qabstractslider/tst_qabstractslider.cpp
diff --git a/tests/auto/qabstractspinbox/.gitignore b/tests/auto/widgets/widgets/qabstractspinbox/.gitignore
index 07d1d652ee..07d1d652ee 100644
--- a/tests/auto/qabstractspinbox/.gitignore
+++ b/tests/auto/widgets/widgets/qabstractspinbox/.gitignore
diff --git a/tests/auto/qabstractspinbox/qabstractspinbox.pro b/tests/auto/widgets/widgets/qabstractspinbox/qabstractspinbox.pro
index e156b2493d..e156b2493d 100644
--- a/tests/auto/qabstractspinbox/qabstractspinbox.pro
+++ b/tests/auto/widgets/widgets/qabstractspinbox/qabstractspinbox.pro
diff --git a/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp b/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
index d14c75bbac..d14c75bbac 100644
--- a/tests/auto/qabstractspinbox/tst_qabstractspinbox.cpp
+++ b/tests/auto/widgets/widgets/qabstractspinbox/tst_qabstractspinbox.cpp
diff --git a/tests/auto/qbuttongroup/.gitignore b/tests/auto/widgets/widgets/qbuttongroup/.gitignore
index 898b2276b0..898b2276b0 100644
--- a/tests/auto/qbuttongroup/.gitignore
+++ b/tests/auto/widgets/widgets/qbuttongroup/.gitignore
diff --git a/tests/auto/qbuttongroup/qbuttongroup.pro b/tests/auto/widgets/widgets/qbuttongroup/qbuttongroup.pro
index 6f506e8f06..6f506e8f06 100644
--- a/tests/auto/qbuttongroup/qbuttongroup.pro
+++ b/tests/auto/widgets/widgets/qbuttongroup/qbuttongroup.pro
diff --git a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
index f9f6ec0a54..f9f6ec0a54 100644
--- a/tests/auto/qbuttongroup/tst_qbuttongroup.cpp
+++ b/tests/auto/widgets/widgets/qbuttongroup/tst_qbuttongroup.cpp
diff --git a/tests/auto/qcalendarwidget/.gitignore b/tests/auto/widgets/widgets/qcalendarwidget/.gitignore
index db8a381e0d..db8a381e0d 100644
--- a/tests/auto/qcalendarwidget/.gitignore
+++ b/tests/auto/widgets/widgets/qcalendarwidget/.gitignore
diff --git a/tests/auto/qcalendarwidget/qcalendarwidget.pro b/tests/auto/widgets/widgets/qcalendarwidget/qcalendarwidget.pro
index d250b83537..d250b83537 100644
--- a/tests/auto/qcalendarwidget/qcalendarwidget.pro
+++ b/tests/auto/widgets/widgets/qcalendarwidget/qcalendarwidget.pro
diff --git a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
index 50dc6a1d1c..50dc6a1d1c 100644
--- a/tests/auto/qcalendarwidget/tst_qcalendarwidget.cpp
+++ b/tests/auto/widgets/widgets/qcalendarwidget/tst_qcalendarwidget.cpp
diff --git a/tests/auto/qcheckbox/.gitignore b/tests/auto/widgets/widgets/qcheckbox/.gitignore
index b838802077..b838802077 100644
--- a/tests/auto/qcheckbox/.gitignore
+++ b/tests/auto/widgets/widgets/qcheckbox/.gitignore
diff --git a/tests/auto/qcheckbox/qcheckbox.pro b/tests/auto/widgets/widgets/qcheckbox/qcheckbox.pro
index aa1f35b3c9..aa1f35b3c9 100644
--- a/tests/auto/qcheckbox/qcheckbox.pro
+++ b/tests/auto/widgets/widgets/qcheckbox/qcheckbox.pro
diff --git a/tests/auto/qcheckbox/tst_qcheckbox.cpp b/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp
index 33f5af4d0b..33f5af4d0b 100644
--- a/tests/auto/qcheckbox/tst_qcheckbox.cpp
+++ b/tests/auto/widgets/widgets/qcheckbox/tst_qcheckbox.cpp
diff --git a/tests/auto/qcombobox/.gitignore b/tests/auto/widgets/widgets/qcombobox/.gitignore
index 0db112206b..0db112206b 100644
--- a/tests/auto/qcombobox/.gitignore
+++ b/tests/auto/widgets/widgets/qcombobox/.gitignore
diff --git a/tests/auto/qcombobox/qcombobox.pro b/tests/auto/widgets/widgets/qcombobox/qcombobox.pro
index 7f5b57c237..7f5b57c237 100644
--- a/tests/auto/qcombobox/qcombobox.pro
+++ b/tests/auto/widgets/widgets/qcombobox/qcombobox.pro
diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
index cb4468f6f4..cb4468f6f4 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
diff --git a/tests/auto/qcommandlinkbutton/.gitignore b/tests/auto/widgets/widgets/qcommandlinkbutton/.gitignore
index 878121e2e6..878121e2e6 100644
--- a/tests/auto/qcommandlinkbutton/.gitignore
+++ b/tests/auto/widgets/widgets/qcommandlinkbutton/.gitignore
diff --git a/tests/auto/qcommandlinkbutton/qcommandlinkbutton.pro b/tests/auto/widgets/widgets/qcommandlinkbutton/qcommandlinkbutton.pro
index 497b8298a2..497b8298a2 100644
--- a/tests/auto/qcommandlinkbutton/qcommandlinkbutton.pro
+++ b/tests/auto/widgets/widgets/qcommandlinkbutton/qcommandlinkbutton.pro
diff --git a/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
index 6a51bf4bba..6a51bf4bba 100644
--- a/tests/auto/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
+++ b/tests/auto/widgets/widgets/qcommandlinkbutton/tst_qcommandlinkbutton.cpp
diff --git a/tests/auto/qdatetimeedit/.gitignore b/tests/auto/widgets/widgets/qdatetimeedit/.gitignore
index a68e3269d2..a68e3269d2 100644
--- a/tests/auto/qdatetimeedit/.gitignore
+++ b/tests/auto/widgets/widgets/qdatetimeedit/.gitignore
diff --git a/tests/auto/qdatetimeedit/qdatetimeedit.pro b/tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro
index 47356d448c..47356d448c 100644
--- a/tests/auto/qdatetimeedit/qdatetimeedit.pro
+++ b/tests/auto/widgets/widgets/qdatetimeedit/qdatetimeedit.pro
diff --git a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
index c64c9e7019..c64c9e7019 100644
--- a/tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp
+++ b/tests/auto/widgets/widgets/qdatetimeedit/tst_qdatetimeedit.cpp
diff --git a/tests/auto/qdial/.gitignore b/tests/auto/widgets/widgets/qdial/.gitignore
index 3a640cf1a1..3a640cf1a1 100644
--- a/tests/auto/qdial/.gitignore
+++ b/tests/auto/widgets/widgets/qdial/.gitignore
diff --git a/tests/auto/qdial/qdial.pro b/tests/auto/widgets/widgets/qdial/qdial.pro
index acf66de430..acf66de430 100644
--- a/tests/auto/qdial/qdial.pro
+++ b/tests/auto/widgets/widgets/qdial/qdial.pro
diff --git a/tests/auto/qdial/tst_qdial.cpp b/tests/auto/widgets/widgets/qdial/tst_qdial.cpp
index 568b82d28b..568b82d28b 100644
--- a/tests/auto/qdial/tst_qdial.cpp
+++ b/tests/auto/widgets/widgets/qdial/tst_qdial.cpp
diff --git a/tests/auto/qdialogbuttonbox/.gitignore b/tests/auto/widgets/widgets/qdialogbuttonbox/.gitignore
index edf08554d4..edf08554d4 100644
--- a/tests/auto/qdialogbuttonbox/.gitignore
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/.gitignore
diff --git a/tests/auto/qdialogbuttonbox/qdialogbuttonbox.pro b/tests/auto/widgets/widgets/qdialogbuttonbox/qdialogbuttonbox.pro
index efbeca0c1b..efbeca0c1b 100644
--- a/tests/auto/qdialogbuttonbox/qdialogbuttonbox.pro
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/qdialogbuttonbox.pro
diff --git a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index 449cc5e44d..449cc5e44d 100644
--- a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/widgets/widgets/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
diff --git a/tests/auto/qdockwidget/.gitignore b/tests/auto/widgets/widgets/qdockwidget/.gitignore
index 7c79145a67..7c79145a67 100644
--- a/tests/auto/qdockwidget/.gitignore
+++ b/tests/auto/widgets/widgets/qdockwidget/.gitignore
diff --git a/tests/auto/qdockwidget/qdockwidget.pro b/tests/auto/widgets/widgets/qdockwidget/qdockwidget.pro
index e59728207f..e59728207f 100644
--- a/tests/auto/qdockwidget/qdockwidget.pro
+++ b/tests/auto/widgets/widgets/qdockwidget/qdockwidget.pro
diff --git a/tests/auto/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
index 2c1f7c0954..2c1f7c0954 100644
--- a/tests/auto/qdockwidget/tst_qdockwidget.cpp
+++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp
diff --git a/tests/auto/qdoublespinbox/.gitignore b/tests/auto/widgets/widgets/qdoublespinbox/.gitignore
index 7704132e98..7704132e98 100644
--- a/tests/auto/qdoublespinbox/.gitignore
+++ b/tests/auto/widgets/widgets/qdoublespinbox/.gitignore
diff --git a/tests/auto/qdoublespinbox/qdoublespinbox.pro b/tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro
index ff0eb2edae..ff0eb2edae 100644
--- a/tests/auto/qdoublespinbox/qdoublespinbox.pro
+++ b/tests/auto/widgets/widgets/qdoublespinbox/qdoublespinbox.pro
diff --git a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
index 15f38e3334..15f38e3334 100644
--- a/tests/auto/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
diff --git a/tests/auto/qdoublevalidator/.gitignore b/tests/auto/widgets/widgets/qdoublevalidator/.gitignore
index 95c97bbc30..95c97bbc30 100644
--- a/tests/auto/qdoublevalidator/.gitignore
+++ b/tests/auto/widgets/widgets/qdoublevalidator/.gitignore
diff --git a/tests/auto/qdoublevalidator/qdoublevalidator.pro b/tests/auto/widgets/widgets/qdoublevalidator/qdoublevalidator.pro
index 7fbb72bb7f..7fbb72bb7f 100644
--- a/tests/auto/qdoublevalidator/qdoublevalidator.pro
+++ b/tests/auto/widgets/widgets/qdoublevalidator/qdoublevalidator.pro
diff --git a/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp b/tests/auto/widgets/widgets/qdoublevalidator/tst_qdoublevalidator.cpp
index 6014ce5165..6014ce5165 100644
--- a/tests/auto/qdoublevalidator/tst_qdoublevalidator.cpp
+++ b/tests/auto/widgets/widgets/qdoublevalidator/tst_qdoublevalidator.cpp
diff --git a/tests/auto/qfocusframe/.gitignore b/tests/auto/widgets/widgets/qfocusframe/.gitignore
index 7a6e000227..7a6e000227 100644
--- a/tests/auto/qfocusframe/.gitignore
+++ b/tests/auto/widgets/widgets/qfocusframe/.gitignore
diff --git a/tests/auto/qfocusframe/qfocusframe.pro b/tests/auto/widgets/widgets/qfocusframe/qfocusframe.pro
index 0fcc9bf23d..0fcc9bf23d 100644
--- a/tests/auto/qfocusframe/qfocusframe.pro
+++ b/tests/auto/widgets/widgets/qfocusframe/qfocusframe.pro
diff --git a/tests/auto/qfocusframe/tst_qfocusframe.cpp b/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp
index 1658cf3fe5..1658cf3fe5 100644
--- a/tests/auto/qfocusframe/tst_qfocusframe.cpp
+++ b/tests/auto/widgets/widgets/qfocusframe/tst_qfocusframe.cpp
diff --git a/tests/auto/qfontcombobox/.gitignore b/tests/auto/widgets/widgets/qfontcombobox/.gitignore
index acc19de07e..acc19de07e 100644
--- a/tests/auto/qfontcombobox/.gitignore
+++ b/tests/auto/widgets/widgets/qfontcombobox/.gitignore
diff --git a/tests/auto/qfontcombobox/qfontcombobox.pro b/tests/auto/widgets/widgets/qfontcombobox/qfontcombobox.pro
index 7faa0e36bd..7faa0e36bd 100644
--- a/tests/auto/qfontcombobox/qfontcombobox.pro
+++ b/tests/auto/widgets/widgets/qfontcombobox/qfontcombobox.pro
diff --git a/tests/auto/qfontcombobox/tst_qfontcombobox.cpp b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
index 72b3dfe8ca..72b3dfe8ca 100644
--- a/tests/auto/qfontcombobox/tst_qfontcombobox.cpp
+++ b/tests/auto/widgets/widgets/qfontcombobox/tst_qfontcombobox.cpp
diff --git a/tests/auto/qgroupbox/.gitignore b/tests/auto/widgets/widgets/qgroupbox/.gitignore
index 16dc39494e..16dc39494e 100644
--- a/tests/auto/qgroupbox/.gitignore
+++ b/tests/auto/widgets/widgets/qgroupbox/.gitignore
diff --git a/tests/auto/qgroupbox/qgroupbox.pro b/tests/auto/widgets/widgets/qgroupbox/qgroupbox.pro
index f4181a33ed..f4181a33ed 100644
--- a/tests/auto/qgroupbox/qgroupbox.pro
+++ b/tests/auto/widgets/widgets/qgroupbox/qgroupbox.pro
diff --git a/tests/auto/qgroupbox/tst_qgroupbox.cpp b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
index 8568ef01d1..8568ef01d1 100644
--- a/tests/auto/qgroupbox/tst_qgroupbox.cpp
+++ b/tests/auto/widgets/widgets/qgroupbox/tst_qgroupbox.cpp
diff --git a/tests/auto/qintvalidator/.gitignore b/tests/auto/widgets/widgets/qintvalidator/.gitignore
index c6d5c989f0..c6d5c989f0 100644
--- a/tests/auto/qintvalidator/.gitignore
+++ b/tests/auto/widgets/widgets/qintvalidator/.gitignore
diff --git a/tests/auto/qintvalidator/qintvalidator.pro b/tests/auto/widgets/widgets/qintvalidator/qintvalidator.pro
index 576621a08b..576621a08b 100644
--- a/tests/auto/qintvalidator/qintvalidator.pro
+++ b/tests/auto/widgets/widgets/qintvalidator/qintvalidator.pro
diff --git a/tests/auto/qintvalidator/tst_qintvalidator.cpp b/tests/auto/widgets/widgets/qintvalidator/tst_qintvalidator.cpp
index 369e3254e8..369e3254e8 100644
--- a/tests/auto/qintvalidator/tst_qintvalidator.cpp
+++ b/tests/auto/widgets/widgets/qintvalidator/tst_qintvalidator.cpp
diff --git a/tests/auto/qlabel/.gitignore b/tests/auto/widgets/widgets/qlabel/.gitignore
index e050d7ab5e..e050d7ab5e 100644
--- a/tests/auto/qlabel/.gitignore
+++ b/tests/auto/widgets/widgets/qlabel/.gitignore
diff --git a/tests/auto/qlabel/green.png b/tests/auto/widgets/widgets/qlabel/green.png
index dfc95d4f37..dfc95d4f37 100644
--- a/tests/auto/qlabel/green.png
+++ b/tests/auto/widgets/widgets/qlabel/green.png
diff --git a/tests/auto/qlabel/qlabel.pro b/tests/auto/widgets/widgets/qlabel/qlabel.pro
index 0e0c3a43c4..0e0c3a43c4 100644
--- a/tests/auto/qlabel/qlabel.pro
+++ b/tests/auto/widgets/widgets/qlabel/qlabel.pro
diff --git a/tests/auto/qlabel/red.png b/tests/auto/widgets/widgets/qlabel/red.png
index 4a843e744f..4a843e744f 100644
--- a/tests/auto/qlabel/red.png
+++ b/tests/auto/widgets/widgets/qlabel/red.png
diff --git a/tests/auto/qlabel/testdata/acc_01/res_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/acc_01/res_Windows_data0.qsnap
index 522c173ac4..522c173ac4 100644
--- a/tests/auto/qlabel/testdata/acc_01/res_Windows_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/acc_01/res_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/acc_01/res_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/acc_01/res_Windows_win32_data0.qsnap
index acd881d29a..acd881d29a 100644
--- a/tests/auto/qlabel/testdata/acc_01/res_Windows_win32_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/acc_01/res_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data0.qsnap
index 9e2c1764d3..9e2c1764d3 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data1.qsnap
index dcd708fdbf..dcd708fdbf 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data1.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data10.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data10.qsnap
index 2131f59fe9..2131f59fe9 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data10.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data10.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data2.qsnap
index 2edd976830..2edd976830 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data2.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data3.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data3.qsnap
index 2ce28d9816..2ce28d9816 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data3.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data3.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data4.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data4.qsnap
index 6476f6c26b..6476f6c26b 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data4.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data4.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data5.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data5.qsnap
index 6039742962..6039742962 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data5.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data5.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data6.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data6.qsnap
index 477d203960..477d203960 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data6.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data6.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data7.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data7.qsnap
index c673f4099e..c673f4099e 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data7.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data7.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data8.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data8.qsnap
index a490f77118..a490f77118 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data8.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data8.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data9.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data9.qsnap
index 33342d3616..33342d3616 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Motif_data9.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Motif_data9.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data0.qsnap
index 3fe9a82c2f..3fe9a82c2f 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data1.qsnap
index 175235dc38..175235dc38 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data1.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data10.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data10.qsnap
index b1ac74b531..b1ac74b531 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data10.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data10.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data2.qsnap
index fdd3c7c701..fdd3c7c701 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data2.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data3.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data3.qsnap
index caa47f7292..caa47f7292 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data3.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data3.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data4.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data4.qsnap
index a0d2498e76..a0d2498e76 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data4.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data4.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data5.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data5.qsnap
index 756d9fe827..756d9fe827 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data5.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data5.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data6.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data6.qsnap
index f973d14c38..f973d14c38 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data6.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data6.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data7.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data7.qsnap
index 720d807db2..720d807db2 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data7.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data7.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data8.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data8.qsnap
index 20fd48e7cc..20fd48e7cc 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data8.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data8.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data9.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data9.qsnap
index 7db7c97a14..7db7c97a14 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_data9.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_data9.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data0.qsnap
index d9912d8c92..d9912d8c92 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data1.qsnap
index bfc3a6488e..bfc3a6488e 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data1.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data10.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data10.qsnap
index 09a35ef761..09a35ef761 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data10.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data10.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data2.qsnap
index 14e11232f0..14e11232f0 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data2.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data3.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data3.qsnap
index 6ef864e635..6ef864e635 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data3.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data3.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data4.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data4.qsnap
index eb029008e3..eb029008e3 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data4.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data4.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data5.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data5.qsnap
index 439e196b57..439e196b57 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data5.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data5.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data6.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data6.qsnap
index 9637d1741a..9637d1741a 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data6.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data6.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data7.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data7.qsnap
index 9a553465c3..9a553465c3 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data7.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data7.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data8.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data8.qsnap
index 0d9184c316..0d9184c316 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data8.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data8.qsnap
diff --git a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data9.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data9.qsnap
index f2873b1c78..f2873b1c78 100644
--- a/tests/auto/qlabel/testdata/setAlignment/alignRes_Windows_win32_data9.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setAlignment/alignRes_Windows_win32_data9.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Motif_data0.qsnap
index 1385a50d38..1385a50d38 100644
--- a/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Motif_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Motif_data1.qsnap
index 38223cfba2..38223cfba2 100644
--- a/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data1.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Motif_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Motif_data2.qsnap
index 0b946a4968..0b946a4968 100644
--- a/tests/auto/qlabel/testdata/setIndent/indentRes_Motif_data2.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Motif_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_data0.qsnap
index e1d2c41d88..e1d2c41d88 100644
--- a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_data1.qsnap
index b7bdee551b..b7bdee551b 100644
--- a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data1.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_data2.qsnap
index a20492ee70..a20492ee70 100644
--- a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_data2.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_win32_data0.qsnap
index 85e3306d0c..85e3306d0c 100644
--- a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_win32_data1.qsnap
index 3bf991f674..3bf991f674 100644
--- a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data1.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_win32_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_win32_data2.qsnap
index f05a9dcebd..f05a9dcebd 100644
--- a/tests/auto/qlabel/testdata/setIndent/indentRes_Windows_win32_data2.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setIndent/indentRes_Windows_win32_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/Vpix_Motif_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/Vpix_Motif_data0.qsnap
index d7428df5ef..d7428df5ef 100644
--- a/tests/auto/qlabel/testdata/setPixmap/Vpix_Motif_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/Vpix_Motif_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/Vpix_Windows_data0.qsnap
index 905acd1283..905acd1283 100644
--- a/tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/Vpix_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap
index e1dea4b76b..e1dea4b76b 100644
--- a/tests/auto/qlabel/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/empty_Motif_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/empty_Motif_data0.qsnap
index 055ccda47e..055ccda47e 100644
--- a/tests/auto/qlabel/testdata/setPixmap/empty_Motif_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/empty_Motif_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/empty_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/empty_Windows_data0.qsnap
index 64b70763d4..64b70763d4 100644
--- a/tests/auto/qlabel/testdata/setPixmap/empty_Windows_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/empty_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/empty_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/empty_Windows_win32_data0.qsnap
index fb0ea227ad..fb0ea227ad 100644
--- a/tests/auto/qlabel/testdata/setPixmap/empty_Windows_win32_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/empty_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Motif_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/scaledVpix_Motif_data0.qsnap
index ae9cda541f..ae9cda541f 100644
--- a/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Motif_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/scaledVpix_Motif_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/scaledVpix_Windows_data0.qsnap
index e21af3223a..e21af3223a 100644
--- a/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/scaledVpix_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/scaledVpix_Windows_win32_data0.qsnap
index 32cc40652b..32cc40652b 100644
--- a/tests/auto/qlabel/testdata/setPixmap/scaledVpix_Windows_win32_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setPixmap/scaledVpix_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Motif_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data0.qsnap
index 7191b517d2..7191b517d2 100644
--- a/tests/auto/qlabel/testdata/setText/res_Motif_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Motif_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data1.qsnap
index d943ce960a..d943ce960a 100644
--- a/tests/auto/qlabel/testdata/setText/res_Motif_data1.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Motif_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data2.qsnap
index 946432e66d..946432e66d 100644
--- a/tests/auto/qlabel/testdata/setText/res_Motif_data2.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Motif_data3.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data3.qsnap
index dc5ac0c56d..dc5ac0c56d 100644
--- a/tests/auto/qlabel/testdata/setText/res_Motif_data3.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Motif_data3.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data0.qsnap
index 2ab392e50e..2ab392e50e 100644
--- a/tests/auto/qlabel/testdata/setText/res_Windows_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data1.qsnap
index 5769459ab6..5769459ab6 100644
--- a/tests/auto/qlabel/testdata/setText/res_Windows_data1.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data2.qsnap
index b4206c2a57..b4206c2a57 100644
--- a/tests/auto/qlabel/testdata/setText/res_Windows_data2.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_data3.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data3.qsnap
index f120ac2e76..f120ac2e76 100644
--- a/tests/auto/qlabel/testdata/setText/res_Windows_data3.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_data3.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data0.qsnap
index 7644f53726..7644f53726 100644
--- a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data0.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data0.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data1.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data1.qsnap
index 7902b1b087..7902b1b087 100644
--- a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data1.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data1.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data2.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data2.qsnap
index 60bd075c78..60bd075c78 100644
--- a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data2.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data2.qsnap
diff --git a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data3.qsnap b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data3.qsnap
index c1dcb272b3..c1dcb272b3 100644
--- a/tests/auto/qlabel/testdata/setText/res_Windows_win32_data3.qsnap
+++ b/tests/auto/widgets/widgets/qlabel/testdata/setText/res_Windows_win32_data3.qsnap
diff --git a/tests/auto/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
index 9cab8b328d..9cab8b328d 100644
--- a/tests/auto/qlabel/tst_qlabel.cpp
+++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp
diff --git a/tests/auto/qlcdnumber/.gitignore b/tests/auto/widgets/widgets/qlcdnumber/.gitignore
index cbf08a078d..cbf08a078d 100644
--- a/tests/auto/qlcdnumber/.gitignore
+++ b/tests/auto/widgets/widgets/qlcdnumber/.gitignore
diff --git a/tests/auto/qlcdnumber/qlcdnumber.pro b/tests/auto/widgets/widgets/qlcdnumber/qlcdnumber.pro
index cd909de5be..cd909de5be 100644
--- a/tests/auto/qlcdnumber/qlcdnumber.pro
+++ b/tests/auto/widgets/widgets/qlcdnumber/qlcdnumber.pro
diff --git a/tests/auto/qlcdnumber/tst_qlcdnumber.cpp b/tests/auto/widgets/widgets/qlcdnumber/tst_qlcdnumber.cpp
index 0976f3f619..0976f3f619 100644
--- a/tests/auto/qlcdnumber/tst_qlcdnumber.cpp
+++ b/tests/auto/widgets/widgets/qlcdnumber/tst_qlcdnumber.cpp
diff --git a/tests/auto/qlineedit/.gitignore b/tests/auto/widgets/widgets/qlineedit/.gitignore
index 7fcade47c9..7fcade47c9 100644
--- a/tests/auto/qlineedit/.gitignore
+++ b/tests/auto/widgets/widgets/qlineedit/.gitignore
diff --git a/tests/auto/qlineedit/qlineedit.pro b/tests/auto/widgets/widgets/qlineedit/qlineedit.pro
index 077b7c919e..077b7c919e 100644
--- a/tests/auto/qlineedit/qlineedit.pro
+++ b/tests/auto/widgets/widgets/qlineedit/qlineedit.pro
diff --git a/tests/auto/qlineedit/testdata/frame/noFrame_Motif-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/frame/noFrame_Motif-32x96x96_win.png
index 81a3e3de4d..81a3e3de4d 100644
--- a/tests/auto/qlineedit/testdata/frame/noFrame_Motif-32x96x96_win.png
+++ b/tests/auto/widgets/widgets/qlineedit/testdata/frame/noFrame_Motif-32x96x96_win.png
diff --git a/tests/auto/qlineedit/testdata/frame/noFrame_Windows-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/frame/noFrame_Windows-32x96x96_win.png
index 81a3e3de4d..81a3e3de4d 100644
--- a/tests/auto/qlineedit/testdata/frame/noFrame_Windows-32x96x96_win.png
+++ b/tests/auto/widgets/widgets/qlineedit/testdata/frame/noFrame_Windows-32x96x96_win.png
diff --git a/tests/auto/qlineedit/testdata/frame/useFrame_Motif-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/frame/useFrame_Motif-32x96x96_win.png
index ed3810c2e7..ed3810c2e7 100644
--- a/tests/auto/qlineedit/testdata/frame/useFrame_Motif-32x96x96_win.png
+++ b/tests/auto/widgets/widgets/qlineedit/testdata/frame/useFrame_Motif-32x96x96_win.png
diff --git a/tests/auto/qlineedit/testdata/frame/useFrame_Windows-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/frame/useFrame_Windows-32x96x96_win.png
index fe4456ffbf..fe4456ffbf 100644
--- a/tests/auto/qlineedit/testdata/frame/useFrame_Windows-32x96x96_win.png
+++ b/tests/auto/widgets/widgets/qlineedit/testdata/frame/useFrame_Windows-32x96x96_win.png
diff --git a/tests/auto/qlineedit/testdata/setAlignment/auto_Motif-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/auto_Motif-32x96x96_win.png
index 7ab7ffd4da..7ab7ffd4da 100644
--- a/tests/auto/qlineedit/testdata/setAlignment/auto_Motif-32x96x96_win.png
+++ b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/auto_Motif-32x96x96_win.png
diff --git a/tests/auto/qlineedit/testdata/setAlignment/auto_Windows-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/auto_Windows-32x96x96_win.png
index 5918bb93f1..5918bb93f1 100644
--- a/tests/auto/qlineedit/testdata/setAlignment/auto_Windows-32x96x96_win.png
+++ b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/auto_Windows-32x96x96_win.png
diff --git a/tests/auto/qlineedit/testdata/setAlignment/hcenter_Motif-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/hcenter_Motif-32x96x96_win.png
index 66119386a3..66119386a3 100644
--- a/tests/auto/qlineedit/testdata/setAlignment/hcenter_Motif-32x96x96_win.png
+++ b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/hcenter_Motif-32x96x96_win.png
diff --git a/tests/auto/qlineedit/testdata/setAlignment/hcenter_Windows-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/hcenter_Windows-32x96x96_win.png
index 89e81db837..89e81db837 100644
--- a/tests/auto/qlineedit/testdata/setAlignment/hcenter_Windows-32x96x96_win.png
+++ b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/hcenter_Windows-32x96x96_win.png
diff --git a/tests/auto/qlineedit/testdata/setAlignment/left_Motif-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/left_Motif-32x96x96_win.png
index 2cf5c7a9cf..2cf5c7a9cf 100644
--- a/tests/auto/qlineedit/testdata/setAlignment/left_Motif-32x96x96_win.png
+++ b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/left_Motif-32x96x96_win.png
diff --git a/tests/auto/qlineedit/testdata/setAlignment/left_Windows-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/left_Windows-32x96x96_win.png
index 70ec6530b8..70ec6530b8 100644
--- a/tests/auto/qlineedit/testdata/setAlignment/left_Windows-32x96x96_win.png
+++ b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/left_Windows-32x96x96_win.png
diff --git a/tests/auto/qlineedit/testdata/setAlignment/right_Motif-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/right_Motif-32x96x96_win.png
index d6708bcd12..d6708bcd12 100644
--- a/tests/auto/qlineedit/testdata/setAlignment/right_Motif-32x96x96_win.png
+++ b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/right_Motif-32x96x96_win.png
diff --git a/tests/auto/qlineedit/testdata/setAlignment/right_Windows-32x96x96_win.png b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/right_Windows-32x96x96_win.png
index 9000dfc4cf..9000dfc4cf 100644
--- a/tests/auto/qlineedit/testdata/setAlignment/right_Windows-32x96x96_win.png
+++ b/tests/auto/widgets/widgets/qlineedit/testdata/setAlignment/right_Windows-32x96x96_win.png
diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 6e4726e5b5..6e4726e5b5 100644
--- a/tests/auto/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
diff --git a/tests/auto/qmainwindow/.gitignore b/tests/auto/widgets/widgets/qmainwindow/.gitignore
index 7550c7063f..7550c7063f 100644
--- a/tests/auto/qmainwindow/.gitignore
+++ b/tests/auto/widgets/widgets/qmainwindow/.gitignore
diff --git a/tests/auto/qmainwindow/qmainwindow.pro b/tests/auto/widgets/widgets/qmainwindow/qmainwindow.pro
index c140f76c89..c140f76c89 100644
--- a/tests/auto/qmainwindow/qmainwindow.pro
+++ b/tests/auto/widgets/widgets/qmainwindow/qmainwindow.pro
diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index d6a8ae793d..9722a3194b 100644
--- a/tests/auto/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -55,7 +55,7 @@
 #include <qtextedit.h>
 #include <private/qmainwindowlayout_p.h>
 #include <private/qdockarealayout_p.h>
-#include "../platformquirks.h"
+#include "../../../platformquirks.h"
 
 //TESTED_FILES=
 
diff --git a/tests/auto/qmdiarea/.gitignore b/tests/auto/widgets/widgets/qmdiarea/.gitignore
index 2632dbea40..2632dbea40 100644
--- a/tests/auto/qmdiarea/.gitignore
+++ b/tests/auto/widgets/widgets/qmdiarea/.gitignore
diff --git a/tests/auto/qmdiarea/qmdiarea.pro b/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro
index 6a12152fcc..6a12152fcc 100644
--- a/tests/auto/qmdiarea/qmdiarea.pro
+++ b/tests/auto/widgets/widgets/qmdiarea/qmdiarea.pro
diff --git a/tests/auto/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
index bbc3d27e27..a4ce94cc3d 100644
--- a/tests/auto/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp
@@ -62,7 +62,7 @@
 #endif
 #include <QMacStyle>
 
-#include "../platformquirks.h"
+#include "../../../platformquirks.h"
 
 static const Qt::WindowFlags DefaultWindowFlags
     = Qt::SubWindow | Qt::WindowSystemMenuHint
diff --git a/tests/auto/qmdisubwindow/.gitignore b/tests/auto/widgets/widgets/qmdisubwindow/.gitignore
index f83a9b0895..f83a9b0895 100644
--- a/tests/auto/qmdisubwindow/.gitignore
+++ b/tests/auto/widgets/widgets/qmdisubwindow/.gitignore
diff --git a/tests/auto/qmdisubwindow/qmdisubwindow.pro b/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro
index 5c5bd525df..5c5bd525df 100644
--- a/tests/auto/qmdisubwindow/qmdisubwindow.pro
+++ b/tests/auto/widgets/widgets/qmdisubwindow/qmdisubwindow.pro
diff --git a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
index f7593336e1..f7593336e1 100644
--- a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
diff --git a/tests/auto/qmenu/.gitignore b/tests/auto/widgets/widgets/qmenu/.gitignore
index 775539a653..775539a653 100644
--- a/tests/auto/qmenu/.gitignore
+++ b/tests/auto/widgets/widgets/qmenu/.gitignore
diff --git a/tests/auto/qmenu/qmenu.pro b/tests/auto/widgets/widgets/qmenu/qmenu.pro
index 1fc1a7ff9d..1fc1a7ff9d 100644
--- a/tests/auto/qmenu/qmenu.pro
+++ b/tests/auto/widgets/widgets/qmenu/qmenu.pro
diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
index d115da865b..d115da865b 100644
--- a/tests/auto/qmenu/tst_qmenu.cpp
+++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp
diff --git a/tests/auto/qmenubar/.gitignore b/tests/auto/widgets/widgets/qmenubar/.gitignore
index b72cc79d94..b72cc79d94 100644
--- a/tests/auto/qmenubar/.gitignore
+++ b/tests/auto/widgets/widgets/qmenubar/.gitignore
diff --git a/tests/auto/qmenubar/qmenubar.pro b/tests/auto/widgets/widgets/qmenubar/qmenubar.pro
index 73c2545710..73c2545710 100644
--- a/tests/auto/qmenubar/qmenubar.pro
+++ b/tests/auto/widgets/widgets/qmenubar/qmenubar.pro
diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
index dc3b81920d..dc3b81920d 100644
--- a/tests/auto/qmenubar/tst_qmenubar.cpp
+++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp
diff --git a/tests/auto/qplaintextedit/.gitignore b/tests/auto/widgets/widgets/qplaintextedit/.gitignore
index 5d47310409..5d47310409 100644
--- a/tests/auto/qplaintextedit/.gitignore
+++ b/tests/auto/widgets/widgets/qplaintextedit/.gitignore
diff --git a/tests/auto/qplaintextedit/qplaintextedit.pro b/tests/auto/widgets/widgets/qplaintextedit/qplaintextedit.pro
index feac5e3f43..feac5e3f43 100644
--- a/tests/auto/qplaintextedit/qplaintextedit.pro
+++ b/tests/auto/widgets/widgets/qplaintextedit/qplaintextedit.pro
diff --git a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
index d847f295e0..d847f295e0 100644
--- a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp
+++ b/tests/auto/widgets/widgets/qplaintextedit/tst_qplaintextedit.cpp
diff --git a/tests/auto/qprogressbar/.gitignore b/tests/auto/widgets/widgets/qprogressbar/.gitignore
index 3cb22a2560..3cb22a2560 100644
--- a/tests/auto/qprogressbar/.gitignore
+++ b/tests/auto/widgets/widgets/qprogressbar/.gitignore
diff --git a/tests/auto/qprogressbar/qprogressbar.pro b/tests/auto/widgets/widgets/qprogressbar/qprogressbar.pro
index 70d8c9111f..70d8c9111f 100644
--- a/tests/auto/qprogressbar/qprogressbar.pro
+++ b/tests/auto/widgets/widgets/qprogressbar/qprogressbar.pro
diff --git a/tests/auto/qprogressbar/tst_qprogressbar.cpp b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
index 55285b42ff..55285b42ff 100644
--- a/tests/auto/qprogressbar/tst_qprogressbar.cpp
+++ b/tests/auto/widgets/widgets/qprogressbar/tst_qprogressbar.cpp
diff --git a/tests/auto/qpushbutton/.gitignore b/tests/auto/widgets/widgets/qpushbutton/.gitignore
index ac5b16970b..ac5b16970b 100644
--- a/tests/auto/qpushbutton/.gitignore
+++ b/tests/auto/widgets/widgets/qpushbutton/.gitignore
diff --git a/tests/auto/qpushbutton/qpushbutton.pro b/tests/auto/widgets/widgets/qpushbutton/qpushbutton.pro
index e2fd455951..e2fd455951 100644
--- a/tests/auto/qpushbutton/qpushbutton.pro
+++ b/tests/auto/widgets/widgets/qpushbutton/qpushbutton.pro
diff --git a/tests/auto/qpushbutton/testdata/setEnabled/disabled_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/disabled_Windows_win32_data0.qsnap
index 8c2c08aee9..8c2c08aee9 100644
--- a/tests/auto/qpushbutton/testdata/setEnabled/disabled_Windows_win32_data0.qsnap
+++ b/tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/disabled_Windows_win32_data0.qsnap
diff --git a/tests/auto/qpushbutton/testdata/setEnabled/enabled_Motif_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/enabled_Motif_data0.qsnap
index 3c455887da..3c455887da 100644
--- a/tests/auto/qpushbutton/testdata/setEnabled/enabled_Motif_data0.qsnap
+++ b/tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/enabled_Motif_data0.qsnap
diff --git a/tests/auto/qpushbutton/testdata/setEnabled/enabled_Windows_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/enabled_Windows_data0.qsnap
index e655b09d29..e655b09d29 100644
--- a/tests/auto/qpushbutton/testdata/setEnabled/enabled_Windows_data0.qsnap
+++ b/tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/enabled_Windows_data0.qsnap
diff --git a/tests/auto/qpushbutton/testdata/setEnabled/enabled_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/enabled_Windows_win32_data0.qsnap
index 8f59499d72..8f59499d72 100644
--- a/tests/auto/qpushbutton/testdata/setEnabled/enabled_Windows_win32_data0.qsnap
+++ b/tests/auto/widgets/widgets/qpushbutton/testdata/setEnabled/enabled_Windows_win32_data0.qsnap
diff --git a/tests/auto/qpushbutton/testdata/setPixmap/Vpix_Motif_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setPixmap/Vpix_Motif_data0.qsnap
index a6967a17f7..a6967a17f7 100644
--- a/tests/auto/qpushbutton/testdata/setPixmap/Vpix_Motif_data0.qsnap
+++ b/tests/auto/widgets/widgets/qpushbutton/testdata/setPixmap/Vpix_Motif_data0.qsnap
diff --git a/tests/auto/qpushbutton/testdata/setPixmap/Vpix_Windows_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setPixmap/Vpix_Windows_data0.qsnap
index d7c721c960..d7c721c960 100644
--- a/tests/auto/qpushbutton/testdata/setPixmap/Vpix_Windows_data0.qsnap
+++ b/tests/auto/widgets/widgets/qpushbutton/testdata/setPixmap/Vpix_Windows_data0.qsnap
diff --git a/tests/auto/qpushbutton/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap
index ae0261a22c..ae0261a22c 100644
--- a/tests/auto/qpushbutton/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap
+++ b/tests/auto/widgets/widgets/qpushbutton/testdata/setPixmap/Vpix_Windows_win32_data0.qsnap
diff --git a/tests/auto/qpushbutton/testdata/setText/simple_Motif_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setText/simple_Motif_data0.qsnap
index 039bdce748..039bdce748 100644
--- a/tests/auto/qpushbutton/testdata/setText/simple_Motif_data0.qsnap
+++ b/tests/auto/widgets/widgets/qpushbutton/testdata/setText/simple_Motif_data0.qsnap
diff --git a/tests/auto/qpushbutton/testdata/setText/simple_Windows_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setText/simple_Windows_data0.qsnap
index db40dc4726..db40dc4726 100644
--- a/tests/auto/qpushbutton/testdata/setText/simple_Windows_data0.qsnap
+++ b/tests/auto/widgets/widgets/qpushbutton/testdata/setText/simple_Windows_data0.qsnap
diff --git a/tests/auto/qpushbutton/testdata/setText/simple_Windows_win32_data0.qsnap b/tests/auto/widgets/widgets/qpushbutton/testdata/setText/simple_Windows_win32_data0.qsnap
index c0e1279f46..c0e1279f46 100644
--- a/tests/auto/qpushbutton/testdata/setText/simple_Windows_win32_data0.qsnap
+++ b/tests/auto/widgets/widgets/qpushbutton/testdata/setText/simple_Windows_win32_data0.qsnap
diff --git a/tests/auto/qpushbutton/tst_qpushbutton.cpp b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
index e5083553e2..e5083553e2 100644
--- a/tests/auto/qpushbutton/tst_qpushbutton.cpp
+++ b/tests/auto/widgets/widgets/qpushbutton/tst_qpushbutton.cpp
diff --git a/tests/auto/qradiobutton/.gitignore b/tests/auto/widgets/widgets/qradiobutton/.gitignore
index ac5e20c562..ac5e20c562 100644
--- a/tests/auto/qradiobutton/.gitignore
+++ b/tests/auto/widgets/widgets/qradiobutton/.gitignore
diff --git a/tests/auto/qradiobutton/qradiobutton.pro b/tests/auto/widgets/widgets/qradiobutton/qradiobutton.pro
index 82b2ff20a8..82b2ff20a8 100644
--- a/tests/auto/qradiobutton/qradiobutton.pro
+++ b/tests/auto/widgets/widgets/qradiobutton/qradiobutton.pro
diff --git a/tests/auto/qradiobutton/tst_qradiobutton.cpp b/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp
index 79d3c8ef9a..79d3c8ef9a 100644
--- a/tests/auto/qradiobutton/tst_qradiobutton.cpp
+++ b/tests/auto/widgets/widgets/qradiobutton/tst_qradiobutton.cpp
diff --git a/tests/auto/qregexpvalidator/.gitignore b/tests/auto/widgets/widgets/qregexpvalidator/.gitignore
index cff9b076b2..cff9b076b2 100644
--- a/tests/auto/qregexpvalidator/.gitignore
+++ b/tests/auto/widgets/widgets/qregexpvalidator/.gitignore
diff --git a/tests/auto/qregexpvalidator/qregexpvalidator.pro b/tests/auto/widgets/widgets/qregexpvalidator/qregexpvalidator.pro
index 68e5c51677..68e5c51677 100644
--- a/tests/auto/qregexpvalidator/qregexpvalidator.pro
+++ b/tests/auto/widgets/widgets/qregexpvalidator/qregexpvalidator.pro
diff --git a/tests/auto/qregexpvalidator/tst_qregexpvalidator.cpp b/tests/auto/widgets/widgets/qregexpvalidator/tst_qregexpvalidator.cpp
index 23cd5b1ef1..23cd5b1ef1 100644
--- a/tests/auto/qregexpvalidator/tst_qregexpvalidator.cpp
+++ b/tests/auto/widgets/widgets/qregexpvalidator/tst_qregexpvalidator.cpp
diff --git a/tests/auto/qscrollarea/.gitignore b/tests/auto/widgets/widgets/qscrollarea/.gitignore
index aace58e9b1..aace58e9b1 100644
--- a/tests/auto/qscrollarea/.gitignore
+++ b/tests/auto/widgets/widgets/qscrollarea/.gitignore
diff --git a/tests/auto/qscrollarea/qscrollarea.pro b/tests/auto/widgets/widgets/qscrollarea/qscrollarea.pro
index 5b2602bbdb..5b2602bbdb 100644
--- a/tests/auto/qscrollarea/qscrollarea.pro
+++ b/tests/auto/widgets/widgets/qscrollarea/qscrollarea.pro
diff --git a/tests/auto/qscrollarea/tst_qscrollarea.cpp b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp
index 8dcfb079d2..8dcfb079d2 100644
--- a/tests/auto/qscrollarea/tst_qscrollarea.cpp
+++ b/tests/auto/widgets/widgets/qscrollarea/tst_qscrollarea.cpp
diff --git a/tests/auto/qscrollbar/.gitignore b/tests/auto/widgets/widgets/qscrollbar/.gitignore
index ae4ffe1e02..ae4ffe1e02 100644
--- a/tests/auto/qscrollbar/.gitignore
+++ b/tests/auto/widgets/widgets/qscrollbar/.gitignore
diff --git a/tests/auto/qscrollbar/qscrollbar.pro b/tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro
index 262855452f..262855452f 100644
--- a/tests/auto/qscrollbar/qscrollbar.pro
+++ b/tests/auto/widgets/widgets/qscrollbar/qscrollbar.pro
diff --git a/tests/auto/qscrollbar/tst_qscrollbar.cpp b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
index c4b64f3f1e..c4b64f3f1e 100644
--- a/tests/auto/qscrollbar/tst_qscrollbar.cpp
+++ b/tests/auto/widgets/widgets/qscrollbar/tst_qscrollbar.cpp
diff --git a/tests/auto/qsizegrip/.gitignore b/tests/auto/widgets/widgets/qsizegrip/.gitignore
index ec480bcbad..ec480bcbad 100644
--- a/tests/auto/qsizegrip/.gitignore
+++ b/tests/auto/widgets/widgets/qsizegrip/.gitignore
diff --git a/tests/auto/qsizegrip/qsizegrip.pro b/tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro
index da6dd5af49..da6dd5af49 100644
--- a/tests/auto/qsizegrip/qsizegrip.pro
+++ b/tests/auto/widgets/widgets/qsizegrip/qsizegrip.pro
diff --git a/tests/auto/qsizegrip/tst_qsizegrip.cpp b/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp
index cc0710a65a..cc0710a65a 100644
--- a/tests/auto/qsizegrip/tst_qsizegrip.cpp
+++ b/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp
diff --git a/tests/auto/qslider/.gitignore b/tests/auto/widgets/widgets/qslider/.gitignore
index f8d833e8b4..f8d833e8b4 100644
--- a/tests/auto/qslider/.gitignore
+++ b/tests/auto/widgets/widgets/qslider/.gitignore
diff --git a/tests/auto/qslider/qslider.pro b/tests/auto/widgets/widgets/qslider/qslider.pro
index 41f011649d..41f011649d 100644
--- a/tests/auto/qslider/qslider.pro
+++ b/tests/auto/widgets/widgets/qslider/qslider.pro
diff --git a/tests/auto/qslider/tst_qslider.cpp b/tests/auto/widgets/widgets/qslider/tst_qslider.cpp
index 50ee9e6a63..50ee9e6a63 100644
--- a/tests/auto/qslider/tst_qslider.cpp
+++ b/tests/auto/widgets/widgets/qslider/tst_qslider.cpp
diff --git a/tests/auto/qspinbox/.gitignore b/tests/auto/widgets/widgets/qspinbox/.gitignore
index 84599cf955..84599cf955 100644
--- a/tests/auto/qspinbox/.gitignore
+++ b/tests/auto/widgets/widgets/qspinbox/.gitignore
diff --git a/tests/auto/qspinbox/qspinbox.pro b/tests/auto/widgets/widgets/qspinbox/qspinbox.pro
index c88dc0ee8f..c88dc0ee8f 100644
--- a/tests/auto/qspinbox/qspinbox.pro
+++ b/tests/auto/widgets/widgets/qspinbox/qspinbox.pro
diff --git a/tests/auto/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
index 608dcd6705..608dcd6705 100644
--- a/tests/auto/qspinbox/tst_qspinbox.cpp
+++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
diff --git a/tests/auto/qsplitter/.gitignore b/tests/auto/widgets/widgets/qsplitter/.gitignore
index 311db65ff0..311db65ff0 100644
--- a/tests/auto/qsplitter/.gitignore
+++ b/tests/auto/widgets/widgets/qsplitter/.gitignore
diff --git a/tests/auto/qsplitter/extradata.txt b/tests/auto/widgets/widgets/qsplitter/extradata.txt
index ceb46d4a82..ceb46d4a82 100644
--- a/tests/auto/qsplitter/extradata.txt
+++ b/tests/auto/widgets/widgets/qsplitter/extradata.txt
diff --git a/tests/auto/qsplitter/qsplitter.pro b/tests/auto/widgets/widgets/qsplitter/qsplitter.pro
index 9942c899ca..9942c899ca 100644
--- a/tests/auto/qsplitter/qsplitter.pro
+++ b/tests/auto/widgets/widgets/qsplitter/qsplitter.pro
diff --git a/tests/auto/qsplitter/setSizes3.dat b/tests/auto/widgets/widgets/qsplitter/setSizes3.dat
index 5d8a73d6f9..5d8a73d6f9 100644
--- a/tests/auto/qsplitter/setSizes3.dat
+++ b/tests/auto/widgets/widgets/qsplitter/setSizes3.dat
diff --git a/tests/auto/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
index 836286e8ae..836286e8ae 100644
--- a/tests/auto/qsplitter/tst_qsplitter.cpp
+++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp
diff --git a/tests/auto/qstackedwidget/.gitignore b/tests/auto/widgets/widgets/qstackedwidget/.gitignore
index 172554eedb..172554eedb 100644
--- a/tests/auto/qstackedwidget/.gitignore
+++ b/tests/auto/widgets/widgets/qstackedwidget/.gitignore
diff --git a/tests/auto/qstackedwidget/qstackedwidget.pro b/tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro
index c9436c6a86..c9436c6a86 100644
--- a/tests/auto/qstackedwidget/qstackedwidget.pro
+++ b/tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro
diff --git a/tests/auto/qstackedwidget/tst_qstackedwidget.cpp b/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp
index a4e71eca51..a4e71eca51 100644
--- a/tests/auto/qstackedwidget/tst_qstackedwidget.cpp
+++ b/tests/auto/widgets/widgets/qstackedwidget/tst_qstackedwidget.cpp
diff --git a/tests/auto/qstatusbar/.gitignore b/tests/auto/widgets/widgets/qstatusbar/.gitignore
index 14454b0693..14454b0693 100644
--- a/tests/auto/qstatusbar/.gitignore
+++ b/tests/auto/widgets/widgets/qstatusbar/.gitignore
diff --git a/tests/auto/qstatusbar/qstatusbar.pro b/tests/auto/widgets/widgets/qstatusbar/qstatusbar.pro
index 51ec0e9cdb..51ec0e9cdb 100644
--- a/tests/auto/qstatusbar/qstatusbar.pro
+++ b/tests/auto/widgets/widgets/qstatusbar/qstatusbar.pro
diff --git a/tests/auto/qstatusbar/tst_qstatusbar.cpp b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
index a4a232951a..a4a232951a 100644
--- a/tests/auto/qstatusbar/tst_qstatusbar.cpp
+++ b/tests/auto/widgets/widgets/qstatusbar/tst_qstatusbar.cpp
diff --git a/tests/auto/qtabbar/.gitignore b/tests/auto/widgets/widgets/qtabbar/.gitignore
index 3f8338e1fe..3f8338e1fe 100644
--- a/tests/auto/qtabbar/.gitignore
+++ b/tests/auto/widgets/widgets/qtabbar/.gitignore
diff --git a/tests/auto/qtabbar/qtabbar.pro b/tests/auto/widgets/widgets/qtabbar/qtabbar.pro
index befe5704ba..befe5704ba 100644
--- a/tests/auto/qtabbar/qtabbar.pro
+++ b/tests/auto/widgets/widgets/qtabbar/qtabbar.pro
diff --git a/tests/auto/qtabbar/tst_qtabbar.cpp b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
index a1a8f3b0aa..a1a8f3b0aa 100644
--- a/tests/auto/qtabbar/tst_qtabbar.cpp
+++ b/tests/auto/widgets/widgets/qtabbar/tst_qtabbar.cpp
diff --git a/tests/auto/qtabwidget/.gitignore b/tests/auto/widgets/widgets/qtabwidget/.gitignore
index d8f924a3df..d8f924a3df 100644
--- a/tests/auto/qtabwidget/.gitignore
+++ b/tests/auto/widgets/widgets/qtabwidget/.gitignore
diff --git a/tests/auto/qtabwidget/qtabwidget.pro b/tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro
index d551c66500..d551c66500 100644
--- a/tests/auto/qtabwidget/qtabwidget.pro
+++ b/tests/auto/widgets/widgets/qtabwidget/qtabwidget.pro
diff --git a/tests/auto/qtabwidget/tst_qtabwidget.cpp b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
index 6d356dee9b..6d356dee9b 100644
--- a/tests/auto/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/widgets/widgets/qtabwidget/tst_qtabwidget.cpp
diff --git a/tests/auto/qtextbrowser/.gitignore b/tests/auto/widgets/widgets/qtextbrowser/.gitignore
index 1ec6f00de1..1ec6f00de1 100644
--- a/tests/auto/qtextbrowser/.gitignore
+++ b/tests/auto/widgets/widgets/qtextbrowser/.gitignore
diff --git a/tests/auto/qtextbrowser/anchor.html b/tests/auto/widgets/widgets/qtextbrowser/anchor.html
index e347a2bb4c..e347a2bb4c 100644
--- a/tests/auto/qtextbrowser/anchor.html
+++ b/tests/auto/widgets/widgets/qtextbrowser/anchor.html
diff --git a/tests/auto/qtextbrowser/bigpage.html b/tests/auto/widgets/widgets/qtextbrowser/bigpage.html
index 125c7a096e..125c7a096e 100644
--- a/tests/auto/qtextbrowser/bigpage.html
+++ b/tests/auto/widgets/widgets/qtextbrowser/bigpage.html
diff --git a/tests/auto/qtextbrowser/firstpage.html b/tests/auto/widgets/widgets/qtextbrowser/firstpage.html
index fa35fce92c..fa35fce92c 100644
--- a/tests/auto/qtextbrowser/firstpage.html
+++ b/tests/auto/widgets/widgets/qtextbrowser/firstpage.html
diff --git a/tests/auto/qtextbrowser/pagewithbg.html b/tests/auto/widgets/widgets/qtextbrowser/pagewithbg.html
index 07609a2b06..07609a2b06 100644
--- a/tests/auto/qtextbrowser/pagewithbg.html
+++ b/tests/auto/widgets/widgets/qtextbrowser/pagewithbg.html
diff --git a/tests/auto/qtextbrowser/pagewithimage.html b/tests/auto/widgets/widgets/qtextbrowser/pagewithimage.html
index 49060d3792..49060d3792 100644
--- a/tests/auto/qtextbrowser/pagewithimage.html
+++ b/tests/auto/widgets/widgets/qtextbrowser/pagewithimage.html
diff --git a/tests/auto/qtextbrowser/pagewithoutbg.html b/tests/auto/widgets/widgets/qtextbrowser/pagewithoutbg.html
index 5a7f9f592b..5a7f9f592b 100644
--- a/tests/auto/qtextbrowser/pagewithoutbg.html
+++ b/tests/auto/widgets/widgets/qtextbrowser/pagewithoutbg.html
diff --git a/tests/auto/qtextbrowser/qtextbrowser.pro b/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro
index ae5177686b..ae5177686b 100644
--- a/tests/auto/qtextbrowser/qtextbrowser.pro
+++ b/tests/auto/widgets/widgets/qtextbrowser/qtextbrowser.pro
diff --git a/tests/auto/qtextbrowser/secondpage.html b/tests/auto/widgets/widgets/qtextbrowser/secondpage.html
index 39018a71b2..39018a71b2 100644
--- a/tests/auto/qtextbrowser/secondpage.html
+++ b/tests/auto/widgets/widgets/qtextbrowser/secondpage.html
diff --git a/tests/auto/qtextbrowser/subdir/index.html b/tests/auto/widgets/widgets/qtextbrowser/subdir/index.html
index 95593cc925..95593cc925 100644
--- a/tests/auto/qtextbrowser/subdir/index.html
+++ b/tests/auto/widgets/widgets/qtextbrowser/subdir/index.html
diff --git a/tests/auto/qtextbrowser/thirdpage.html b/tests/auto/widgets/widgets/qtextbrowser/thirdpage.html
index 215dc08aa0..215dc08aa0 100644
--- a/tests/auto/qtextbrowser/thirdpage.html
+++ b/tests/auto/widgets/widgets/qtextbrowser/thirdpage.html
diff --git a/tests/auto/qtextbrowser/tst_qtextbrowser.cpp b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
index a1592e5e2b..a1592e5e2b 100644
--- a/tests/auto/qtextbrowser/tst_qtextbrowser.cpp
+++ b/tests/auto/widgets/widgets/qtextbrowser/tst_qtextbrowser.cpp
diff --git a/tests/auto/qtextedit/.gitignore b/tests/auto/widgets/widgets/qtextedit/.gitignore
index 8665a3a3d3..8665a3a3d3 100644
--- a/tests/auto/qtextedit/.gitignore
+++ b/tests/auto/widgets/widgets/qtextedit/.gitignore
diff --git a/tests/auto/qtextedit/fullWidthSelection/centered-fully-selected.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-fully-selected.png
index ced6eb6e5b..ced6eb6e5b 100644
--- a/tests/auto/qtextedit/fullWidthSelection/centered-fully-selected.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-fully-selected.png
diff --git a/tests/auto/qtextedit/fullWidthSelection/centered-partly-selected.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-partly-selected.png
index 481b99c7fc..481b99c7fc 100644
--- a/tests/auto/qtextedit/fullWidthSelection/centered-partly-selected.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/centered-partly-selected.png
diff --git a/tests/auto/qtextedit/fullWidthSelection/last-char-on-line.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-line.png
index 292d3f9d4c..292d3f9d4c 100644
--- a/tests/auto/qtextedit/fullWidthSelection/last-char-on-line.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-line.png
diff --git a/tests/auto/qtextedit/fullWidthSelection/last-char-on-parag.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-parag.png
index 69b72ede09..69b72ede09 100644
--- a/tests/auto/qtextedit/fullWidthSelection/last-char-on-parag.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/last-char-on-parag.png
diff --git a/tests/auto/qtextedit/fullWidthSelection/multiple-full-width-lines.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/multiple-full-width-lines.png
index 467b91e6e0..467b91e6e0 100644
--- a/tests/auto/qtextedit/fullWidthSelection/multiple-full-width-lines.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/multiple-full-width-lines.png
diff --git a/tests/auto/qtextedit/fullWidthSelection/nowrap_long.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/nowrap_long.png
index cce921b0cc..cce921b0cc 100644
--- a/tests/auto/qtextedit/fullWidthSelection/nowrap_long.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/nowrap_long.png
diff --git a/tests/auto/qtextedit/fullWidthSelection/single-full-width-line.png b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/single-full-width-line.png
index 937494ac3c..937494ac3c 100644
--- a/tests/auto/qtextedit/fullWidthSelection/single-full-width-line.png
+++ b/tests/auto/widgets/widgets/qtextedit/fullWidthSelection/single-full-width-line.png
diff --git a/tests/auto/qtextedit/qtextedit.pro b/tests/auto/widgets/widgets/qtextedit/qtextedit.pro
index f29a2d2850..f29a2d2850 100644
--- a/tests/auto/qtextedit/qtextedit.pro
+++ b/tests/auto/widgets/widgets/qtextedit/qtextedit.pro
diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
index 481bda962a..481bda962a 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp
diff --git a/tests/auto/qtoolbar/.gitignore b/tests/auto/widgets/widgets/qtoolbar/.gitignore
index 971c9f9dfe..971c9f9dfe 100644
--- a/tests/auto/qtoolbar/.gitignore
+++ b/tests/auto/widgets/widgets/qtoolbar/.gitignore
diff --git a/tests/auto/qtoolbar/qtoolbar.pro b/tests/auto/widgets/widgets/qtoolbar/qtoolbar.pro
index b340097d81..b340097d81 100644
--- a/tests/auto/qtoolbar/qtoolbar.pro
+++ b/tests/auto/widgets/widgets/qtoolbar/qtoolbar.pro
diff --git a/tests/auto/qtoolbar/tst_qtoolbar.cpp b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
index eb043aced8..eb043aced8 100644
--- a/tests/auto/qtoolbar/tst_qtoolbar.cpp
+++ b/tests/auto/widgets/widgets/qtoolbar/tst_qtoolbar.cpp
diff --git a/tests/auto/qtoolbox/.gitignore b/tests/auto/widgets/widgets/qtoolbox/.gitignore
index f586175dcb..f586175dcb 100644
--- a/tests/auto/qtoolbox/.gitignore
+++ b/tests/auto/widgets/widgets/qtoolbox/.gitignore
diff --git a/tests/auto/qtoolbox/qtoolbox.pro b/tests/auto/widgets/widgets/qtoolbox/qtoolbox.pro
index 24f3ea6cb9..24f3ea6cb9 100644
--- a/tests/auto/qtoolbox/qtoolbox.pro
+++ b/tests/auto/widgets/widgets/qtoolbox/qtoolbox.pro
diff --git a/tests/auto/qtoolbox/tst_qtoolbox.cpp b/tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp
index 2288eee5f4..2288eee5f4 100644
--- a/tests/auto/qtoolbox/tst_qtoolbox.cpp
+++ b/tests/auto/widgets/widgets/qtoolbox/tst_qtoolbox.cpp
diff --git a/tests/auto/qtoolbutton/.gitignore b/tests/auto/widgets/widgets/qtoolbutton/.gitignore
index 91e11101e1..91e11101e1 100644
--- a/tests/auto/qtoolbutton/.gitignore
+++ b/tests/auto/widgets/widgets/qtoolbutton/.gitignore
diff --git a/tests/auto/qtoolbutton/qtoolbutton.pro b/tests/auto/widgets/widgets/qtoolbutton/qtoolbutton.pro
index 5f082682ad..5f082682ad 100644
--- a/tests/auto/qtoolbutton/qtoolbutton.pro
+++ b/tests/auto/widgets/widgets/qtoolbutton/qtoolbutton.pro
diff --git a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
index 0e21ea6611..0e21ea6611 100644
--- a/tests/auto/qtoolbutton/tst_qtoolbutton.cpp
+++ b/tests/auto/widgets/widgets/qtoolbutton/tst_qtoolbutton.cpp
diff --git a/tests/auto/qworkspace/.gitignore b/tests/auto/widgets/widgets/qworkspace/.gitignore
index 73facc366e..73facc366e 100644
--- a/tests/auto/qworkspace/.gitignore
+++ b/tests/auto/widgets/widgets/qworkspace/.gitignore
diff --git a/tests/auto/qworkspace/qworkspace.pro b/tests/auto/widgets/widgets/qworkspace/qworkspace.pro
index 0b8a604fe8..0b8a604fe8 100644
--- a/tests/auto/qworkspace/qworkspace.pro
+++ b/tests/auto/widgets/widgets/qworkspace/qworkspace.pro
diff --git a/tests/auto/qworkspace/tst_qworkspace.cpp b/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp
index a996c38438..a996c38438 100644
--- a/tests/auto/qworkspace/tst_qworkspace.cpp
+++ b/tests/auto/widgets/widgets/qworkspace/tst_qworkspace.cpp
diff --git a/tests/auto/widgets/widgets/widgets.pro b/tests/auto/widgets/widgets/widgets.pro
new file mode 100644
index 0000000000..e77c311cde
--- /dev/null
+++ b/tests/auto/widgets/widgets/widgets.pro
@@ -0,0 +1,57 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+   qabstractbutton \
+   qabstractscrollarea \
+   qabstractslider \
+   qabstractspinbox \
+   qbuttongroup \
+   qcalendarwidget \
+   qcheckbox \
+   qcombobox \
+   qcommandlinkbutton \
+   qdatetimeedit \
+   qdial \
+   qdialogbuttonbox \
+   qdockwidget \
+   qdoublespinbox \
+   qdoublevalidator \
+   qfocusframe \
+   qfontcombobox \
+   qgroupbox \
+   qintvalidator \
+   qlabel \
+   qlcdnumber \
+   qlineedit \
+   qmainwindow \
+   qmdiarea \
+   qmdisubwindow \
+   qmenu \
+   qmenubar \
+   qplaintextedit \
+   qprogressbar \
+   qpushbutton \
+   qradiobutton \
+   qregexpvalidator \
+   qscrollarea \
+   qscrollbar \
+   qsizegrip \
+   qslider \
+   qspinbox \
+   qsplitter \
+   qstackedwidget \
+   qstatusbar \
+   qtabbar \
+   qtabwidget \
+   qtextbrowser \
+   qtextedit \
+   qtoolbar \
+   qtoolbox \
+   qtoolbutton \
+   qworkspace \
+
+# The following tests depend on private API:
+!contains(QT_CONFIG, private_tests): SUBDIRS -= \
+           qcombobox \
+           qmainwindow \
+           qtextedit \
+           qtoolbar \