Fix autotest gui/widgets dependencies

This is in preparation of removing testlib's
dependency on QtGui and QtWidgets.

Autotests that need QtWidgets api must
explicitly include it (since the types are no
longer provided by the QtGui master header).

Autotests that don't need QtGui or QtWidgets
api shouldn't link against those libraries.

Change-Id: I2808289068514fcac582808828ad4634e2631733
Reviewed-on: http://codereview.qt-project.org/5093
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

49 files changed, 59 insertions, 17 deletions

diff --git a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
index 7436edcd8c..e3b96e82bb 100644
--- a/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
+++ b/tests/auto/corelib/io/qsettings/tst_qsettings.cpp
@@ -45,12 +45,12 @@
 
 #include <QtCore/QSettings>
 #include <private/qsettings_p.h>
-//#include <QtGui/QApplication>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QtGlobal>
 #include <QtCore/QMetaType>
 #include <QtCore/QtDebug>
 #include <QtCore/QString>
+#include <QtGui/QKeySequence>
 #include "../../../../shared/util.h"
 
 #if !defined(Q_OS_SYMBIAN)
diff --git a/tests/auto/corelib/kernel/qitemmodel/modelstotest.cpp b/tests/auto/corelib/kernel/qitemmodel/modelstotest.cpp
index 82c28b5303..496789d408 100644
--- a/tests/auto/corelib/kernel/qitemmodel/modelstotest.cpp
+++ b/tests/auto/corelib/kernel/qitemmodel/modelstotest.cpp
@@ -43,6 +43,7 @@
 #include <QtTest/QtTest>
 #include <QtCore/QtCore>
 #include <QtSql/QtSql>
+#include <QtWidgets/QtWidgets>
 #include <QSortFilterProxyModel>
 
 /*
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index faab1f5532..2e2e58a90d 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -3313,7 +3313,7 @@ void tst_QObject::deleteQObjectWhenDeletingEvent()
     };
 
     QObject o;
-    QApplication::postEvent(&o, new MyEvent);
+    QGuiApplication::postEvent(&o, new MyEvent);
     QCoreApplication::removePostedEvents(&o); // here you would get a deadlock
 }
 
diff --git a/tests/auto/corelib/tools/qlist/qlist.pro b/tests/auto/corelib/tools/qlist/qlist.pro
index be599b7b85..708589e74d 100644
--- a/tests/auto/corelib/tools/qlist/qlist.pro
+++ b/tests/auto/corelib/tools/qlist/qlist.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT = core
 SOURCES  += tst_qlist.cpp
 
 
diff --git a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
index 3cfcc49b04..7d497573b7 100644
--- a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
+++ b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui/QtGui>
+#include <QtWidgets/QtWidgets>
 #include <QtTest/QtTest>
 
 #include <stddef.h>
diff --git a/tests/auto/gui/kernel/qfileopenevent/qfileopenevent.pro b/tests/auto/gui/kernel/qfileopenevent/qfileopenevent.pro
index 73724828db..45978d7b7e 100644
--- a/tests/auto/gui/kernel/qfileopenevent/qfileopenevent.pro
+++ b/tests/auto/gui/kernel/qfileopenevent/qfileopenevent.pro
@@ -1,3 +1,2 @@
 TEMPLATE = subdirs
-QT += widgets
 SUBDIRS = test qfileopeneventexternal
diff --git a/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp b/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp
index 69cc4ccc01..3916f420a6 100644
--- a/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp
+++ b/tests/auto/gui/kernel/qfileopenevent/test/tst_qfileopenevent.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include <QtTest/QtTest>
-#include <QEvent>
+#include <QtGui/qevent.h>
 
 #ifdef Q_OS_SYMBIAN
 #include <apgcli.h>
diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
index 401f79cbc2..d76265c42a 100644
--- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
+++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui>
+#include <QtWidgets>
 #include <QtTest>
 
 class tst_QTouchEventWidget : public QWidget
diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
index c2c9002023..2bb99f6a5f 100644
--- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
+++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp
@@ -44,6 +44,7 @@
 #include "../../../../shared/util.h"
 
 #include <qpainter.h>
+#include <qdrawutil.h>
 #include <qapplication.h>
 #include <qwidget.h>
 #include <qfontmetrics.h>
diff --git a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
index 1e82431a48..f2ff30f591 100644
--- a/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
+++ b/tests/auto/gui/text/qcssparser/tst_qcssparser.cpp
@@ -43,6 +43,8 @@
 #if defined(Q_OS_WINCE)
 #include <QtGui/QFontDatabase>
 #endif
+#include <QtGui/QFontInfo>
+#include <QtGui/QFontMetrics>
 
 //TESTED_CLASS=QCss
 //TESTED_FILES=gui/text/qcssparser.cpp gui/text/qcssparser_p.h
diff --git a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
index 1df61d0a06..5e3aacf37e 100644
--- a/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
+++ b/tests/auto/gui/text/qfontdatabase/tst_qfontdatabase.cpp
@@ -44,6 +44,8 @@
 
 
 #include <qfontdatabase.h>
+#include <qfontinfo.h>
+#include <qfontmetrics.h>
 
 #ifdef Q_OS_SYMBIAN
 #define SRCDIR "."
@@ -232,7 +234,7 @@ void tst_QFontDatabase::addAppFont_data()
 void tst_QFontDatabase::addAppFont()
 {
     QFETCH(bool, useMemoryFont);
-    QSignalSpy fontDbChangedSpy(QApplication::instance(), SIGNAL(fontDatabaseChanged()));
+    QSignalSpy fontDbChangedSpy(QGuiApplication::instance(), SIGNAL(fontDatabaseChanged()));
 
     QFontDatabase db;
 
diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index 68c7a285ef..79d01d8842 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -2469,7 +2469,7 @@ void tst_QTextDocumentFragment::html_anchorColor()
     setHtml("<span style=\"color: red;\"><a href=\"http://www.kde.org/\">Blue</a></span>");
     cursor.movePosition(QTextCursor::Start);
     cursor.movePosition(QTextCursor::NextCharacter);
-    QVERIFY(cursor.charFormat().foreground().color() == QApplication::palette().link().color());
+    QVERIFY(cursor.charFormat().foreground().color() == QGuiApplication::palette().link().color());
 
     setHtml("<span style=\"color: red;\"><a href=\"http://www.kde.org/\" style=\"color: yellow;\">Green</a></span>");
     cursor.movePosition(QTextCursor::Start);
diff --git a/tests/auto/modeltest/tst_modeltest.cpp b/tests/auto/modeltest/tst_modeltest.cpp
index aba0894c30..434537a81f 100644
--- a/tests/auto/modeltest/tst_modeltest.cpp
+++ b/tests/auto/modeltest/tst_modeltest.cpp
@@ -42,6 +42,7 @@
 
 #include <QtTest/QtTest>
 #include <QtGui/QtGui>
+#include <QtWidgets/QtWidgets>
 
 #include "modeltest.h"
 #include "dynamictreemodel.h"
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index 9389120a95..abd6998035 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -44,6 +44,7 @@
 #ifndef Q_OS_WINCE
 #include "../../shared/util.h"
 #include <QtGui>
+#include <QtWidgets>
 #include <math.h>
 
 #if defined(Q_OS_WIN) && defined(interface)
diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/qapplication/tst_qapplication.cpp
index 997f9a5b38..af26bcb3e1 100644
--- a/tests/auto/qapplication/tst_qapplication.cpp
+++ b/tests/auto/qapplication/tst_qapplication.cpp
@@ -47,6 +47,7 @@
 
 #include "qabstracteventdispatcher.h"
 #include <QtGui>
+#include <QtWidgets>
 
 #include "private/qapplication_p.h"
 #include "private/qstylesheetstyle_p.h"
diff --git a/tests/auto/qboxlayout/tst_qboxlayout.cpp b/tests/auto/qboxlayout/tst_qboxlayout.cpp
index 9ad53a89dc..4e5b357de5 100644
--- a/tests/auto/qboxlayout/tst_qboxlayout.cpp
+++ b/tests/auto/qboxlayout/tst_qboxlayout.cpp
@@ -42,6 +42,7 @@
 
 #include <QtTest/QtTest>
 #include <QtGui>
+#include <QtWidgets>
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qcolordialog/tst_qcolordialog.cpp b/tests/auto/qcolordialog/tst_qcolordialog.cpp
index 5d04362d39..98430fe6c7 100644
--- a/tests/auto/qcolordialog/tst_qcolordialog.cpp
+++ b/tests/auto/qcolordialog/tst_qcolordialog.cpp
@@ -42,6 +42,7 @@
 
 #include <QtTest/QtTest>
 #include <QtGui/QtGui>
+#include <QtWidgets/QColorDialog>
 
 #include "../../shared/util.h"
 
diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp
index c1467c6c5b..013479410e 100644
--- a/tests/auto/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/qcompleter/tst_qcompleter.cpp
@@ -38,11 +38,10 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QtGui>
-#include "qcompleter.h"
 
 #include <QtTest/QtTest>
 #include <QtGui>
+#include <QtWidgets>
 #include <QtDebug>
 #include <QPair>
 #include <QList>
diff --git a/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp b/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
index 57af3b10a7..7488195497 100644
--- a/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
+++ b/tests/auto/qdatawidgetmapper/tst_qdatawidgetmapper.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include <QtGui/QtGui>
+#include <QtWidgets/QtWidgets>
 #include <QtTest/QtTest>
 
 class tst_QDataWidgetMapper: public QObject
diff --git a/tests/auto/qformlayout/tst_qformlayout.cpp b/tests/auto/qformlayout/tst_qformlayout.cpp
index f35933d0dc..4425205eb9 100644
--- a/tests/auto/qformlayout/tst_qformlayout.cpp
+++ b/tests/auto/qformlayout/tst_qformlayout.cpp
@@ -47,6 +47,10 @@
 #include <qwindowsstyle.h>
 #include <qsizepolicy.h>
 
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QPlastiqueStyle>
 #include <QtWidgets/QWindowsStyle>
 #include <QStyleFactory>
 
diff --git a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
index 6124dd5ced..4f618c27a6 100644
--- a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
@@ -42,6 +42,7 @@
 
 #include <QtTest/QtTest>
 #include <QtGui>
+#include <QtWidgets>
 #include <math.h>
 
 #include "../../shared/util.h"
diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index 29c6591ccd..1afc70079d 100644
--- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -42,6 +42,7 @@
 
 #include <QtTest/QtTest>
 #include <QtGui>
+#include <QtWidgets>
 #include "../../shared/util.h"
 #include <private/qgraphicsproxywidget_p.h>
 #include <private/qlayoutengine_p.h>    // qSmartMin functions...
diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index 194e023d05..910f0bb688 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -46,6 +46,7 @@
 #endif
 
 #include <QtGui>
+#include <QtWidgets>
 #include <private/qgraphicsscene_p.h>
 #include <private/qgraphicssceneindex_p.h>
 #include <math.h>
diff --git a/tests/auto/qgridlayout/tst_qgridlayout.cpp b/tests/auto/qgridlayout/tst_qgridlayout.cpp
index d52729a273..486522bc90 100644
--- a/tests/auto/qgridlayout/tst_qgridlayout.cpp
+++ b/tests/auto/qgridlayout/tst_qgridlayout.cpp
@@ -48,6 +48,9 @@
 #include <qsizepolicy.h>
 //#include <QtGui>
 
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QRadioButton>
 #include <QtWidgets/QWindowsStyle>
 #include <QStyleFactory>
 
diff --git a/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp
index 7a3a8e5547..ae36d9e5d7 100644
--- a/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp
+++ b/tests/auto/qidentityproxymodel/tst_qidentityproxymodel.cpp
@@ -45,6 +45,7 @@
 
 #include <QtCore>
 #include <QtGui>
+#include <QtWidgets>
 
 #include "dynamictreemodel.h"
 #include "qidentityproxymodel.h"
diff --git a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp b/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
index 61a9c332b4..53c00dab0e 100644
--- a/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
+++ b/tests/auto/qitemeditorfactory/tst_qitemeditorfactory.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 #include <QtGui/QtGui>
+#include <QtWidgets/QtWidgets>
 #include <QtTest/QtTest>
 
 class tst_QItemEditorFactory: public QObject
diff --git a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
index b7bc47c310..f7ce339854 100644
--- a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
+++ b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
@@ -43,6 +43,7 @@
 #include <QtTest/QtTest>
 
 #include <QtGui/QtGui>
+#include <QtWidgets/QtWidgets>
 
 //TESTED_CLASS=
 //TESTED_FILES=
diff --git a/tests/auto/qitemview/viewstotest.cpp b/tests/auto/qitemview/viewstotest.cpp
index 690e1c2218..b61ecd5c2a 100644
--- a/tests/auto/qitemview/viewstotest.cpp
+++ b/tests/auto/qitemview/viewstotest.cpp
@@ -43,6 +43,7 @@
 #include <QtTest/QtTest>
 #include <QtCore/QtCore>
 #include <QtGui/QtGui>
+#include <QtWidgets/QtWidgets>
 
 /*
     To add a view to be tested add the header file to the includes
diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp
index c53ded3a97..e8c6f6e0a2 100644
--- a/tests/auto/qlistwidget/tst_qlistwidget.cpp
+++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp
@@ -42,6 +42,7 @@
 
 #include <QtTest/QtTest>
 #include <QtGui/QtGui>
+#include <QtWidgets/QtWidgets>
 #include <qeventloop.h>
 #include <qlist.h>
 
diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
index 5356449a3a..2455637fe4 100644
--- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
+++ b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp
@@ -42,6 +42,7 @@
 
 #include <QtTest/QtTest>
 #include <QtGui>
+#include <QtWidgets>
 #include <QtCore>
 #include <QtNetwork/QNetworkAccessManager>
 #include <QtNetwork/QNetworkRequest>
diff --git a/tests/auto/qopengl/tst_qopengl.cpp b/tests/auto/qopengl/tst_qopengl.cpp
index 577fbafe4a..61e0bb49ba 100644
--- a/tests/auto/qopengl/tst_qopengl.cpp
+++ b/tests/auto/qopengl/tst_qopengl.cpp
@@ -41,6 +41,10 @@
 
 
 #include <QtGui/private/qopenglcontext_p.h>
+#include <QtGui/QOpenGLFramebufferObject>
+#include <QtGui/QOpenGLPaintDevice>
+#include <QtGui/QPainter>
+#include <QtGui/QScreen>
 #include <QtGui/QWindow>
 
 #include <QtTest/QtTest>
diff --git a/tests/auto/qscroller/tst_qscroller.cpp b/tests/auto/qscroller/tst_qscroller.cpp
index aab91a673f..7e7405b113 100644
--- a/tests/auto/qscroller/tst_qscroller.cpp
+++ b/tests/auto/qscroller/tst_qscroller.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include <QtGui>
+#include <QtWidgets>
 #include <QtTest>
 // #include <QDebug>
 
diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index 093bcd2c86..b8a9b6252b 100644
--- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -48,7 +48,7 @@
 
 #include <QtCore>
 #include <QtGui>
-#include <QtWidgets/QSortFilterProxyModel>
+#include <QtWidgets>
 
 #include <qdebug.h>
 
diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
index ed2e768683..0ff28396d5 100644
--- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 #include <QtCore>
 #include <QtGui>
+#include <QtWidgets>
 #include <QtTest/QtTest>
 #include <QtDebug>
 #include <QMetaObject>
diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp
index c6da79a1b7..24c3627dd0 100644
--- a/tests/auto/qtableview/tst_qtableview.cpp
+++ b/tests/auto/qtableview/tst_qtableview.cpp
@@ -41,6 +41,7 @@
 
 
 #include <QtGui/QtGui>
+#include <QtWidgets/QtWidgets>
 #include <private/qtablewidget_p.h>
 #include <QtTest/QtTest>
 #include "../../shared/util.h"
diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp
index 16c243c4a8..e80837fd0e 100644
--- a/tests/auto/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/qtreeview/tst_qtreeview.cpp
@@ -45,6 +45,7 @@
 
 #include <QtTest/QtTest>
 #include <QtGui/QtGui>
+#include <QtWidgets/QtWidgets>
 #include "../../shared/util.h"
 
 //TESTED_CLASS=
diff --git a/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro
index ee78b79c36..effbf73449 100644
--- a/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro
+++ b/tests/auto/sql/kernel/qsqldatabase/qsqldatabase.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES  += tst_qsqldatabase.cpp
 
-QT += sql
+QT = core sql
 
 win32: {
    !wince*: LIBS += -lws2_32
diff --git a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
index c02d74a527..25364555fe 100644
--- a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
+++ b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES  += tst_qsqldriver.cpp
 
-QT += sql
+QT = core sql
 
 wince*: {
    plugFiles.files = ../../../plugins/sqldrivers
diff --git a/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro
index 2359151f13..9a82d0cf2b 100644
--- a/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro
+++ b/tests/auto/sql/kernel/qsqlfield/qsqlfield.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES  += tst_qsqlfield.cpp
 
-QT += sql
+QT = core sql
 
 symbian {
     qt_not_deployed {
diff --git a/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro
index 16e3ae4f80..bc653585d7 100644
--- a/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro
+++ b/tests/auto/sql/kernel/qsqlrecord/qsqlrecord.pro
@@ -14,7 +14,7 @@ symbian {
     TARGET.EPOCHEAPSIZE=50000 5000000
 }
 
-QT += sql
+QT = core sql
 
 
 
diff --git a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
index fabba48d7c..25fc893c77 100644
--- a/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
+++ b/tests/auto/sql/models/qsqlquerymodel/tst_qsqlquerymodel.cpp
@@ -42,6 +42,7 @@
 
 #include <QtTest/QtTest>
 #include <QtGui>
+#include <QtWidgets>
 
 #include <qsqldriver.h>
 #include <qsqldatabase.h>
diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
index dad42d512c..7561a63020 100644
--- a/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
+++ b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES  += tst_qsqlrelationaltablemodel.cpp
 
-QT += sql
+QT = core sql
 
 wince*: {
    plugFiles.files = ../../../plugins/sqldrivers
diff --git a/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro b/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro
index e49020f0a6..697690d3f0 100644
--- a/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro
+++ b/tests/auto/sql/models/qsqltablemodel/qsqltablemodel.pro
@@ -1,7 +1,7 @@
 load(qttest_p4)
 SOURCES  += tst_qsqltablemodel.cpp
 
-QT += sql
+QT = core sql
 
 wince*: {
    plugFiles.files = ../../../plugins/sqldrivers
diff --git a/tests/auto/testlib/selftests/test/test.pro b/tests/auto/testlib/selftests/test/test.pro
index af3370bac0..2ad2483294 100644
--- a/tests/auto/testlib/selftests/test/test.pro
+++ b/tests/auto/testlib/selftests/test/test.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 SOURCES += ../tst_selftests.cpp
-QT += core xml testlib-private
+QT = core xml testlib-private
 
 TARGET = ../tst_selftests
 
diff --git a/tests/auto/testlib/selftests/xunit/xunit.pro b/tests/auto/testlib/selftests/xunit/xunit.pro
index e523520ed6..d118fc0202 100644
--- a/tests/auto/testlib/selftests/xunit/xunit.pro
+++ b/tests/auto/testlib/selftests/xunit/xunit.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT = core
 
 # this is not a real testcase ('make check' should not run it)
 CONFIG -= testcase
diff --git a/tests/auto/tools/moc/moc.pro b/tests/auto/tools/moc/moc.pro
index f91c2f5b85..bbc6c1dc14 100644
--- a/tests/auto/tools/moc/moc.pro
+++ b/tests/auto/tools/moc/moc.pro
@@ -20,6 +20,7 @@ HEADERS += using-namespaces.h no-keywords.h task87883.h c-comments.h backslash-n
 if(*-g++*|*-icc*|*-clang|*-llvm):!irix-*:!win32-*: HEADERS += os9-newlines.h win-newlines.h
 SOURCES += tst_moc.cpp
 
+QT -= gui
 QT += sql network
 contains(QT_CONFIG, dbus){
     DEFINES += WITH_DBUS
diff --git a/tests/auto/tools/rcc/rcc.pro b/tests/auto/tools/rcc/rcc.pro
index 1759b48a0e..1b85ff586a 100644
--- a/tests/auto/tools/rcc/rcc.pro
+++ b/tests/auto/tools/rcc/rcc.pro
@@ -1,5 +1,6 @@
 CONFIG += qttest_p4
 
+QT = core
 TARGET = tst_rcc
 
 SOURCES += tst_rcc.cpp
diff --git a/tests/auto/tools/uic/uic.pro b/tests/auto/tools/uic/uic.pro
index 37c9a1e430..4528a29ca9 100644
--- a/tests/auto/tools/uic/uic.pro
+++ b/tests/auto/tools/uic/uic.pro
@@ -1,5 +1,6 @@
 load(qttest_p4)
 
+QT = core
 SOURCES += tst_uic.cpp
 TARGET = tst_uic
 
diff --git a/tests/auto/v8/v8.pro b/tests/auto/v8/v8.pro
index feda53bf50..f83c6c8053 100644
--- a/tests/auto/v8/v8.pro
+++ b/tests/auto/v8/v8.pro
@@ -6,4 +6,4 @@ HEADERS += v8test.h
 
 CONFIG += parallel_test
 
-QT += v8-private
+QT = core v8-private