diff --git a/tests/auto/gestures/gestures.pro b/tests/auto/gestures/gestures.pro
index da5610f2f60..538e4f5d680 100644
--- a/tests/auto/gestures/gestures.pro
+++ b/tests/auto/gestures/gestures.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_gestures.cpp
 
 
diff --git a/tests/auto/languagechange/languagechange.pro b/tests/auto/languagechange/languagechange.pro
index f161c508645..cc91fc2d559 100644
--- a/tests/auto/languagechange/languagechange.pro
+++ b/tests/auto/languagechange/languagechange.pro
@@ -1,4 +1,4 @@
 load(qttest_p4)
-QT += core-private
+QT += widgets core-private
 SOURCES += tst_languagechange.cpp
 
diff --git a/tests/auto/languagechange/tst_languagechange.cpp b/tests/auto/languagechange/tst_languagechange.cpp
index 7c7887af66f..e0dfdb82d03 100644
--- a/tests/auto/languagechange/tst_languagechange.cpp
+++ b/tests/auto/languagechange/tst_languagechange.cpp
@@ -46,10 +46,10 @@
 #include <QtCore/QSet>
 #include <QtCore/QTranslator>
 #include <private/qthread_p.h>
-#include <QtGui/QInputDialog>
-#include <QtGui/QColorDialog>
-#include <QtGui/QFileDialog>
-#include <QtGui/QDesktopWidget>
+#include <QtWidgets/QInputDialog>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QDesktopWidget>
 
 
 //TESTED_CLASS=
diff --git a/tests/auto/qabstractbutton/qabstractbutton.pro b/tests/auto/qabstractbutton/qabstractbutton.pro
index 2e525857009..15d90ed4e14 100644
--- a/tests/auto/qabstractbutton/qabstractbutton.pro
+++ b/tests/auto/qabstractbutton/qabstractbutton.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qabstractbutton.cpp
 
 
diff --git a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
index 52c4e96f99e..543065a4c05 100644
--- a/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
+++ b/tests/auto/qabstractitemmodel/qabstractitemmodel.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 
 INCLUDEPATH += $$PWD/../modeltest
-
+QT += widgets
 SOURCES         += tst_qabstractitemmodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp
 HEADERS         += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h
 
diff --git a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
index f99c5552fb4..280fe44c7e8 100644
--- a/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/qabstractitemmodel/tst_qabstractitemmodel.cpp
@@ -43,7 +43,7 @@
 #include <QtTest/QtTest>
 #include <QtCore/QtCore>
 
-#include <QtGui/QSortFilterProxyModel>
+#include <QtWidgets/QSortFilterProxyModel>
 
 //TESTED_CLASS=QAbstractListModel QAbstractTableModel
 //TESTED_FILES=
diff --git a/tests/auto/qabstractitemview/qabstractitemview.pro b/tests/auto/qabstractitemview/qabstractitemview.pro
index 0d0d51c38ac..e6c2d84b5ff 100644
--- a/tests/auto/qabstractitemview/qabstractitemview.pro
+++ b/tests/auto/qabstractitemview/qabstractitemview.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES         += tst_qabstractitemview.cpp
 
 
diff --git a/tests/auto/qabstractprintdialog/qabstractprintdialog.pro b/tests/auto/qabstractprintdialog/qabstractprintdialog.pro
index 8d9b1422902..85f0761815c 100644
--- a/tests/auto/qabstractprintdialog/qabstractprintdialog.pro
+++ b/tests/auto/qabstractprintdialog/qabstractprintdialog.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets
 SOURCES += tst_qabstractprintdialog.cpp
 
 
diff --git a/tests/auto/qabstractproxymodel/qabstractproxymodel.pro b/tests/auto/qabstractproxymodel/qabstractproxymodel.pro
index d1bff92543a..7a6a841796d 100644
--- a/tests/auto/qabstractproxymodel/qabstractproxymodel.pro
+++ b/tests/auto/qabstractproxymodel/qabstractproxymodel.pro
@@ -1,2 +1,3 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qabstractproxymodel.cpp
diff --git a/tests/auto/qabstractscrollarea/qabstractscrollarea.pro b/tests/auto/qabstractscrollarea/qabstractscrollarea.pro
index 9e7b6e0f95c..e4bc3f64951 100644
--- a/tests/auto/qabstractscrollarea/qabstractscrollarea.pro
+++ b/tests/auto/qabstractscrollarea/qabstractscrollarea.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets
 SOURCES += tst_qabstractscrollarea.cpp
 
 
diff --git a/tests/auto/qabstractslider/qabstractslider.pro b/tests/auto/qabstractslider/qabstractslider.pro
index 13a2e873a97..4507859acea 100644
--- a/tests/auto/qabstractslider/qabstractslider.pro
+++ b/tests/auto/qabstractslider/qabstractslider.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qabstractslider.cpp
 
 
diff --git a/tests/auto/qabstractspinbox/qabstractspinbox.pro b/tests/auto/qabstractspinbox/qabstractspinbox.pro
index 293eff3c0f4..e156b2493db 100644
--- a/tests/auto/qabstractspinbox/qabstractspinbox.pro
+++ b/tests/auto/qabstractspinbox/qabstractspinbox.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets
 SOURCES += tst_qabstractspinbox.cpp
 
 
diff --git a/tests/auto/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro b/tests/auto/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro
index 701b24b5b3e..22b013e37e7 100644
--- a/tests/auto/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro
+++ b/tests/auto/qabstracttextdocumentlayout/qabstracttextdocumentlayout.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets
 SOURCES += tst_qabstracttextdocumentlayout.cpp
 
 
diff --git a/tests/auto/qaction/qaction.pro b/tests/auto/qaction/qaction.pro
index a129cd66acf..9c3648d52fa 100644
--- a/tests/auto/qaction/qaction.pro
+++ b/tests/auto/qaction/qaction.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qaction.cpp 
 
 
diff --git a/tests/auto/qactiongroup/qactiongroup.pro b/tests/auto/qactiongroup/qactiongroup.pro
index d4688156749..9b8636968b3 100644
--- a/tests/auto/qactiongroup/qactiongroup.pro
+++ b/tests/auto/qactiongroup/qactiongroup.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qactiongroup.cpp 
 
 
diff --git a/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro b/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro
index 3193764709f..3e00e082950 100644
--- a/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro
+++ b/tests/auto/qapplication/desktopsettingsaware/desktopsettingsaware.pro
@@ -11,6 +11,7 @@ wince*:TARGET = ../desktopsettingsaware
 symbian:TARGET = desktopsettingsaware
 
 # Input
+QT += widgets
 SOURCES += main.cpp
 CONFIG += qt warn_on create_prl link_prl
 CONFIG -= app_bundle
diff --git a/tests/auto/qapplication/modal/modal.pro b/tests/auto/qapplication/modal/modal.pro
index 836f6ffab0e..9ed69769bb4 100644
--- a/tests/auto/qapplication/modal/modal.pro
+++ b/tests/auto/qapplication/modal/modal.pro
@@ -1,4 +1,5 @@
 TEMPLATE = app
+QT += widgets
 TARGET = 
 DEPENDPATH += .
 INCLUDEPATH += .
diff --git a/tests/auto/qapplication/test/test.pro b/tests/auto/qapplication/test/test.pro
index adda4818290..ced508d738d 100644
--- a/tests/auto/qapplication/test/test.pro
+++ b/tests/auto/qapplication/test/test.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES += ../tst_qapplication.cpp
@@ -8,7 +9,7 @@ TARGET = ../tst_qapplication
 wince* {
   additional.files = ../desktopsettingsaware/desktopsettingsaware.exe
   additional.path = desktopsettingsaware
-  someTest.files = test.pro
+  someTest.files e= test.pro
   someTest.path = test
   DEPLOYMENT += additional deploy someTest
 }
diff --git a/tests/auto/qapplication/wincmdline/wincmdline.pro b/tests/auto/qapplication/wincmdline/wincmdline.pro
index 8a8ca3d6b34..3ba8f481673 100644
--- a/tests/auto/qapplication/wincmdline/wincmdline.pro
+++ b/tests/auto/qapplication/wincmdline/wincmdline.pro
@@ -2,6 +2,7 @@ TEMPLATE = app
 TARGET = 
 DEPENDPATH += .
 INCLUDEPATH += .
+QT += widgets
 SOURCES += main.cpp
 
 
diff --git a/tests/auto/qboxlayout/qboxlayout.pro b/tests/auto/qboxlayout/qboxlayout.pro
index 3195f4dc9ba..c37f12f74f9 100644
--- a/tests/auto/qboxlayout/qboxlayout.pro
+++ b/tests/auto/qboxlayout/qboxlayout.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qboxlayout.cpp
 
 
diff --git a/tests/auto/qbrush/qbrush.pro b/tests/auto/qbrush/qbrush.pro
index c17784cbec2..1c3efd46be0 100644
--- a/tests/auto/qbrush/qbrush.pro
+++ b/tests/auto/qbrush/qbrush.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qbrush.cpp
-
-
-
diff --git a/tests/auto/qbuttongroup/qbuttongroup.pro b/tests/auto/qbuttongroup/qbuttongroup.pro
index 4f8b2113b10..6f506e8f06d 100644
--- a/tests/auto/qbuttongroup/qbuttongroup.pro
+++ b/tests/auto/qbuttongroup/qbuttongroup.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qbuttongroup.cpp
 
 
diff --git a/tests/auto/qcalendarwidget/qcalendarwidget.pro b/tests/auto/qcalendarwidget/qcalendarwidget.pro
index 62b137b3475..d250b83537b 100644
--- a/tests/auto/qcalendarwidget/qcalendarwidget.pro
+++ b/tests/auto/qcalendarwidget/qcalendarwidget.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qcalendarwidget.cpp
 
 
diff --git a/tests/auto/qcheckbox/qcheckbox.pro b/tests/auto/qcheckbox/qcheckbox.pro
index c2fee481337..aa1f35b3c99 100644
--- a/tests/auto/qcheckbox/qcheckbox.pro
+++ b/tests/auto/qcheckbox/qcheckbox.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qcheckbox.cpp
 
 
diff --git a/tests/auto/qclipboard/copier/copier.pro b/tests/auto/qclipboard/copier/copier.pro
index 1c188ca7ded..d345d33eb5b 100644
--- a/tests/auto/qclipboard/copier/copier.pro
+++ b/tests/auto/qclipboard/copier/copier.pro
@@ -3,6 +3,7 @@ TARGET =
 DEPENDPATH += .
 INCLUDEPATH += .
 CONFIG -= app_bundle
+QT += widgets
 win32: DESTDIR = ../copier
 # Input
 SOURCES += main.cpp
diff --git a/tests/auto/qclipboard/paster/paster.pro b/tests/auto/qclipboard/paster/paster.pro
index 8580644b1e6..d214c9e90a8 100644
--- a/tests/auto/qclipboard/paster/paster.pro
+++ b/tests/auto/qclipboard/paster/paster.pro
@@ -4,7 +4,7 @@ DEPENDPATH += .
 INCLUDEPATH += .
 win32: DESTDIR = ../paster
 CONFIG -= app_bundle
-
+QT += widgets
 # Input
 SOURCES += main.cpp
 
diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/qclipboard/tst_qclipboard.cpp
index 78409743523..66c8e25d800 100644
--- a/tests/auto/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/qclipboard/tst_qclipboard.cpp
@@ -42,7 +42,7 @@
 
 #include <QtTest/QtTest>
 #include <QtCore/QDebug>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtGui/QClipboard>
 #ifdef Q_WS_MAC
 #include <Carbon/Carbon.h>
diff --git a/tests/auto/qcolordialog/qcolordialog.pro b/tests/auto/qcolordialog/qcolordialog.pro
index 830f9fafe28..4f195dac2ba 100644
--- a/tests/auto/qcolordialog/qcolordialog.pro
+++ b/tests/auto/qcolordialog/qcolordialog.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qcolordialog.cpp
 
 
diff --git a/tests/auto/qcolumnview/qcolumnview.pro b/tests/auto/qcolumnview/qcolumnview.pro
index e36df030c23..bca9e75ba5e 100644
--- a/tests/auto/qcolumnview/qcolumnview.pro
+++ b/tests/auto/qcolumnview/qcolumnview.pro
@@ -1,4 +1,5 @@
 CONFIG += qttest_p4
+QT += widgets widgets-private
 QT += gui-private core-private
 
 SOURCES		+= tst_qcolumnview.cpp 
diff --git a/tests/auto/qcolumnview/tst_qcolumnview.cpp b/tests/auto/qcolumnview/tst_qcolumnview.cpp
index d5a8290c3c3..c3e2589937a 100644
--- a/tests/auto/qcolumnview/tst_qcolumnview.cpp
+++ b/tests/auto/qcolumnview/tst_qcolumnview.cpp
@@ -44,9 +44,9 @@
 #include <qstandarditemmodel.h>
 #include <qitemdelegate.h>
 #include <qcolumnview.h>
-#include "../../../src/gui/itemviews/qcolumnviewgrip_p.h"
+#include "../../../src/widgets/itemviews/qcolumnviewgrip_p.h"
 #ifndef Q_OS_SYMBIAN
-#include "../../../src/gui/dialogs/qfilesystemmodel_p.h"
+#include "../../../src/widgets/dialogs/qfilesystemmodel_p.h"
 #endif
 #include <qdirmodel.h>
 #include <qstringlistmodel.h>
diff --git a/tests/auto/qcombobox/qcombobox.pro b/tests/auto/qcombobox/qcombobox.pro
index a8f0e6ad23c..c3da9094376 100644
--- a/tests/auto/qcombobox/qcombobox.pro
+++ b/tests/auto/qcombobox/qcombobox.pro
@@ -1,4 +1,4 @@
 load(qttest_p4)
-QT += gui-private core-private
+QT += widgets widgets-private gui-private core-private
 SOURCES  += tst_qcombobox.cpp
 
diff --git a/tests/auto/qcommandlinkbutton/qcommandlinkbutton.pro b/tests/auto/qcommandlinkbutton/qcommandlinkbutton.pro
index db3a336c364..497b8298a2e 100644
--- a/tests/auto/qcommandlinkbutton/qcommandlinkbutton.pro
+++ b/tests/auto/qcommandlinkbutton/qcommandlinkbutton.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qcommandlinkbutton.cpp
 
 
diff --git a/tests/auto/qcompleter/qcompleter.pro b/tests/auto/qcompleter/qcompleter.pro
index 39b5dd717ec..d23e1eb366a 100644
--- a/tests/auto/qcompleter/qcompleter.pro
+++ b/tests/auto/qcompleter/qcompleter.pro
@@ -4,6 +4,7 @@
 load(qttest_p4)
 TEMPLATE = app
 TARGET = tst_qcompleter
+QT += widgets
 DEPENDPATH += .
 INCLUDEPATH += . ..
 
diff --git a/tests/auto/qcomplextext/qcomplextext.pro b/tests/auto/qcomplextext/qcomplextext.pro
index bd85daa6b46..725594cdd61 100644
--- a/tests/auto/qcomplextext/qcomplextext.pro
+++ b/tests/auto/qcomplextext/qcomplextext.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets widgets-private
 QT += core-private gui-private
 SOURCES  += tst_qcomplextext.cpp
 INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
diff --git a/tests/auto/qdatawidgetmapper/qdatawidgetmapper.pro b/tests/auto/qdatawidgetmapper/qdatawidgetmapper.pro
index d8e0cd043c1..64e3b572913 100644
--- a/tests/auto/qdatawidgetmapper/qdatawidgetmapper.pro
+++ b/tests/auto/qdatawidgetmapper/qdatawidgetmapper.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qdatawidgetmapper.cpp
 
 
diff --git a/tests/auto/qdatetimeedit/qdatetimeedit.pro b/tests/auto/qdatetimeedit/qdatetimeedit.pro
index 19e92d01551..47356d448c4 100644
--- a/tests/auto/qdatetimeedit/qdatetimeedit.pro
+++ b/tests/auto/qdatetimeedit/qdatetimeedit.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qdatetimeedit.cpp
 
 wincewm50smart-msvc2005: DEFINES += WINCE_NO_MODIFIER_KEYS
diff --git a/tests/auto/qdesktopservices/qdesktopservices.pro b/tests/auto/qdesktopservices/qdesktopservices.pro
index 43f6cba2676..0e51ed04598 100644
--- a/tests/auto/qdesktopservices/qdesktopservices.pro
+++ b/tests/auto/qdesktopservices/qdesktopservices.pro
@@ -1,4 +1,5 @@
 CONFIG += qttest_p4
+QT += widgets
 
 SOURCES		+= tst_qdesktopservices.cpp
 TARGET		= tst_qdesktopservices
diff --git a/tests/auto/qdesktopwidget/qdesktopwidget.pro b/tests/auto/qdesktopwidget/qdesktopwidget.pro
index bc287c09b0e..730b273c4f3 100644
--- a/tests/auto/qdesktopwidget/qdesktopwidget.pro
+++ b/tests/auto/qdesktopwidget/qdesktopwidget.pro
@@ -1,5 +1,3 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qdesktopwidget.cpp
-
-
-
diff --git a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp b/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp
index f66b849eca3..624af0ab26d 100644
--- a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp
+++ b/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp
@@ -41,7 +41,7 @@
 
 
 #include <QtTest/QtTest>
-#include <QtGui/QDesktopWidget>
+#include <QtWidgets/QDesktopWidget>
 #include <QDebug>
 
 //TESTED_CLASS=
diff --git a/tests/auto/qdial/qdial.pro b/tests/auto/qdial/qdial.pro
index 7cd245e6a90..acf66de4308 100644
--- a/tests/auto/qdial/qdial.pro
+++ b/tests/auto/qdial/qdial.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qdial.cpp
 
 
diff --git a/tests/auto/qdialog/qdialog.pro b/tests/auto/qdialog/qdialog.pro
index 7fdb7fced07..8f71e1e2ccf 100644
--- a/tests/auto/qdialog/qdialog.pro
+++ b/tests/auto/qdialog/qdialog.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qdialog.cpp
 
 
diff --git a/tests/auto/qdialogbuttonbox/qdialogbuttonbox.pro b/tests/auto/qdialogbuttonbox/qdialogbuttonbox.pro
index 70b65f644e8..efbeca0c1b5 100644
--- a/tests/auto/qdialogbuttonbox/qdialogbuttonbox.pro
+++ b/tests/auto/qdialogbuttonbox/qdialogbuttonbox.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qdialogbuttonbox.cpp
 
 TARGET = tst_qdialogbuttonbox
diff --git a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index 4808851c4bb..c0b7a7b8646 100644
--- a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 #include <QtTest/QtTest>
-#include <QtGui/QPushButton>
-#include <QtGui/QStyle>
-#include <QtGui/QLayout>
-#include <QtGui/QDialog>
-#include <QtGui/QAction>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QAction>
 #include <qdialogbuttonbox.h>
 #include <limits.h>
 
diff --git a/tests/auto/qdirmodel/qdirmodel.pro b/tests/auto/qdirmodel/qdirmodel.pro
index 7037a799340..7c0409334ca 100644
--- a/tests/auto/qdirmodel/qdirmodel.pro
+++ b/tests/auto/qdirmodel/qdirmodel.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES         += tst_qdirmodel.cpp
 
 wince*|symbian {
diff --git a/tests/auto/qdockwidget/qdockwidget.pro b/tests/auto/qdockwidget/qdockwidget.pro
index 5f92e5db192..6409ac6efb0 100644
--- a/tests/auto/qdockwidget/qdockwidget.pro
+++ b/tests/auto/qdockwidget/qdockwidget.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
-
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES += tst_qdockwidget.cpp
diff --git a/tests/auto/qdoublespinbox/qdoublespinbox.pro b/tests/auto/qdoublespinbox/qdoublespinbox.pro
index 3aec0de68e3..6f2b8b2d74a 100644
--- a/tests/auto/qdoublespinbox/qdoublespinbox.pro
+++ b/tests/auto/qdoublespinbox/qdoublespinbox.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qdoublespinbox.cpp
 
 
diff --git a/tests/auto/qdoublevalidator/qdoublevalidator.pro b/tests/auto/qdoublevalidator/qdoublevalidator.pro
index 1fe3f7b838e..7fbb72bb7f6 100644
--- a/tests/auto/qdoublevalidator/qdoublevalidator.pro
+++ b/tests/auto/qdoublevalidator/qdoublevalidator.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qdoublevalidator.cpp
 
 
diff --git a/tests/auto/qdrag/qdrag.pro b/tests/auto/qdrag/qdrag.pro
index ad36fa5adaa..d9d645559b1 100644
--- a/tests/auto/qdrag/qdrag.pro
+++ b/tests/auto/qdrag/qdrag.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets
 SOURCES += tst_qdrag.cpp
 
 
diff --git a/tests/auto/qerrormessage/qerrormessage.pro b/tests/auto/qerrormessage/qerrormessage.pro
index 0db361081bc..4ac84661277 100644
--- a/tests/auto/qerrormessage/qerrormessage.pro
+++ b/tests/auto/qerrormessage/qerrormessage.pro
@@ -6,7 +6,7 @@ TEMPLATE = app
 TARGET = tst_qerrormessage
 DEPENDPATH += .
 INCLUDEPATH += . 
-
+QT += widgets
 CONFIG += console qtestlib
 # Input
 SOURCES += tst_qerrormessage.cpp
diff --git a/tests/auto/qfiledialog/qfiledialog.pro b/tests/auto/qfiledialog/qfiledialog.pro
index 57828b1bd47..c58dc0d5e76 100644
--- a/tests/auto/qfiledialog/qfiledialog.pro
+++ b/tests/auto/qfiledialog/qfiledialog.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets widgets-private
 QT += core-private gui-private
 SOURCES += tst_qfiledialog.cpp
 
diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp
index 42e82a929dc..5084ce94b08 100644
--- a/tests/auto/qfiledialog/tst_qfiledialog.cpp
+++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp
@@ -62,9 +62,9 @@
 #include <qlayout.h>
 #include "../../shared/util.h"
 #if defined QT_BUILD_INTERNAL
-#include "../../../src/gui/dialogs/qsidebar_p.h"
-#include "../../../src/gui/dialogs/qfilesystemmodel_p.h"
-#include "../../../src/gui/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"
 #endif
 #include <QFileDialog>
 #include <QFileSystemModel>
diff --git a/tests/auto/qfiledialog2/qfiledialog2.pro b/tests/auto/qfiledialog2/qfiledialog2.pro
index 5d1d72195d9..14de040ec54 100644
--- a/tests/auto/qfiledialog2/qfiledialog2.pro
+++ b/tests/auto/qfiledialog2/qfiledialog2.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES += tst_qfiledialog2.cpp
diff --git a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
index dc3ca5285d3..355c29fee60 100644
--- a/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
+++ b/tests/auto/qfiledialog2/tst_qfiledialog2.cpp
@@ -61,9 +61,9 @@
 #include <qlineedit.h>
 #include <qlayout.h>
 #include "../../shared/util.h"
-#include "../../../src/gui/dialogs/qsidebar_p.h"
-#include "../../../src/gui/dialogs/qfilesystemmodel_p.h"
-#include "../../../src/gui/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"
 
diff --git a/tests/auto/qfileiconprovider/qfileiconprovider.pro b/tests/auto/qfileiconprovider/qfileiconprovider.pro
index 3bf83ae5da7..1e3d26de00e 100644
--- a/tests/auto/qfileiconprovider/qfileiconprovider.pro
+++ b/tests/auto/qfileiconprovider/qfileiconprovider.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qfileiconprovider.cpp
 
 
diff --git a/tests/auto/qfileopenevent/qfileopenevent.pro b/tests/auto/qfileopenevent/qfileopenevent.pro
index 45978d7b7e4..73724828dbb 100644
--- a/tests/auto/qfileopenevent/qfileopenevent.pro
+++ b/tests/auto/qfileopenevent/qfileopenevent.pro
@@ -1,2 +1,3 @@
 TEMPLATE = subdirs
+QT += widgets
 SUBDIRS = test qfileopeneventexternal
diff --git a/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro b/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro
index b95ed45edda..cb61b82e381 100644
--- a/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro
+++ b/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = qfileopeneventexternal
-QT += core gui
+QT += core gui widgets
 SOURCES += qfileopeneventexternal.cpp
 symbian: {
     RSS_RULES += "embeddability=KAppEmbeddable;"
diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
index ab121306e31..b0b6d7a18d1 100644
--- a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
+++ b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro
@@ -1,6 +1,7 @@
 CONFIG += qttest_p4
 
-QT = core-private gui
+QT += widgets widgets-private
+QT += core-private gui
 
 SOURCES		+= tst_qfilesystemmodel.cpp
 TARGET		= tst_qfilesystemmodel
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
index e8d0f575df7..aa48996681d 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -42,7 +42,7 @@
 
 #include <QtTest/QtTest>
 #ifdef QT_BUILD_INTERNAL
-#include "../../../src/gui/dialogs/qfilesystemmodel_p.h"
+#include "../../../src/widgets/dialogs/qfilesystemmodel_p.h"
 #endif
 #include <QFileSystemModel>
 #include <QFileIconProvider>
diff --git a/tests/auto/qfocusevent/qfocusevent.pro b/tests/auto/qfocusevent/qfocusevent.pro
index 17431cf5a1b..d904a0b0bf6 100644
--- a/tests/auto/qfocusevent/qfocusevent.pro
+++ b/tests/auto/qfocusevent/qfocusevent.pro
@@ -1,2 +1,3 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qfocusevent.cpp
diff --git a/tests/auto/qfocusframe/qfocusframe.pro b/tests/auto/qfocusframe/qfocusframe.pro
index afb7206b000..0fcc9bf23d9 100644
--- a/tests/auto/qfocusframe/qfocusframe.pro
+++ b/tests/auto/qfocusframe/qfocusframe.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets
 SOURCES += tst_qfocusframe.cpp
 
 
diff --git a/tests/auto/qfont/qfont.pro b/tests/auto/qfont/qfont.pro
index b071d88dce8..891cb0a093c 100644
--- a/tests/auto/qfont/qfont.pro
+++ b/tests/auto/qfont/qfont.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qfont.cpp
 
 
diff --git a/tests/auto/qfontcombobox/qfontcombobox.pro b/tests/auto/qfontcombobox/qfontcombobox.pro
index b7d32f54847..9e984e0d998 100644
--- a/tests/auto/qfontcombobox/qfontcombobox.pro
+++ b/tests/auto/qfontcombobox/qfontcombobox.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qfontcombobox.cpp
 
 
diff --git a/tests/auto/qfontdialog/qfontdialog.pro b/tests/auto/qfontdialog/qfontdialog.pro
index 637e8965181..80444ed4945 100644
--- a/tests/auto/qfontdialog/qfontdialog.pro
+++ b/tests/auto/qfontdialog/qfontdialog.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES  += tst_qfontdialog.cpp
diff --git a/tests/auto/qformlayout/qformlayout.pro b/tests/auto/qformlayout/qformlayout.pro
index baeb6741ca8..24c452af9ff 100644
--- a/tests/auto/qformlayout/qformlayout.pro
+++ b/tests/auto/qformlayout/qformlayout.pro
@@ -1,2 +1,3 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qformlayout.cpp
diff --git a/tests/auto/qformlayout/tst_qformlayout.cpp b/tests/auto/qformlayout/tst_qformlayout.cpp
index bb33e50fb74..c8b469dcc68 100644
--- a/tests/auto/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/qformlayout/tst_qformlayout.cpp
@@ -46,9 +46,8 @@
 #include <qwidget.h>
 #include <qwindowsstyle.h>
 #include <qsizepolicy.h>
-#include <QtGui>
 
-#include <QtGui/QWindowsStyle>
+#include <QtWidgets/QWindowsStyle>
 #include <QStyleFactory>
 
 #include <qformlayout.h>
diff --git a/tests/auto/qgl/qgl.pro b/tests/auto/qgl/qgl.pro
index 74d9803d2fb..b0a77a1d5e2 100644
--- a/tests/auto/qgl/qgl.pro
+++ b/tests/auto/qgl/qgl.pro
@@ -4,7 +4,7 @@
 
 load(qttest_p4)
 requires(contains(QT_CONFIG,opengl))
-QT += opengl-private gui-private core-private
+QT += widgets widgets-private opengl-private gui-private core-private
 
 contains(QT_CONFIG,egl):DEFINES += QGL_EGL
 win32:!wince*: DEFINES += QT_NO_EGL
diff --git a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
index e1829b0b6b2..5aa2936e3e1 100644
--- a/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
+++ b/tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets widgets-private
 QT += core-private gui-private
 SOURCES  += tst_qgraphicsanchorlayout.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index 55d6fc97cd7..556b790461f 100644
--- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -40,12 +40,12 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtGui/qgraphicsanchorlayout.h>
+#include <QtWidgets/qgraphicsanchorlayout.h>
 #include <private/qgraphicsanchorlayout_p.h>
-#include <QtGui/qgraphicswidget.h>
-#include <QtGui/qgraphicsproxywidget.h>
-#include <QtGui/qgraphicsview.h>
-#include <QtGui/qwindowsstyle.h>
+#include <QtWidgets/qgraphicswidget.h>
+#include <QtWidgets/qgraphicsproxywidget.h>
+#include <QtWidgets/qgraphicsview.h>
+#include <QtWidgets/qwindowsstyle.h>
 
 class tst_QGraphicsAnchorLayout : public QObject {
     Q_OBJECT
diff --git a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro b/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro
index 535de0c07e4..bcad43fc122 100644
--- a/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro
+++ b/tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets widgets-private
 QT += core-private gui-private
 SOURCES += tst_qgraphicsanchorlayout1.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
index ee25291160b..04a28078dc6 100644
--- a/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
+++ b/tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp
@@ -43,7 +43,7 @@
 #include <QtTest/QtTest>
 #include <QTest>
 #include <QMetaType>
-#include <QtGui/qgraphicsanchorlayout.h>
+#include <QtWidgets/qgraphicsanchorlayout.h>
 #include <private/qgraphicsanchorlayout_p.h>
 
 #define TEST_COMPLEX_CASES
diff --git a/tests/auto/qgraphicseffect/qgraphicseffect.pro b/tests/auto/qgraphicseffect/qgraphicseffect.pro
index 963eca25c45..171ab3ffdad 100644
--- a/tests/auto/qgraphicseffect/qgraphicseffect.pro
+++ b/tests/auto/qgraphicseffect/qgraphicseffect.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES  += tst_qgraphicseffect.cpp
diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
index 78cb6ef3798..21424ac17a4 100644
--- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
+++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
@@ -41,13 +41,13 @@
 
 
 #include <QtTest/QtTest>
-#include <QtGui/qdesktopwidget.h>
-#include <QtGui/qgraphicseffect.h>
-#include <QtGui/qgraphicsview.h>
-#include <QtGui/qgraphicsscene.h>
-#include <QtGui/qgraphicsitem.h>
-#include <QtGui/qgraphicswidget.h>
-#include <QtGui/qstyleoption.h>
+#include <QtWidgets/qdesktopwidget.h>
+#include <QtWidgets/qgraphicseffect.h>
+#include <QtWidgets/qgraphicsview.h>
+#include <QtWidgets/qgraphicsscene.h>
+#include <QtWidgets/qgraphicsitem.h>
+#include <QtWidgets/qgraphicswidget.h>
+#include <QtWidgets/qstyleoption.h>
 
 #include "../../shared/util.h"
 #include <private/qgraphicseffect_p.h>
diff --git a/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro b/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro
index da437e959c2..44ec70eef34 100644
--- a/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro
+++ b/tests/auto/qgraphicseffectsource/qgraphicseffectsource.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES  += tst_qgraphicseffectsource.cpp
diff --git a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
index 9bf620f749e..472df8fed0c 100644
--- a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
+++ b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
@@ -40,11 +40,11 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtGui/qgraphicseffect.h>
-#include <QtGui/qgraphicsview.h>
-#include <QtGui/qgraphicsscene.h>
-#include <QtGui/qgraphicsitem.h>
-#include <QtGui/qstyleoption.h>
+#include <QtWidgets/qgraphicseffect.h>
+#include <QtWidgets/qgraphicsview.h>
+#include <QtWidgets/qgraphicsscene.h>
+#include <QtWidgets/qgraphicsitem.h>
+#include <QtWidgets/qstyleoption.h>
 
 #include <private/qgraphicseffect_p.h>
 
diff --git a/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro b/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro
index d66d639cddd..f0e9a4b0f80 100644
--- a/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro
+++ b/tests/auto/qgraphicsgridlayout/qgraphicsgridlayout.pro
@@ -1,4 +1,6 @@
 load(qttest_p4)
+
+QT += widgets
 SOURCES  += tst_qgraphicsgridlayout.cpp
 CONFIG += parallel_test
 
diff --git a/tests/auto/qgraphicsitem/qgraphicsitem.pro b/tests/auto/qgraphicsitem/qgraphicsitem.pro
index ed30cae759e..bfcf87721f9 100644
--- a/tests/auto/qgraphicsitem/qgraphicsitem.pro
+++ b/tests/auto/qgraphicsitem/qgraphicsitem.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets widgets-private
 QT += core-private gui-private
 SOURCES  += tst_qgraphicsitem.cpp
 DEFINES += QT_NO_CAST_TO_ASCII
diff --git a/tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro b/tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro
index 01875c7b507..5d723da32e4 100644
--- a/tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro
+++ b/tests/auto/qgraphicsitemanimation/qgraphicsitemanimation.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qgraphicsitemanimation.cpp
 DEFINES += QT_NO_CAST_TO_ASCII
 CONFIG += parallel_test
diff --git a/tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro b/tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro
index 816224bd8b9..ed9adf87fd8 100644
--- a/tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro
+++ b/tests/auto/qgraphicslayoutitem/qgraphicslayoutitem.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qgraphicslayoutitem.cpp
 CONFIG += parallel_test
 
diff --git a/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro b/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro
index df5a8277871..1f7ff0cc6ef 100644
--- a/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro
+++ b/tests/auto/qgraphicslinearlayout/qgraphicslinearlayout.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qgraphicslinearlayout.cpp
 CONFIG += parallel_test
 
diff --git a/tests/auto/qgraphicsobject/qgraphicsobject.pro b/tests/auto/qgraphicsobject/qgraphicsobject.pro
index 648a81f6c67..5232ec83721 100644
--- a/tests/auto/qgraphicsobject/qgraphicsobject.pro
+++ b/tests/auto/qgraphicsobject/qgraphicsobject.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets
 QT += core-private
 
 SOURCES  += tst_qgraphicsobject.cpp
diff --git a/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro b/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro
index 6b4db95ebe3..6b1ad34057c 100644
--- a/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro
+++ b/tests/auto/qgraphicspixmapitem/qgraphicspixmapitem.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qgraphicspixmapitem.cpp
 CONFIG += parallel_test
 
diff --git a/tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro b/tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro
index 4da949b71a7..2aa16751e62 100644
--- a/tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro
+++ b/tests/auto/qgraphicspolygonitem/qgraphicspolygonitem.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qgraphicspolygonitem.cpp
 CONFIG += parallel_test
 
diff --git a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro b/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro
index 72170083170..abe6c23b144 100644
--- a/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro
+++ b/tests/auto/qgraphicsproxywidget/qgraphicsproxywidget.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES  += tst_qgraphicsproxywidget.cpp
diff --git a/tests/auto/qgraphicsscene/qgraphicsscene.pro b/tests/auto/qgraphicsscene/qgraphicsscene.pro
index 635fb9b4e60..5b9afe1b1fe 100644
--- a/tests/auto/qgraphicsscene/qgraphicsscene.pro
+++ b/tests/auto/qgraphicsscene/qgraphicsscene.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets widgets-private
 QT += core-private gui-private
 SOURCES  += tst_qgraphicsscene.cpp
 RESOURCES += images.qrc
diff --git a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro b/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro
index 0d0fd0db1a4..5e61034d7c6 100644
--- a/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro
+++ b/tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 requires(contains(QT_CONFIG,private_tests))
+QT += widgets widgets-private
 QT += core-private gui-private
 SOURCES  += tst_qgraphicssceneindex.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
index fe949742cdb..3949b5f32e0 100644
--- a/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
+++ b/tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp
@@ -41,7 +41,7 @@
 
 
 #include <QtTest/QtTest>
-#include <QtGui/qgraphicsscene.h>
+#include <QtWidgets/qgraphicsscene.h>
 #include <private/qgraphicsscenebsptreeindex_p.h>
 #include <private/qgraphicssceneindex_p.h>
 #include <private/qgraphicsscenelinearindex_p.h>
diff --git a/tests/auto/qgraphicstransform/qgraphicstransform.pro b/tests/auto/qgraphicstransform/qgraphicstransform.pro
index 67c939ed8bf..4f9d0017173 100644
--- a/tests/auto/qgraphicstransform/qgraphicstransform.pro
+++ b/tests/auto/qgraphicstransform/qgraphicstransform.pro
@@ -1,3 +1,4 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qgraphicstransform.cpp
 CONFIG += parallel_test
diff --git a/tests/auto/qgraphicsview/qgraphicsview.pro b/tests/auto/qgraphicsview/qgraphicsview.pro
index 4d80caebaf6..55569e07bd4 100644
--- a/tests/auto/qgraphicsview/qgraphicsview.pro
+++ b/tests/auto/qgraphicsview/qgraphicsview.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES  += tst_qgraphicsview.cpp tst_qgraphicsview_2.cpp
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index 2d02ec052f1..d12f71178a1 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -51,25 +51,25 @@
 
 #include <math.h>
 
-#include <QtGui/QLabel>
+#include <QtWidgets/QLabel>
 #if !defined(QT_NO_STYLE_MOTIF)
-#include <QtGui/QMotifStyle>
+#include <QtWidgets/QMotifStyle>
 #endif
 #if !defined(QT_NO_STYLE_WINDOWS)
-#include <QtGui/QWindowsStyle>
+#include <QtWidgets/QWindowsStyle>
 #endif
 #if !defined(QT_NO_STYLE_PLASTIQUE)
-#include <QtGui/QPlastiqueStyle>
+#include <QtWidgets/QPlastiqueStyle>
 #endif
 #include <QtGui/QPainterPath>
-#include <QtGui/QRubberBand>
-#include <QtGui/QScrollBar>
-#include <QtGui/QStyleOption>
-#include <QtGui/QBoxLayout>
-#include <QtGui/QStyle>
-#include <QtGui/QPushButton>
-#include <QtGui/QInputContext>
-#include <QtGui/QDesktopWidget>
+#include <QtWidgets/QRubberBand>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QStyleOption>
+#include <QtWidgets/QBoxLayout>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QInputContext>
+#include <QtWidgets/QDesktopWidget>
 #include <private/qgraphicsview_p.h>
 #include "../../shared/util.h"
 #include "../platformquirks.h"
diff --git a/tests/auto/qgraphicswidget/qgraphicswidget.pro b/tests/auto/qgraphicswidget/qgraphicswidget.pro
index 4f568eefda9..359d606a0b3 100644
--- a/tests/auto/qgraphicswidget/qgraphicswidget.pro
+++ b/tests/auto/qgraphicswidget/qgraphicswidget.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES  += tst_qgraphicswidget.cpp
diff --git a/tests/auto/qgridlayout/qgridlayout.pro b/tests/auto/qgridlayout/qgridlayout.pro
index d034f1d031d..6bd42fe4328 100644
--- a/tests/auto/qgridlayout/qgridlayout.pro
+++ b/tests/auto/qgridlayout/qgridlayout.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES  += tst_qgridlayout.cpp
diff --git a/tests/auto/qgridlayout/tst_qgridlayout.cpp b/tests/auto/qgridlayout/tst_qgridlayout.cpp
index de4b115f7e9..0183be57553 100644
--- a/tests/auto/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/qgridlayout/tst_qgridlayout.cpp
@@ -46,9 +46,9 @@
 #include <qwidget.h>
 #include <qwindowsstyle.h>
 #include <qsizepolicy.h>
-#include <QtGui>
+//#include <QtGui>
 
-#include <QtGui/QWindowsStyle>
+#include <QtWidgets/QWindowsStyle>
 #include <QStyleFactory>
 
 #include "../../shared/util.h"
diff --git a/tests/auto/qgroupbox/qgroupbox.pro b/tests/auto/qgroupbox/qgroupbox.pro
index 5f5370f0cbc..f4181a33ed9 100644
--- a/tests/auto/qgroupbox/qgroupbox.pro
+++ b/tests/auto/qgroupbox/qgroupbox.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qgroupbox.cpp
 
 
diff --git a/tests/auto/qheaderview/qheaderview.pro b/tests/auto/qheaderview/qheaderview.pro
index 9910e4e89dd..3b3afa7e49b 100644
--- a/tests/auto/qheaderview/qheaderview.pro
+++ b/tests/auto/qheaderview/qheaderview.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES  += tst_qheaderview.cpp
diff --git a/tests/auto/qicon/qicon.pro b/tests/auto/qicon/qicon.pro
index 975aaf29738..419be9e3ba3 100644
--- a/tests/auto/qicon/qicon.pro
+++ b/tests/auto/qicon/qicon.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets
 SOURCES += tst_qicon.cpp
 RESOURCES = tst_qicon.qrc
 
diff --git a/tests/auto/qidentityproxymodel/qidentityproxymodel.pro b/tests/auto/qidentityproxymodel/qidentityproxymodel.pro
index f529e20c7f8..7df0e65d03e 100644
--- a/tests/auto/qidentityproxymodel/qidentityproxymodel.pro
+++ b/tests/auto/qidentityproxymodel/qidentityproxymodel.pro
@@ -2,5 +2,6 @@ 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/qimagereader/qimagereader.pro b/tests/auto/qimagereader/qimagereader.pro
index bf77fb7a2e4..7008d34ca71 100644
--- a/tests/auto/qimagereader/qimagereader.pro
+++ b/tests/auto/qimagereader/qimagereader.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES += tst_qimagereader.cpp
 MOC_DIR=tmp
-QT += core-private gui-private network
+QT += widgets widgets-private core-private gui-private network
 RESOURCES += qimagereader.qrc
 !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
 
diff --git a/tests/auto/qimagewriter/qimagewriter.pro b/tests/auto/qimagewriter/qimagewriter.pro
index bab241977bf..0fc40d0f0a9 100644
--- a/tests/auto/qimagewriter/qimagewriter.pro
+++ b/tests/auto/qimagewriter/qimagewriter.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qimagewriter.cpp
 MOC_DIR=tmp
 !contains(QT_CONFIG, no-tiff):DEFINES += QTEST_HAVE_TIFF
diff --git a/tests/auto/qinputcontext/qinputcontext.pro b/tests/auto/qinputcontext/qinputcontext.pro
index ec6831e5cfb..72626b87b43 100644
--- a/tests/auto/qinputcontext/qinputcontext.pro
+++ b/tests/auto/qinputcontext/qinputcontext.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qinputcontext.cpp
 
 symbian {
diff --git a/tests/auto/qinputdialog/qinputdialog.pro b/tests/auto/qinputdialog/qinputdialog.pro
index 2f68a40d912..f7e56bd7834 100644
--- a/tests/auto/qinputdialog/qinputdialog.pro
+++ b/tests/auto/qinputdialog/qinputdialog.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qinputdialog.cpp
 
 
diff --git a/tests/auto/qitemdelegate/qitemdelegate.pro b/tests/auto/qitemdelegate/qitemdelegate.pro
index 1206976868a..9a1a3b5e943 100644
--- a/tests/auto/qitemdelegate/qitemdelegate.pro
+++ b/tests/auto/qitemdelegate/qitemdelegate.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES         += tst_qitemdelegate.cpp
 
 win32:!wince*: LIBS += -lUser32
diff --git a/tests/auto/qitemmodel/modelstotest.cpp b/tests/auto/qitemmodel/modelstotest.cpp
index df06c952547..8a304b551b6 100644
--- a/tests/auto/qitemmodel/modelstotest.cpp
+++ b/tests/auto/qitemmodel/modelstotest.cpp
@@ -43,7 +43,6 @@
 #include <QtTest/QtTest>
 #include <QtCore/QtCore>
 #include <QtSql/QtSql>
-#include <QtGui/QtGui>
 #include <QSortFilterProxyModel>
 
 /*
diff --git a/tests/auto/qitemmodel/qitemmodel.pro b/tests/auto/qitemmodel/qitemmodel.pro
index b348a183f8b..97d55fcd4d6 100644
--- a/tests/auto/qitemmodel/qitemmodel.pro
+++ b/tests/auto/qitemmodel/qitemmodel.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES         += tst_qitemmodel.cpp
 
-QT += sql
+QT += widgets sql
 
 # NOTE: The deployment of the sqldrivers is disabled on purpose.
 #       If we deploy the plugins, they are loaded twice when running
diff --git a/tests/auto/qkeysequence/qkeysequence.pro b/tests/auto/qkeysequence/qkeysequence.pro
index 720c53d6278..6cfbe459ea3 100644
--- a/tests/auto/qkeysequence/qkeysequence.pro
+++ b/tests/auto/qkeysequence/qkeysequence.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES  += tst_qkeysequence.cpp
diff --git a/tests/auto/qlabel/qlabel.pro b/tests/auto/qlabel/qlabel.pro
index 4b510cca52b..6e9229f83ab 100644
--- a/tests/auto/qlabel/qlabel.pro
+++ b/tests/auto/qlabel/qlabel.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES += tst_qlabel.cpp
diff --git a/tests/auto/qlayout/qlayout.pro b/tests/auto/qlayout/qlayout.pro
index e84018f0a15..e6813ce164b 100644
--- a/tests/auto/qlayout/qlayout.pro
+++ b/tests/auto/qlayout/qlayout.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += gui-private
+QT += widgets widgets-private
 
 SOURCES += tst_qlayout.cpp
 wince*|symbian: {
diff --git a/tests/auto/qlayout/tst_qlayout.cpp b/tests/auto/qlayout/tst_qlayout.cpp
index f69a99c312d..69933bca8e1 100644
--- a/tests/auto/qlayout/tst_qlayout.cpp
+++ b/tests/auto/qlayout/tst_qlayout.cpp
@@ -49,9 +49,9 @@
 #include <qdialog.h>
 #include <qsizegrip.h>
 #include <qlabel.h>
-#include <QtGui/QFrame>
-#include <QtGui/QWindowsStyle>
-#include <QtGui/QSizePolicy>
+#include <QtWidgets/QFrame>
+#include <QtWidgets/QWindowsStyle>
+#include <QtWidgets/QSizePolicy>
 #include <QPushButton>
 #include <QRadioButton>
 #include <private/qlayoutengine_p.h>
diff --git a/tests/auto/qlcdnumber/qlcdnumber.pro b/tests/auto/qlcdnumber/qlcdnumber.pro
index 4f1b0091ba6..cd909de5be3 100644
--- a/tests/auto/qlcdnumber/qlcdnumber.pro
+++ b/tests/auto/qlcdnumber/qlcdnumber.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets
 SOURCES += tst_qlcdnumber.cpp
 
 
diff --git a/tests/auto/qlineedit/qlineedit.pro b/tests/auto/qlineedit/qlineedit.pro
index bb6d95027b1..9a9cb2bfe10 100644
--- a/tests/auto/qlineedit/qlineedit.pro
+++ b/tests/auto/qlineedit/qlineedit.pro
@@ -1,2 +1,3 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qlineedit.cpp
diff --git a/tests/auto/qlistview/qlistview.pro b/tests/auto/qlistview/qlistview.pro
index e62ade63c1e..6d004fcfc44 100644
--- a/tests/auto/qlistview/qlistview.pro
+++ b/tests/auto/qlistview/qlistview.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qlistview.cpp
 win32:!wince*: LIBS += -luser32
 
diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/qlistview/tst_qlistview.cpp
index ee033868444..2c06cf1cc2a 100644
--- a/tests/auto/qlistview/tst_qlistview.cpp
+++ b/tests/auto/qlistview/tst_qlistview.cpp
@@ -53,9 +53,9 @@
 #include <cmath>
 #endif
 #include <math.h>
-#include <QtGui/QScrollBar>
-#include <QtGui/QDialog>
-#include <QtGui/QStyledItemDelegate>
+#include <QtWidgets/QScrollBar>
+#include <QtWidgets/QDialog>
+#include <QtWidgets/QStyledItemDelegate>
 #if defined(Q_OS_WIN) || defined(Q_OS_WINCE)
 #include <windows.h>
 #endif
diff --git a/tests/auto/qlistwidget/qlistwidget.pro b/tests/auto/qlistwidget/qlistwidget.pro
index eb4c335b5bb..51a8e9afd28 100644
--- a/tests/auto/qlistwidget/qlistwidget.pro
+++ b/tests/auto/qlistwidget/qlistwidget.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets widgets-private
 QT += core-private gui-private
 SOURCES  += tst_qlistwidget.cpp
 
diff --git a/tests/auto/qmacstyle/qmacstyle.pro b/tests/auto/qmacstyle/qmacstyle.pro
index d80df70694b..9534e58bbec 100644
--- a/tests/auto/qmacstyle/qmacstyle.pro
+++ b/tests/auto/qmacstyle/qmacstyle.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qmacstyle.cpp
 
 
diff --git a/tests/auto/qmacstyle/tst_qmacstyle.cpp b/tests/auto/qmacstyle/tst_qmacstyle.cpp
index 1c24b0b0159..bafe9f17a0d 100644
--- a/tests/auto/qmacstyle/tst_qmacstyle.cpp
+++ b/tests/auto/qmacstyle/tst_qmacstyle.cpp
@@ -41,7 +41,7 @@
 
 
 #include <QtTest/QtTest>
-#include <QtGui>
+#include <QtWidgets>
 
 #include <qmacstyle_mac.h>
 
diff --git a/tests/auto/qmainwindow/qmainwindow.pro b/tests/auto/qmainwindow/qmainwindow.pro
index 0f6d71c6ecf..09633d0e323 100644
--- a/tests/auto/qmainwindow/qmainwindow.pro
+++ b/tests/auto/qmainwindow/qmainwindow.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
+QT += widgets widgets-private
 SOURCES += tst_qmainwindow.cpp
-QT += gui-private
 # Symbian toolchain does not support correct include semantics
 symbian:INCPATH+=..\\..\\..\\include\\QtGui\\private
 
diff --git a/tests/auto/qmdisubwindow/qmdisubwindow.pro b/tests/auto/qmdisubwindow/qmdisubwindow.pro
index 2b93523b224..a40cfd021b9 100644
--- a/tests/auto/qmdisubwindow/qmdisubwindow.pro
+++ b/tests/auto/qmdisubwindow/qmdisubwindow.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 INCLUDEPATH += .
 SOURCES  += tst_qmdisubwindow.cpp
 DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
diff --git a/tests/auto/qmenu/qmenu.pro b/tests/auto/qmenu/qmenu.pro
index 3a32920b140..089d9d516bf 100644
--- a/tests/auto/qmenu/qmenu.pro
+++ b/tests/auto/qmenu/qmenu.pro
@@ -1,2 +1,3 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qmenu.cpp
diff --git a/tests/auto/qmenubar/qmenubar.pro b/tests/auto/qmenubar/qmenubar.pro
index ba2dea8eb77..73c25457101 100644
--- a/tests/auto/qmenubar/qmenubar.pro
+++ b/tests/auto/qmenubar/qmenubar.pro
@@ -1,2 +1,3 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qmenubar.cpp
diff --git a/tests/auto/qmessagebox/qmessagebox.pro b/tests/auto/qmessagebox/qmessagebox.pro
index 9fa1738a796..cbec1db9b5a 100644
--- a/tests/auto/qmessagebox/qmessagebox.pro
+++ b/tests/auto/qmessagebox/qmessagebox.pro
@@ -4,6 +4,7 @@
 load(qttest_p4)
 TEMPLATE = app
 TARGET = tst_qmessagebox
+QT += widgets
 DEPENDPATH += .
 INCLUDEPATH += . 
 
diff --git a/tests/auto/qmetaobject/qmetaobject.pro b/tests/auto/qmetaobject/qmetaobject.pro
index 1df54f73bf2..7a4cf94e470 100644
--- a/tests/auto/qmetaobject/qmetaobject.pro
+++ b/tests/auto/qmetaobject/qmetaobject.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT = core gui
+QT = core gui widgets
 
 SOURCES  += tst_qmetaobject.cpp
 
diff --git a/tests/auto/qmouseevent/qmouseevent.pro b/tests/auto/qmouseevent/qmouseevent.pro
index 0e5ddadc1f7..58cebd3d061 100644
--- a/tests/auto/qmouseevent/qmouseevent.pro
+++ b/tests/auto/qmouseevent/qmouseevent.pro
@@ -1,2 +1,3 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qmouseevent.cpp
diff --git a/tests/auto/qmouseevent_modal/qmouseevent_modal.pro b/tests/auto/qmouseevent_modal/qmouseevent_modal.pro
index 33b8eb6954a..2f28de26755 100644
--- a/tests/auto/qmouseevent_modal/qmouseevent_modal.pro
+++ b/tests/auto/qmouseevent_modal/qmouseevent_modal.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qmouseevent_modal.cpp
 
 
diff --git a/tests/auto/qmovie/qmovie.pro b/tests/auto/qmovie/qmovie.pro
index 855eb9e17a6..3e085ceeaf0 100644
--- a/tests/auto/qmovie/qmovie.pro
+++ b/tests/auto/qmovie/qmovie.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qmovie.cpp
 MOC_DIR=tmp
 
diff --git a/tests/auto/qpainter/qpainter.pro b/tests/auto/qpainter/qpainter.pro
index 0a1bebcfb6f..3e68a44f030 100644
--- a/tests/auto/qpainter/qpainter.pro
+++ b/tests/auto/qpainter/qpainter.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += gui-private
+QT += widgets widgets-private
 
 SOURCES  += tst_qpainter.cpp
 wince*|symbian: {
diff --git a/tests/auto/qpalette/qpalette.pro b/tests/auto/qpalette/qpalette.pro
index 4ec7876f6ae..4b240e5f9c2 100644
--- a/tests/auto/qpalette/qpalette.pro
+++ b/tests/auto/qpalette/qpalette.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qpalette.cpp
 
 
diff --git a/tests/auto/qpicture/qpicture.pro b/tests/auto/qpicture/qpicture.pro
index 9979fe35592..eb96b73487b 100644
--- a/tests/auto/qpicture/qpicture.pro
+++ b/tests/auto/qpicture/qpicture.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qpicture.cpp
 
 
diff --git a/tests/auto/qpixmap/qpixmap.pro b/tests/auto/qpixmap/qpixmap.pro
index f5df30cc1d3..456928f1f66 100644
--- a/tests/auto/qpixmap/qpixmap.pro
+++ b/tests/auto/qpixmap/qpixmap.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += core-private gui-private
+QT += core-private gui-private widgets widgets-private
 
 SOURCES  += tst_qpixmap.cpp
 wince*|symbian: {
diff --git a/tests/auto/qpixmapfilter/qpixmapfilter.pro b/tests/auto/qpixmapfilter/qpixmapfilter.pro
index d52a3c39a32..21e10b7ab90 100644
--- a/tests/auto/qpixmapfilter/qpixmapfilter.pro
+++ b/tests/auto/qpixmapfilter/qpixmapfilter.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += gui-private
 
 SOURCES  += tst_qpixmapfilter.cpp
diff --git a/tests/auto/qplaintextedit/qplaintextedit.pro b/tests/auto/qplaintextedit/qplaintextedit.pro
index fef1ac83aa8..feac5e3f439 100644
--- a/tests/auto/qplaintextedit/qplaintextedit.pro
+++ b/tests/auto/qplaintextedit/qplaintextedit.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += gui-private
 
 INCLUDEPATH += ../
diff --git a/tests/auto/qpointer/qpointer.pro b/tests/auto/qpointer/qpointer.pro
index a30a6fa42b7..5728b7bb4f1 100644
--- a/tests/auto/qpointer/qpointer.pro
+++ b/tests/auto/qpointer/qpointer.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qpointer.cpp
 
 
diff --git a/tests/auto/qpolygon/qpolygon.pro b/tests/auto/qpolygon/qpolygon.pro
index e832666d7c1..186b704d17b 100644
--- a/tests/auto/qpolygon/qpolygon.pro
+++ b/tests/auto/qpolygon/qpolygon.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qpolygon.cpp
 
 unix:!mac:!symbian:LIBS+=-lm
diff --git a/tests/auto/qprinter/qprinter.pro b/tests/auto/qprinter/qprinter.pro
index ef310b82c89..35bca772b0b 100644
--- a/tests/auto/qprinter/qprinter.pro
+++ b/tests/auto/qprinter/qprinter.pro
@@ -1,2 +1,3 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qprinter.cpp
diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp
index b1c4c4ee3c2..fb26ce0ab5f 100644
--- a/tests/auto/qprinter/tst_qprinter.cpp
+++ b/tests/auto/qprinter/tst_qprinter.cpp
@@ -533,11 +533,13 @@ void tst_QPrinter::testMulitpleSets()
 
 void tst_QPrinter::changingOutputFormat()
 {
+#if QT_VERSION < 0x050000
     QPrinter p;
     p.setOutputFormat(QPrinter::PostScriptFormat);
     p.setPageSize(QPrinter::A8);
     p.setOutputFormat(QPrinter::PdfFormat);
     QCOMPARE(p.pageSize(), QPrinter::A8);
+#endif
 }
 
 void tst_QPrinter::outputFormatFromSuffix()
@@ -546,8 +548,6 @@ void tst_QPrinter::outputFormatFromSuffix()
         QSKIP("No printers available.", SkipAll);
     QPrinter p;
     QVERIFY(p.outputFormat() == QPrinter::NativeFormat);
-    p.setOutputFileName("test.ps");
-    QVERIFY(p.outputFormat() == QPrinter::PostScriptFormat);
     p.setOutputFileName("test.pdf");
     QVERIFY(p.outputFormat() == QPrinter::PdfFormat);
     p.setOutputFileName(QString());
@@ -647,7 +647,7 @@ void tst_QPrinter::testPageMargins()
 void tst_QPrinter::valuePreservation()
 {
     QPrinter::OutputFormat oldFormat = QPrinter::PdfFormat;
-    QPrinter::OutputFormat newFormat = QPrinter::PostScriptFormat;
+    QPrinter::OutputFormat newFormat = QPrinter::NativeFormat; // TODO: Correct?
 
     {
         QPrinter printer;
diff --git a/tests/auto/qprocess/testGuiProcess/main.cpp b/tests/auto/qprocess/testGuiProcess/main.cpp
index 1df5dcf3e11..9352fe5029f 100644
--- a/tests/auto/qprocess/testGuiProcess/main.cpp
+++ b/tests/auto/qprocess/testGuiProcess/main.cpp
@@ -38,7 +38,8 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtGui>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QLabel>
 #include <stdio.h>
 
 int main(int argc, char **argv)
diff --git a/tests/auto/qprocess/testGuiProcess/testGuiProcess.pro b/tests/auto/qprocess/testGuiProcess/testGuiProcess.pro
index 15a9e8e4e47..b26a583deef 100644
--- a/tests/auto/qprocess/testGuiProcess/testGuiProcess.pro
+++ b/tests/auto/qprocess/testGuiProcess/testGuiProcess.pro
@@ -1,4 +1,5 @@
 SOURCES += main.cpp
+QT += widgets
 CONFIG += console
 DESTDIR = ./
 
diff --git a/tests/auto/qprogressbar/qprogressbar.pro b/tests/auto/qprogressbar/qprogressbar.pro
index 6f0d7728fee..70d8c9111f5 100644
--- a/tests/auto/qprogressbar/qprogressbar.pro
+++ b/tests/auto/qprogressbar/qprogressbar.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qprogressbar.cpp
 
 
diff --git a/tests/auto/qprogressdialog/qprogressdialog.pro b/tests/auto/qprogressdialog/qprogressdialog.pro
index 3a98d0b0171..f3861e4cd37 100644
--- a/tests/auto/qprogressdialog/qprogressdialog.pro
+++ b/tests/auto/qprogressdialog/qprogressdialog.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets
 SOURCES += tst_qprogressdialog.cpp
 
 
diff --git a/tests/auto/qpropertyanimation/qpropertyanimation.pro b/tests/auto/qpropertyanimation/qpropertyanimation.pro
index 6d6ddbf65bd..4dfd558610d 100644
--- a/tests/auto/qpropertyanimation/qpropertyanimation.pro
+++ b/tests/auto/qpropertyanimation/qpropertyanimation.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
-QT = core gui
+QT = core gui widgets
 SOURCES  += tst_qpropertyanimation.cpp
 
 
diff --git a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
index 4411b4a2a09..7ce61f55395 100644
--- a/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
+++ b/tests/auto/qpropertyanimation/tst_qpropertyanimation.cpp
@@ -44,7 +44,7 @@
 
 #include <QtCore/qpropertyanimation.h>
 #include <QtCore/qvariantanimation.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 #include "../../shared/util.h"
 
 //TESTED_CLASS=QPropertyAnimation
diff --git a/tests/auto/qpushbutton/qpushbutton.pro b/tests/auto/qpushbutton/qpushbutton.pro
index 0d5f9418e1b..e2fd4559514 100644
--- a/tests/auto/qpushbutton/qpushbutton.pro
+++ b/tests/auto/qpushbutton/qpushbutton.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qpushbutton.cpp
 
 
diff --git a/tests/auto/qradiobutton/qradiobutton.pro b/tests/auto/qradiobutton/qradiobutton.pro
index 90e23ab2e04..82b2ff20a86 100644
--- a/tests/auto/qradiobutton/qradiobutton.pro
+++ b/tests/auto/qradiobutton/qradiobutton.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qradiobutton.cpp
 
 
diff --git a/tests/auto/qscrollarea/qscrollarea.pro b/tests/auto/qscrollarea/qscrollarea.pro
index bcb2ff347c4..5b2602bbdbc 100644
--- a/tests/auto/qscrollarea/qscrollarea.pro
+++ b/tests/auto/qscrollarea/qscrollarea.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets
 SOURCES += tst_qscrollarea.cpp
 
 
diff --git a/tests/auto/qscrollbar/qscrollbar.pro b/tests/auto/qscrollbar/qscrollbar.pro
index 63a923f8812..69c32cbded4 100644
--- a/tests/auto/qscrollbar/qscrollbar.pro
+++ b/tests/auto/qscrollbar/qscrollbar.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qscrollbar.cpp
 
 
diff --git a/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro b/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro
index db647a55c5f..c947e7a246d 100644
--- a/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro
+++ b/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro
@@ -1,3 +1,4 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qsharedpointer_and_qwidget.cpp
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp b/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp
index 7d36ab5fee4..feb3ce8f382 100644
--- a/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp
+++ b/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QWidget>
-#include <QtGui/QPushButton>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QPushButton>
 #include <QtTest/QtTest>
 
 QT_BEGIN_NAMESPACE
diff --git a/tests/auto/qshortcut/qshortcut.pro b/tests/auto/qshortcut/qshortcut.pro
index 61e24b570a9..3f68d2377e3 100644
--- a/tests/auto/qshortcut/qshortcut.pro
+++ b/tests/auto/qshortcut/qshortcut.pro
@@ -4,6 +4,7 @@ load(qttest_p4)
 INCLUDEPATH  += ../
 
 # Normal Test Files --------------------------------------------------
+QT += widgets
 HEADERS      += 
 SOURCES      += tst_qshortcut.cpp
 
diff --git a/tests/auto/qsidebar/qsidebar.pro b/tests/auto/qsidebar/qsidebar.pro
index 3ace4fe8a52..6487d201a4b 100644
--- a/tests/auto/qsidebar/qsidebar.pro
+++ b/tests/auto/qsidebar/qsidebar.pro
@@ -1,6 +1,7 @@
 CONFIG += qttest_p4
 
 QT += core-private
+QT += widgets widgets-private
 SOURCES		+= tst_qsidebar.cpp 
 TARGET		= tst_qsidebar
 
diff --git a/tests/auto/qsidebar/tst_qsidebar.cpp b/tests/auto/qsidebar/tst_qsidebar.cpp
index 2286bd24c15..db09a821110 100644
--- a/tests/auto/qsidebar/tst_qsidebar.cpp
+++ b/tests/auto/qsidebar/tst_qsidebar.cpp
@@ -41,8 +41,8 @@
 
 
 #include <QtTest/QtTest>
-#include "../../../src/gui/dialogs/qsidebar_p.h"
-#include "../../../src/gui/dialogs/qfilesystemmodel_p.h"
+#include "../../../src/widgets/dialogs/qsidebar_p.h"
+#include "../../../src/widgets/dialogs/qfilesystemmodel_p.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qsignalmapper/qsignalmapper.pro b/tests/auto/qsignalmapper/qsignalmapper.pro
index 3215a5943d7..5af4b70c634 100644
--- a/tests/auto/qsignalmapper/qsignalmapper.pro
+++ b/tests/auto/qsignalmapper/qsignalmapper.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qsignalmapper.cpp
 
 
diff --git a/tests/auto/qsizegrip/qsizegrip.pro b/tests/auto/qsizegrip/qsizegrip.pro
index 7bc43d52838..da6dd5af498 100644
--- a/tests/auto/qsizegrip/qsizegrip.pro
+++ b/tests/auto/qsizegrip/qsizegrip.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 INCLUDEPATH += .
+QT += widgets
 SOURCES += tst_qsizegrip.cpp
 
 
diff --git a/tests/auto/qslider/qslider.pro b/tests/auto/qslider/qslider.pro
index 32fcc81941e..41f011649d6 100644
--- a/tests/auto/qslider/qslider.pro
+++ b/tests/auto/qslider/qslider.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets
 SOURCES += tst_qslider.cpp
 
 
diff --git a/tests/auto/qspinbox/qspinbox.pro b/tests/auto/qspinbox/qspinbox.pro
index a65554a0872..56a58dadce3 100644
--- a/tests/auto/qspinbox/qspinbox.pro
+++ b/tests/auto/qspinbox/qspinbox.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qspinbox.cpp
 
 
diff --git a/tests/auto/qsplitter/qsplitter.pro b/tests/auto/qsplitter/qsplitter.pro
index bca4fc40fd4..a0e6878aa9b 100644
--- a/tests/auto/qsplitter/qsplitter.pro
+++ b/tests/auto/qsplitter/qsplitter.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qsplitter.cpp
 
-
 wince*|symbian: {
    addFiles.files = extradata.txt setSizes3.dat
    addFiles.path = .
diff --git a/tests/auto/qsql/tst_qsql.cpp b/tests/auto/qsql/tst_qsql.cpp
index 7f3c63b5107..b6025c65926 100644
--- a/tests/auto/qsql/tst_qsql.cpp
+++ b/tests/auto/qsql/tst_qsql.cpp
@@ -41,7 +41,7 @@
 
 
 #include <QtTest/QtTest>
-#include <qapplication.h>
+#include <qguiapplication.h>
 #include <qsqldatabase.h>
 #include <qsqlerror.h>
 #include <qsqlquery.h>
@@ -117,7 +117,7 @@ void tst_QSql::cleanup()
 void tst_QSql::basicDriverTest()
 {
     int argc = 0;
-    QApplication app( argc, 0, false );
+    QGuiApplication app( argc, 0, false );
     tst_Databases dbs;
     dbs.open();
 
@@ -187,7 +187,7 @@ void tst_QSql::openInvalid()
 void tst_QSql::concurrentAccess()
 {
     int argc = 0;
-    QApplication app( argc, 0, false );
+    QGuiApplication app( argc, 0, false );
     tst_Databases dbs;
 
     dbs.open();
@@ -215,7 +215,7 @@ void tst_QSql::concurrentAccess()
 void tst_QSql::openErrorRecovery()
 {
     int argc = 0;
-    QApplication app( argc, 0, false );
+    QGuiApplication app( argc, 0, false );
     tst_Databases dbs;
 
     dbs.addDbs();
@@ -262,7 +262,7 @@ void tst_QSql::openErrorRecovery()
 void tst_QSql::registerSqlDriver()
 {
     int argc = 0;
-    QApplication app( argc, 0, false );
+    QGuiApplication app( argc, 0, false );
 
     QSqlDatabase::registerSqlDriver( "QSQLTESTDRIVER", new QSqlDriverCreator<QSqlNullDriver> );
     QVERIFY( QSqlDatabase::drivers().contains( "QSQLTESTDRIVER" ) );
diff --git a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
index 4b23e94715e..0664bae6e98 100644
--- a/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
+++ b/tests/auto/qsqlquerymodel/qsqlquerymodel.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES  += tst_qsqlquerymodel.cpp
 
-QT += sql
+QT += widgets sql
 
 wince*: {
    DEPLOYMENT_PLUGIN += qsqlite
diff --git a/tests/auto/qstackedlayout/qstackedlayout.pro b/tests/auto/qstackedlayout/qstackedlayout.pro
index 1fbf5d33dbb..30f074d9b11 100644
--- a/tests/auto/qstackedlayout/qstackedlayout.pro
+++ b/tests/auto/qstackedlayout/qstackedlayout.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qstackedlayout.cpp
 
 
diff --git a/tests/auto/qstackedwidget/qstackedwidget.pro b/tests/auto/qstackedwidget/qstackedwidget.pro
index b0ddc33077c..c9436c6a86b 100644
--- a/tests/auto/qstackedwidget/qstackedwidget.pro
+++ b/tests/auto/qstackedwidget/qstackedwidget.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets
 SOURCES += tst_qstackedwidget.cpp
 
 
diff --git a/tests/auto/qstandarditem/qstandarditem.pro b/tests/auto/qstandarditem/qstandarditem.pro
index 9f22729a7d1..1d280fc2f59 100644
--- a/tests/auto/qstandarditem/qstandarditem.pro
+++ b/tests/auto/qstandarditem/qstandarditem.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qstandarditem.cpp
 
 
diff --git a/tests/auto/qstandarditemmodel/qstandarditemmodel.pro b/tests/auto/qstandarditemmodel/qstandarditemmodel.pro
index 0fc47b36241..8c634b9630b 100644
--- a/tests/auto/qstandarditemmodel/qstandarditemmodel.pro
+++ b/tests/auto/qstandarditemmodel/qstandarditemmodel.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES  += tst_qstandarditemmodel.cpp
diff --git a/tests/auto/qstatemachine/qstatemachine.pro b/tests/auto/qstatemachine/qstatemachine.pro
index ab71202f180..c038199bfbe 100644
--- a/tests/auto/qstatemachine/qstatemachine.pro
+++ b/tests/auto/qstatemachine/qstatemachine.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
-QT = core core-private gui
+QT += widgets
+QT += core core-private gui
 SOURCES  += tst_qstatemachine.cpp
 
diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp
index 56b0c9bf8a0..2bc55501d1d 100644
--- a/tests/auto/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp
@@ -41,10 +41,10 @@
 
 #include <QtTest/QtTest>
 #include <QtCore/QCoreApplication>
-#include <QtGui/QPushButton>
-#include <QtGui/QGraphicsScene>
-#include <QtGui/QGraphicsSceneEvent>
-#include <QtGui/QGraphicsTextItem>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QGraphicsScene>
+#include <QtWidgets/QGraphicsSceneEvent>
+#include <QtWidgets/QGraphicsTextItem>
 
 #include "qstatemachine.h"
 #include "qstate.h"
diff --git a/tests/auto/qstatictext/qstatictext.pro b/tests/auto/qstatictext/qstatictext.pro
index 0c16c4c1496..c8c36f81f70 100644
--- a/tests/auto/qstatictext/qstatictext.pro
+++ b/tests/auto/qstatictext/qstatictext.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
-QT = core core-private gui gui-private
+QT += widgets widgets-private
+QT += core core-private gui gui-private
 SOURCES  += tst_qstatictext.cpp
 
diff --git a/tests/auto/qstatictext/tst_qstatictext.cpp b/tests/auto/qstatictext/tst_qstatictext.cpp
index 0c4857a79df..360b50f7798 100644
--- a/tests/auto/qstatictext/tst_qstatictext.cpp
+++ b/tests/auto/qstatictext/tst_qstatictext.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtGui/QPainter>
 #include <QtGui/QImage>
 
diff --git a/tests/auto/qstatusbar/qstatusbar.pro b/tests/auto/qstatusbar/qstatusbar.pro
index 6c79001af11..51ec0e9cdb5 100644
--- a/tests/auto/qstatusbar/qstatusbar.pro
+++ b/tests/auto/qstatusbar/qstatusbar.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qstatusbar.cpp
 
 
diff --git a/tests/auto/qstringlistmodel/qstringlistmodel.pro b/tests/auto/qstringlistmodel/qstringlistmodel.pro
index 9a71d9fc64c..fe70ed73456 100644
--- a/tests/auto/qstringlistmodel/qstringlistmodel.pro
+++ b/tests/auto/qstringlistmodel/qstringlistmodel.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 HEADERS += qmodellistener.h
 
 SOURCES         += tst_qstringlistmodel.cpp
diff --git a/tests/auto/qstyle/qstyle.pro b/tests/auto/qstyle/qstyle.pro
index eb198e28f52..5c949fa56ad 100644
--- a/tests/auto/qstyle/qstyle.pro
+++ b/tests/auto/qstyle/qstyle.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 TARGET.EPOCHEAPSIZE = 0x200000 0x800000
+QT += widgets
 SOURCES  += tst_qstyle.cpp
 
 wince*|symbian: {
diff --git a/tests/auto/qstyleoption/qstyleoption.pro b/tests/auto/qstyleoption/qstyleoption.pro
index 523d9b39464..ccbb39d55bc 100644
--- a/tests/auto/qstyleoption/qstyleoption.pro
+++ b/tests/auto/qstyleoption/qstyleoption.pro
@@ -4,7 +4,7 @@
 
 load(qttest_p4)
 TEMPLATE = app
-
+QT += widgets
 # Input
 SOURCES += tst_qstyleoption.cpp
 
diff --git a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro
index 1575616b19b..9dc296a51c7 100644
--- a/tests/auto/qstylesheetstyle/qstylesheetstyle.pro
+++ b/tests/auto/qstylesheetstyle/qstylesheetstyle.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets widgets-private
 QT += gui-private
 # Input
 SOURCES += tst_qstylesheetstyle.cpp
diff --git a/tests/auto/qsystemtrayicon/qsystemtrayicon.pro b/tests/auto/qsystemtrayicon/qsystemtrayicon.pro
index a77b4788a1a..8a6ea3d0a99 100644
--- a/tests/auto/qsystemtrayicon/qsystemtrayicon.pro
+++ b/tests/auto/qsystemtrayicon/qsystemtrayicon.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets
 SOURCES += tst_qsystemtrayicon.cpp
 
 
diff --git a/tests/auto/qtabbar/qtabbar.pro b/tests/auto/qtabbar/qtabbar.pro
index 15aa11d9fa8..befe5704ba0 100644
--- a/tests/auto/qtabbar/qtabbar.pro
+++ b/tests/auto/qtabbar/qtabbar.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qtabbar.cpp
 
 
diff --git a/tests/auto/qtableview/qtableview.pro b/tests/auto/qtableview/qtableview.pro
index 16284b23b4b..6e7f8a323a8 100644
--- a/tests/auto/qtableview/qtableview.pro
+++ b/tests/auto/qtableview/qtableview.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 TARGET.EPOCHEAPSIZE = 0x200000 0x800000
diff --git a/tests/auto/qtablewidget/qtablewidget.pro b/tests/auto/qtablewidget/qtablewidget.pro
index d66d0ac67fa..0f09203fd1d 100644
--- a/tests/auto/qtablewidget/qtablewidget.pro
+++ b/tests/auto/qtablewidget/qtablewidget.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qtablewidget.cpp
 
 # This prevents the GCCE compile failure: "elf2e32: Error 1063: Fatal Error in
diff --git a/tests/auto/qtabwidget/qtabwidget.pro b/tests/auto/qtabwidget/qtabwidget.pro
index 69296cae2b9..1b07543d8ad 100644
--- a/tests/auto/qtabwidget/qtabwidget.pro
+++ b/tests/auto/qtabwidget/qtabwidget.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += gui-private
+QT += widgets widgets-private
 
 INCLUDEPATH += ../
 
diff --git a/tests/auto/qtabwidget/tst_qtabwidget.cpp b/tests/auto/qtabwidget/tst_qtabwidget.cpp
index c305150af4e..9ed0964f3a2 100644
--- a/tests/auto/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/qtabwidget/tst_qtabwidget.cpp
@@ -45,7 +45,7 @@
 #include <qdebug.h>
 #include <qapplication.h>
 #include <qlabel.h>
-#include <QtGui/qboxlayout.h>
+#include <QtWidgets/qboxlayout.h>
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qtcpsocket/test/test.pro b/tests/auto/qtcpsocket/test/test.pro
index e282de1a2e8..6077610a3fc 100644
--- a/tests/auto/qtcpsocket/test/test.pro
+++ b/tests/auto/qtcpsocket/test/test.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets
 QT += core-private network-private
 SOURCES += ../tst_qtcpsocket.cpp
 win32: {
diff --git a/tests/auto/qtextblock/qtextblock.pro b/tests/auto/qtextblock/qtextblock.pro
index 5558a715064..d50ef5ca787 100644
--- a/tests/auto/qtextblock/qtextblock.pro
+++ b/tests/auto/qtextblock/qtextblock.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += core-private gui-private
 
 SOURCES  += tst_qtextblock.cpp
diff --git a/tests/auto/qtextblock/tst_qtextblock.cpp b/tests/auto/qtextblock/tst_qtextblock.cpp
index 748d9210e02..7937969b71a 100644
--- a/tests/auto/qtextblock/tst_qtextblock.cpp
+++ b/tests/auto/qtextblock/tst_qtextblock.cpp
@@ -43,8 +43,9 @@
 #include <QtTest/QtTest>
 
 
-#define private public
+#define protected public
 #include <qtextdocument.h>
+#undef protected
 #include <qdebug.h>
 #ifndef Q_WS_WIN
 #include <private/qtextdocument_p.h>
@@ -118,9 +119,8 @@ void tst_QTextBlock::fragmentOverBlockBoundaries()
     // Block separators are always a fragment of their self. Thus:
     // |Hello|\b|World|\b|
 #if !defined(Q_WS_WIN) && !defined(Q_WS_S60)
-    QVERIFY(doc->d_func()->fragmentMap().numNodes() == 4);
+    QVERIFY(doc->docHandle()->fragmentMap().numNodes() == 4);
 #endif
-
     QCOMPARE(cursor.block().text(), QString("Hello"));
     cursor.movePosition(QTextCursor::NextBlock);
     QCOMPARE(cursor.block().text(), QString("World"));
diff --git a/tests/auto/qtextbrowser/qtextbrowser.pro b/tests/auto/qtextbrowser/qtextbrowser.pro
index 415f9cace2e..80c18c5dbc7 100644
--- a/tests/auto/qtextbrowser/qtextbrowser.pro
+++ b/tests/auto/qtextbrowser/qtextbrowser.pro
@@ -2,6 +2,7 @@ load(qttest_p4)
 SOURCES += tst_qtextbrowser.cpp
 !symbian:DEFINES += SRCDIR=\\\"$$PWD\\\"
 
+QT += widgets
 
 wince*|symbian: {
    addFiles.files = *.html
diff --git a/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro b/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro
index b2dc6a1f689..32b05ce0614 100644
--- a/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro
+++ b/tests/auto/qtextdocumentlayout/qtextdocumentlayout.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qtextdocumentlayout.cpp
 
 
diff --git a/tests/auto/qtextedit/qtextedit.pro b/tests/auto/qtextedit/qtextedit.pro
index 58517633100..56a73f64780 100644
--- a/tests/auto/qtextedit/qtextedit.pro
+++ b/tests/auto/qtextedit/qtextedit.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += gui-private
+QT += widgets widgets-private gui-private
 INCLUDEPATH += ../
 
 HEADERS +=  
diff --git a/tests/auto/qtextobject/qtextobject.pro b/tests/auto/qtextobject/qtextobject.pro
index 1715fa65a33..e87a364ab61 100644
--- a/tests/auto/qtextobject/qtextobject.pro
+++ b/tests/auto/qtextobject/qtextobject.pro
@@ -3,7 +3,7 @@
 ############################################################
 
 load(qttest_p4)
-
+QT += widgets
 SOURCES += tst_qtextobject.cpp
 
 
diff --git a/tests/auto/qtextpiecetable/qtextpiecetable.pro b/tests/auto/qtextpiecetable/qtextpiecetable.pro
index edcb0a091c6..cfbbe2bca56 100644
--- a/tests/auto/qtextpiecetable/qtextpiecetable.pro
+++ b/tests/auto/qtextpiecetable/qtextpiecetable.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets widgets-private
 QT += core-private gui-private
 SOURCES  += tst_qtextpiecetable.cpp
 HEADERS += ../qtextdocument/common.h
diff --git a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
index 12f17a890b0..1fb5c301edd 100644
--- a/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
+++ b/tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp
@@ -42,9 +42,10 @@
 
 #include <QtTest/QtTest>
 
-#define private public
+#define protected public
 
 #include <qtextdocument.h>
+#undef protected
 #include <private/qtextdocument_p.h>
 #include <qabstracttextdocumentlayout.h>
 #include <qtextobject.h>
@@ -124,7 +125,7 @@ tst_QTextPieceTable::tst_QTextPieceTable()
 void tst_QTextPieceTable::init()
 {
     doc = new QTextDocument(0);
-    table = doc->d_func();
+    table = doc->docHandle();
     blockFormatIndex = table->formatCollection()->indexForFormat(QTextBlockFormat());
     charFormatIndex = table->formatCollection()->indexForFormat(QTextCharFormat());
 }
diff --git a/tests/auto/qtexttable/qtexttable.pro b/tests/auto/qtexttable/qtexttable.pro
index 6ab64bfa943..611b706fc4e 100644
--- a/tests/auto/qtexttable/qtexttable.pro
+++ b/tests/auto/qtexttable/qtexttable.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qtexttable.cpp
 
 
diff --git a/tests/auto/qtoolbar/qtoolbar.pro b/tests/auto/qtoolbar/qtoolbar.pro
index 2c1176fe004..b340097d814 100644
--- a/tests/auto/qtoolbar/qtoolbar.pro
+++ b/tests/auto/qtoolbar/qtoolbar.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets widgets-private
 QT += gui-private
 SOURCES += tst_qtoolbar.cpp
 
diff --git a/tests/auto/qtoolbox/qtoolbox.pro b/tests/auto/qtoolbox/qtoolbox.pro
index 00c4549ee29..24f3ea6cb98 100644
--- a/tests/auto/qtoolbox/qtoolbox.pro
+++ b/tests/auto/qtoolbox/qtoolbox.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qtoolbox.cpp
 
 
diff --git a/tests/auto/qtoolbutton/qtoolbutton.pro b/tests/auto/qtoolbutton/qtoolbutton.pro
index d30d0926705..5f082682ad3 100644
--- a/tests/auto/qtoolbutton/qtoolbutton.pro
+++ b/tests/auto/qtoolbutton/qtoolbutton.pro
@@ -1,2 +1,3 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qtoolbutton.cpp
diff --git a/tests/auto/qtooltip/qtooltip.pro b/tests/auto/qtooltip/qtooltip.pro
index 0bd0e42c489..4a78dfd3de3 100644
--- a/tests/auto/qtooltip/qtooltip.pro
+++ b/tests/auto/qtooltip/qtooltip.pro
@@ -1,2 +1,3 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qtooltip.cpp
diff --git a/tests/auto/qtranslator/qtranslator.pro b/tests/auto/qtranslator/qtranslator.pro
index 0001d1c329a..c87af7b7333 100644
--- a/tests/auto/qtranslator/qtranslator.pro
+++ b/tests/auto/qtranslator/qtranslator.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qtranslator.cpp
 RESOURCES += qtranslator.qrc
 
diff --git a/tests/auto/qtreeview/qtreeview.pro b/tests/auto/qtreeview/qtreeview.pro
index b7d30bd9ccd..9440a660b93 100644
--- a/tests/auto/qtreeview/qtreeview.pro
+++ b/tests/auto/qtreeview/qtreeview.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qtreeview.cpp
 
 
diff --git a/tests/auto/qtreewidget/qtreewidget.pro b/tests/auto/qtreewidget/qtreewidget.pro
index bc38239c6fe..5668be1da77 100644
--- a/tests/auto/qtreewidget/qtreewidget.pro
+++ b/tests/auto/qtreewidget/qtreewidget.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qtreewidget.cpp
 
 
diff --git a/tests/auto/qtreewidgetitemiterator/qtreewidgetitemiterator.pro b/tests/auto/qtreewidgetitemiterator/qtreewidgetitemiterator.pro
index 0af47a3bcc2..de7762e7731 100644
--- a/tests/auto/qtreewidgetitemiterator/qtreewidgetitemiterator.pro
+++ b/tests/auto/qtreewidgetitemiterator/qtreewidgetitemiterator.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qtreewidgetitemiterator.cpp
 
 
diff --git a/tests/auto/qundogroup/qundogroup.pro b/tests/auto/qundogroup/qundogroup.pro
index 5d5676ded9d..f853669d746 100644
--- a/tests/auto/qundogroup/qundogroup.pro
+++ b/tests/auto/qundogroup/qundogroup.pro
@@ -1,4 +1,5 @@
 CONFIG += qttest_p4
+QT += widgets
 SOURCES += tst_qundogroup.cpp
 TARGET = tst_qundogroup
 
diff --git a/tests/auto/qundostack/qundostack.pro b/tests/auto/qundostack/qundostack.pro
index c7643f9d036..c7f11303f4f 100644
--- a/tests/auto/qundostack/qundostack.pro
+++ b/tests/auto/qundostack/qundostack.pro
@@ -1,4 +1,5 @@
 CONFIG += qttest_p4
+QT += widgets
 SOURCES += tst_qundostack.cpp
 TARGET = tst_qundostack
 
diff --git a/tests/auto/qvariant/qvariant.pro b/tests/auto/qvariant/qvariant.pro
index 4824c11078f..6a56048bd21 100644
--- a/tests/auto/qvariant/qvariant.pro
+++ b/tests/auto/qvariant/qvariant.pro
@@ -1,3 +1,3 @@
 load(qttest_p4)
 SOURCES  += tst_qvariant.cpp
-QT += network
+QT += widgets network
diff --git a/tests/auto/qwidget_window/qwidget_window.pro b/tests/auto/qwidget_window/qwidget_window.pro
index df7d68739b2..dd5837012c0 100644
--- a/tests/auto/qwidget_window/qwidget_window.pro
+++ b/tests/auto/qwidget_window/qwidget_window.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qwidget_window.cpp
 
 x11 {
diff --git a/tests/auto/qwidgetaction/qwidgetaction.pro b/tests/auto/qwidgetaction/qwidgetaction.pro
index cc80e58fe32..3e037c2efb6 100644
--- a/tests/auto/qwidgetaction/qwidgetaction.pro
+++ b/tests/auto/qwidgetaction/qwidgetaction.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qwidgetaction.cpp 
 
 
diff --git a/tests/auto/qwindowsurface/qwindowsurface.pro b/tests/auto/qwindowsurface/qwindowsurface.pro
index f236793b910..f1e8bf6070d 100644
--- a/tests/auto/qwindowsurface/qwindowsurface.pro
+++ b/tests/auto/qwindowsurface/qwindowsurface.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT += widgets widgets-private
 QT += gui-private
 
 SOURCES += tst_qwindowsurface.cpp
diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
index b2092582246..8140cfc5045 100644
--- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
+++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
@@ -45,7 +45,7 @@
 #include <QPalette>
 #include <QWindowsStyle>
 
-#ifndef Q_WS_MAC
+#if !defined(Q_WS_MAC) && QT_VERSION < 0x050000 // Fixme Qt 5
 
 #include <private/qwindowsurface_p.h>
 #include <QDesktopWidget>
diff --git a/tests/auto/qwizard/qwizard.pro b/tests/auto/qwizard/qwizard.pro
index a22e45cf19d..6d508470c7f 100644
--- a/tests/auto/qwizard/qwizard.pro
+++ b/tests/auto/qwizard/qwizard.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qwizard.cpp
 #SOURCES  += /home/jasmin/dev/solutions/widgets/qtwizard/src/qtwizard.cpp
 #HEADERS  += /home/jasmin/dev/solutions/widgets/qtwizard/src/qtwizard.h
diff --git a/tests/auto/qworkspace/qworkspace.pro b/tests/auto/qworkspace/qworkspace.pro
index de4d29a2290..0b8a604fe8b 100644
--- a/tests/auto/qworkspace/qworkspace.pro
+++ b/tests/auto/qworkspace/qworkspace.pro
@@ -1,2 +1,3 @@
 load(qttest_p4)
+QT += widgets
 SOURCES  += tst_qworkspace.cpp
diff --git a/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp b/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp
index 257915e28dc..1049195ad7f 100644
--- a/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp
+++ b/tests/benchmarks/corelib/kernel/qmetaobject/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets/QTreeView>
 #include <qtest.h>
 
 class LotsOfSignals : public QObject
diff --git a/tests/benchmarks/corelib/kernel/qobject/main.cpp b/tests/benchmarks/corelib/kernel/qobject/main.cpp
index 801e3689129..0445e5ecbd1 100644
--- a/tests/benchmarks/corelib/kernel/qobject/main.cpp
+++ b/tests/benchmarks/corelib/kernel/qobject/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 #include <QtCore>
-#include <QtGui>
+#include <QtWidgets/QTreeView>
 #include <qtest.h>
 #include "object.h"
 #include <qcoreapplication.h>
diff --git a/tests/benchmarks/corelib/kernel/qobject/qobject.pro b/tests/benchmarks/corelib/kernel/qobject/qobject.pro
index 1baaf58b7bf..37a06ad8f9e 100644
--- a/tests/benchmarks/corelib/kernel/qobject/qobject.pro
+++ b/tests/benchmarks/corelib/kernel/qobject/qobject.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 TEMPLATE = app
 TARGET = tst_bench_qobject
 DEPENDPATH += .
diff --git a/tests/benchmarks/gui/animation/qanimation/main.cpp b/tests/benchmarks/gui/animation/qanimation/main.cpp
index b203949ed52..90d2a1c0083 100644
--- a/tests/benchmarks/gui/animation/qanimation/main.cpp
+++ b/tests/benchmarks/gui/animation/qanimation/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui>
+#include <QtWidgets>
 #include <qtest.h>
 
 #include "dummyobject.h"
diff --git a/tests/benchmarks/gui/animation/qanimation/qanimation.pro b/tests/benchmarks/gui/animation/qanimation/qanimation.pro
index 53a139a6605..6efd2c1d8b0 100644
--- a/tests/benchmarks/gui/animation/qanimation/qanimation.pro
+++ b/tests/benchmarks/gui/animation/qanimation/qanimation.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 TEMPLATE = app
 TARGET = tst_bench_qanimation
 DEPENDPATH += .
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
index 3ede6e8c853..df8248e431f 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 TEMPLATE = app
 TARGET = tst_bench_qgraphicsanchorlayout
 
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
index e879b3efb99..b34ed0d092a 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
@@ -40,10 +40,10 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QtGui/qgraphicsanchorlayout.h>
-#include <QtGui/qgraphicslinearlayout.h>
-#include <QtGui/qgraphicswidget.h>
-#include <QtGui/qgraphicsview.h>
+#include <QtWidgets/qgraphicsanchorlayout.h>
+#include <QtWidgets/qgraphicslinearlayout.h>
+#include <QtWidgets/qgraphicswidget.h>
+#include <QtWidgets/qgraphicsview.h>
 
 class tst_QGraphicsAnchorLayout : public QObject
 {
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro b/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
index d4935c0c6a0..ac8a5d25174 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 TEMPLATE = app
 TARGET = tst_bench_qgraphicsitem
 
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro b/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro
index 1b7a5dc6415..3b168f2c160 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 TEMPLATE = app
 TARGET = tst_bench_qgraphicsscene
 
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp
index acc056eefe0..3e6ec440d90 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.cpp
@@ -41,7 +41,7 @@
 
 #include "chip.h"
 
-#include <QtGui>
+#include <QtWidgets>
 
 Chip::Chip(const QColor &color, int x, int y)
 {
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h
index 4bd1b172f37..09facb7f90e 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chip.h
@@ -43,7 +43,7 @@
 #define CHIP_H
 
 #include <QtGui/QColor>
-#include <QtGui/QGraphicsItem>
+#include <QtWidgets/QGraphicsItem>
 
 class Chip : public QGraphicsItem
 {
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h
index 805e2f471d4..af93b634f5d 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.h
@@ -42,7 +42,9 @@
 #ifndef CHIPTESTER_H
 #define CHIPTESTER_H
 
-#include <QtGui>
+#include <QtWidgets/QGraphicsView>
+#include <QtCore/QEventLoop>
+#include <QtCore/QTime>
 
 QT_FORWARD_DECLARE_CLASS(QGraphicsScene)
 QT_FORWARD_DECLARE_CLASS(QGraphicsView)
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri
index a9e0bf82723..8d02504b73f 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/chiptester/chiptester.pri
@@ -9,4 +9,5 @@ HEADERS += \
 RESOURCES += \
         chiptester/images.qrc
 
+QT += widgets
 contains(QT_CONFIG, opengl) QT += opengl
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
index bfa374cdf82..0a9536a74f9 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 TEMPLATE = app
 TARGET = tst_bench_qgraphicsview
 
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index d2e0c917ec4..aca8c1466a2 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/benchmarks/gui/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -40,11 +40,13 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QDebug>
-#include <QGraphicsItem>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QImage>
+#include <QtCore/QDebug>
+#include <QtWidgets/QGraphicsItem>
+#include <QtWidgets/QGraphicsScene>
+#include <QtWidgets/QGraphicsView>
+#include <QtGui/QImage>
+#include <QtGui/QPixmapCache>
+#include <QtWidgets/QDesktopWidget>
 
 #include "chiptester/chiptester.h"
 //#define CALLGRIND_DEBUG
diff --git a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
index ed532377a11..367625dee66 100644
--- a/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
+++ b/tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 TEMPLATE = app
 TARGET = tst_bench_qgraphicswidget
 TEMPLATE = app
diff --git a/tests/benchmarks/gui/gui.pro b/tests/benchmarks/gui/gui.pro
index d8254583c59..9cf701fa335 100644
--- a/tests/benchmarks/gui/gui.pro
+++ b/tests/benchmarks/gui/gui.pro
@@ -15,4 +15,4 @@ TRUSTED_BENCHMARKS += \
     graphicsview/qgraphicsview \
     painting/qtracebench
 
-include(../trusted-benchmarks.pri)
\ No newline at end of file
+include(../trusted-benchmarks.pri)
diff --git a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro
index db5ffcd01d2..0fb1e2509d6 100644
--- a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro
+++ b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 TEMPLATE = app
 TARGET = tst_bench_qimagereader
 
diff --git a/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro b/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
index 3f4d4e135cd..23383b0953b 100644
--- a/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
+++ b/tests/benchmarks/gui/itemviews/qtableview/qtableview.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 TEMPLATE = app
 TARGET = tst_bench_qtableview
 
diff --git a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro
index e12a60c54c5..ad424015e2f 100644
--- a/tests/benchmarks/gui/kernel/qapplication/qapplication.pro
+++ b/tests/benchmarks/gui/kernel/qapplication/qapplication.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 TEMPLATE = app
 TARGET = tst_bench_qapplication
 DEPENDPATH += .
diff --git a/tests/benchmarks/gui/kernel/qwidget/qwidget.pro b/tests/benchmarks/gui/kernel/qwidget/qwidget.pro
index 4c6e5c724df..1637bcddbe8 100644
--- a/tests/benchmarks/gui/kernel/qwidget/qwidget.pro
+++ b/tests/benchmarks/gui/kernel/qwidget/qwidget.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
 
+QT += widgets
 TARGET = tst_bench_qwidget
 SOURCES += tst_qwidget.cpp
diff --git a/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp b/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp
index bcb12664901..86219210d1e 100644
--- a/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/benchmarks/gui/kernel/qwidget/tst_qwidget.cpp
@@ -40,7 +40,9 @@
 ****************************************************************************/
 
 #include <qtest.h>
-#include <QtGui>
+
+#include <QtWidgets/QLayout>
+#include <QtGui/QPainter>
 
 static void processEvents()
 {
diff --git a/tests/benchmarks/gui/painting/qpainter/qpainter.pro b/tests/benchmarks/gui/painting/qpainter/qpainter.pro
index 78b4f1a4e52..51a481df850 100644
--- a/tests/benchmarks/gui/painting/qpainter/qpainter.pro
+++ b/tests/benchmarks/gui/painting/qpainter/qpainter.pro
@@ -1,6 +1,7 @@
 load(qttest_p4)
 
-QT += gui-private
+QT += widgets
+QT += gui-private widgets-private
 
 TEMPLATE = app
 TARGET = tst_bench_qpainter
diff --git a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
index 895d7bff63c..47016d5d122 100644
--- a/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp
@@ -45,6 +45,7 @@
 #include <QDialog>
 #include <QImage>
 #include <QPaintEngine>
+#include <QTileRules>
 #include <math.h>
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
diff --git a/tests/benchmarks/gui/painting/qtbench/qtbench.pro b/tests/benchmarks/gui/painting/qtbench/qtbench.pro
index 91f416de79f..675f4477e27 100644
--- a/tests/benchmarks/gui/painting/qtbench/qtbench.pro
+++ b/tests/benchmarks/gui/painting/qtbench/qtbench.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 TEMPLATE = app
 TARGET = tst_qtbench
 
diff --git a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
index 4f527f62b3e..6384fc4cb7d 100644
--- a/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
+++ b/tests/benchmarks/gui/painting/qtracebench/qtracebench.pro
@@ -1,6 +1,7 @@
 load(qttest_p4)
 
-QT += core-private gui-private
+QT += widgets
+QT += core-private gui-private widgets-private
 
 TEMPLATE = app
 TARGET = tst_qtracebench
diff --git a/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp b/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp
index 759e9302044..bb58834d62f 100644
--- a/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp
+++ b/tests/benchmarks/gui/styles/qstylesheetstyle/main.cpp
@@ -40,7 +40,16 @@
 ****************************************************************************/
 // This file contains benchmarks for QRect/QRectF functions.
 
-#include <QtGui>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QRadioButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QProgressBar>
+#include <QtWidgets/QLineEdit>
 #include <qtest.h>
 
 class tst_qstylesheetstyle : public QObject
diff --git a/tests/benchmarks/gui/text/qtext/qtext.pro b/tests/benchmarks/gui/text/qtext/qtext.pro
index 27465b0897c..4e2530b4a84 100644
--- a/tests/benchmarks/gui/text/qtext/qtext.pro
+++ b/tests/benchmarks/gui/text/qtext/qtext.pro
@@ -1,6 +1,7 @@
 load(qttest_p4)
 
-QT += gui-private
+QT += widgets
+QT += gui-private widgets-private
 
 TEMPLATE = app
 TARGET = tst_bench_QText