From 37842c2fdb10b8802cae7ebeead7d4e356251053 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Thu, 21 Mar 2013 15:19:40 +0100
Subject: Compile most manual tests with Qt 4.

Replace <QtWidgets> includes by class includes, remove tests
that do not compile.

Change-Id: I52837e8c567dc8ac365c7d43c37beb9a368f6f72
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
 tests/manual/gestures/graphicsview/main.cpp         | 11 ++++++++++-
 tests/manual/gestures/scrollarea/main.cpp           | 12 +++++++++++-
 tests/manual/inputmethodhints/inputmethodhints.h    |  2 +-
 tests/manual/inputmethodhints/main.cpp              |  1 -
 tests/manual/keypadnavigation/main.cpp              |  9 ++++++++-
 tests/manual/manual.pro                             |  3 +++
 tests/manual/qcursor/allcursors/main.cpp            |  2 +-
 tests/manual/qcursor/allcursors/mainwindow.h        |  2 +-
 tests/manual/qcursor/grab_override/main.cpp         |  2 +-
 tests/manual/qcursor/grab_override/mainwindow.h     |  2 +-
 tests/manual/qdesktopwidget/main.cpp                |  6 +++++-
 tests/manual/qgraphicsitem/main.cpp                 | 10 +++++-----
 tests/manual/qgraphicsitemgroup/main.cpp            |  2 +-
 tests/manual/qgraphicslayout/flicker/main.cpp       |  3 ++-
 tests/manual/qgraphicslayout/flicker/window.h       | 20 +++++++++++++++++++-
 tests/manual/qimagereader/main.cpp                  |  7 ++++++-
 tests/manual/qlocale/calendar.cpp                   | 11 +++++++++--
 tests/manual/qlocale/calendar.h                     | 12 +++++++++++-
 tests/manual/qlocale/currency.cpp                   |  4 ++++
 tests/manual/qlocale/currency.h                     |  6 +++++-
 tests/manual/qlocale/dateformats.cpp                |  7 +++++++
 tests/manual/qlocale/dateformats.h                  |  8 +++++++-
 tests/manual/qlocale/info.cpp                       |  6 ++++++
 tests/manual/qlocale/info.h                         |  7 ++++++-
 tests/manual/qlocale/languages.cpp                  |  4 ++++
 tests/manual/qlocale/languages.h                    |  6 +++++-
 tests/manual/qlocale/main.cpp                       |  2 +-
 tests/manual/qlocale/miscellaneous.cpp              |  4 ++++
 tests/manual/qlocale/miscellaneous.h                |  6 +++++-
 tests/manual/qlocale/numberformats.cpp              |  6 ++++++
 tests/manual/qlocale/numberformats.h                |  6 +++++-
 tests/manual/qlocale/window.cpp                     |  7 +++++++
 tests/manual/qlocale/window.h                       |  5 ++++-
 tests/manual/qtbug-8933/main.cpp                    |  2 +-
 tests/manual/qtouchevent/main.cpp                   |  3 ++-
 tests/manual/qtouchevent/qtouchevent.pro            |  3 ++-
 tests/manual/qwidget_zorder/main.cpp                |  6 +++++-
 tests/manual/repaint/mainwindow/main.cpp            |  9 ++++++++-
 tests/manual/repaint/scrollarea/main.cpp            |  5 ++++-
 tests/manual/repaint/shared/shared.h                |  6 +++++-
 tests/manual/repaint/splitter/main.cpp              |  5 ++++-
 tests/manual/repaint/tableview/main.cpp             |  6 +++++-
 tests/manual/repaint/task141091/main.cpp            |  4 +++-
 tests/manual/repaint/toplevel/main.cpp              |  3 ++-
 tests/manual/repaint/widget/main.cpp                |  4 +++-
 tests/manual/textrendering/glyphshaping/main.cpp    | 10 +++++++++-
 tests/manual/textrendering/textperformance/main.cpp |  7 ++++++-
 tests/manual/widgets/itemviews/delegate/example.cpp |  7 ++++++-
 48 files changed, 236 insertions(+), 45 deletions(-)

diff --git a/tests/manual/gestures/graphicsview/main.cpp b/tests/manual/gestures/graphicsview/main.cpp
index d6551e53bf..cc06cb1986 100644
--- a/tests/manual/gestures/graphicsview/main.cpp
+++ b/tests/manual/gestures/graphicsview/main.cpp
@@ -39,7 +39,16 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
+#include <QMainWindow>
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QScrollBar>
+#include <QImageReader>
+#include <QVBoxLayout>
+#include <QGestureEvent>
+#include <QDir>
+#include <QFileDialog>
 
 #include "imageitem.h"
 #include "gestures.h"
diff --git a/tests/manual/gestures/scrollarea/main.cpp b/tests/manual/gestures/scrollarea/main.cpp
index 7917b76418..3acce40d50 100644
--- a/tests/manual/gestures/scrollarea/main.cpp
+++ b/tests/manual/gestures/scrollarea/main.cpp
@@ -39,7 +39,17 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
+#include <QSlider>
+#include <QScrollArea>
+#include <QScrollBar>
+#include <QMainWindow>
+#include <QLabel>
+#include <QPushButton>
+#include <QVBoxLayout>
+#include <QGestureEvent>
+#include <QPanGesture>
+#include <QDebug>
 
 #include "mousepangesturerecognizer.h"
 
diff --git a/tests/manual/inputmethodhints/inputmethodhints.h b/tests/manual/inputmethodhints/inputmethodhints.h
index ce1724280f..da1262da39 100644
--- a/tests/manual/inputmethodhints/inputmethodhints.h
+++ b/tests/manual/inputmethodhints/inputmethodhints.h
@@ -42,7 +42,7 @@
 #ifndef INPUTMETHODHINTS_H
 #define INPUTMETHODHINTS_H
 
-#include <QtWidgets/QMainWindow>
+#include <QMainWindow>
 #include "ui_inputmethodhints.h"
 
 class inputmethodhints : public QMainWindow
diff --git a/tests/manual/inputmethodhints/main.cpp b/tests/manual/inputmethodhints/main.cpp
index c96dc65633..fc294dfc43 100644
--- a/tests/manual/inputmethodhints/main.cpp
+++ b/tests/manual/inputmethodhints/main.cpp
@@ -41,7 +41,6 @@
 
 #include "inputmethodhints.h"
 
-#include <QtWidgets>
 #include <QApplication>
 
 int main(int argc, char *argv[])
diff --git a/tests/manual/keypadnavigation/main.cpp b/tests/manual/keypadnavigation/main.cpp
index c631288d60..71a0072fba 100644
--- a/tests/manual/keypadnavigation/main.cpp
+++ b/tests/manual/keypadnavigation/main.cpp
@@ -39,7 +39,14 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QMainWindow>
+#include <QApplication>
+#include <QColorDialog>
+#include <QFileDialog>
+#include <QFontDialog>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QSignalMapper>
 #include "ui_keypadnavigation.h"
 
 class KeypadNavigation : public QMainWindow
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
index 1169ea6a27..5a974842a4 100644
--- a/tests/manual/manual.pro
+++ b/tests/manual/manual.pro
@@ -46,3 +46,6 @@ win32 {
     # disable some tests on wince because of missing dependencies
     wince*:SUBDIRS -= lance windowmodality
 }
+
+lessThan(QT_MAJOR_VERSION, 5): SUBDIRS -= bearerex lance qnetworkaccessmanager/qget qnetworkreply \
+qpainfo qscreen  socketengine xembed-raster xembed-widgets
diff --git a/tests/manual/qcursor/allcursors/main.cpp b/tests/manual/qcursor/allcursors/main.cpp
index 5a9a172a2d..247841de31 100644
--- a/tests/manual/qcursor/allcursors/main.cpp
+++ b/tests/manual/qcursor/allcursors/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QApplication>
 #include "mainwindow.h"
 
 int main(int argc, char *argv[])
diff --git a/tests/manual/qcursor/allcursors/mainwindow.h b/tests/manual/qcursor/allcursors/mainwindow.h
index 4b7dc91a18..9c6adcaddd 100644
--- a/tests/manual/qcursor/allcursors/mainwindow.h
+++ b/tests/manual/qcursor/allcursors/mainwindow.h
@@ -42,7 +42,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtWidgets/QMainWindow>
+#include <QMainWindow>
 
 class QTimer;
 
diff --git a/tests/manual/qcursor/grab_override/main.cpp b/tests/manual/qcursor/grab_override/main.cpp
index 5a9a172a2d..247841de31 100644
--- a/tests/manual/qcursor/grab_override/main.cpp
+++ b/tests/manual/qcursor/grab_override/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QApplication>
 #include "mainwindow.h"
 
 int main(int argc, char *argv[])
diff --git a/tests/manual/qcursor/grab_override/mainwindow.h b/tests/manual/qcursor/grab_override/mainwindow.h
index eaf4b95615..31ecaee43f 100644
--- a/tests/manual/qcursor/grab_override/mainwindow.h
+++ b/tests/manual/qcursor/grab_override/mainwindow.h
@@ -42,7 +42,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtWidgets/QMainWindow>
+#include <QMainWindow>
 
 class QTimer;
 
diff --git a/tests/manual/qdesktopwidget/main.cpp b/tests/manual/qdesktopwidget/main.cpp
index 3873a6a1e1..1a10cbfbd2 100644
--- a/tests/manual/qdesktopwidget/main.cpp
+++ b/tests/manual/qdesktopwidget/main.cpp
@@ -39,7 +39,11 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QGraphicsView>
+#include <QGraphicsRectItem>
+#include <QDesktopWidget>
+#include <QApplication>
+#include <QDebug>
 
 class DesktopView : public QGraphicsView
 {
diff --git a/tests/manual/qgraphicsitem/main.cpp b/tests/manual/qgraphicsitem/main.cpp
index 84364e6bc0..e21baa3d18 100644
--- a/tests/manual/qgraphicsitem/main.cpp
+++ b/tests/manual/qgraphicsitem/main.cpp
@@ -39,11 +39,11 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QGraphicsView>
-#include <QtWidgets/QGraphicsScene>
-#include <QtWidgets/QGraphicsItem>
-#include <QtWidgets/QMessageBox>
+#include <QApplication>
+#include <QGraphicsView>
+#include <QGraphicsScene>
+#include <QGraphicsItem>
+#include <QMessageBox>
 
 class MyObject : public QObject
 {
diff --git a/tests/manual/qgraphicsitemgroup/main.cpp b/tests/manual/qgraphicsitemgroup/main.cpp
index 97dbafd059..75f36e54af 100644
--- a/tests/manual/qgraphicsitemgroup/main.cpp
+++ b/tests/manual/qgraphicsitemgroup/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QApplication>
 #include "widget.h"
 
 int main(int argc, char *argv[])
diff --git a/tests/manual/qgraphicslayout/flicker/main.cpp b/tests/manual/qgraphicslayout/flicker/main.cpp
index 4b6589f9f8..2f4140e39a 100644
--- a/tests/manual/qgraphicslayout/flicker/main.cpp
+++ b/tests/manual/qgraphicslayout/flicker/main.cpp
@@ -39,7 +39,8 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QMainWindow>
+#include <QApplication>
 #include "window.h"
 
 int main(int argc, char **argv)
diff --git a/tests/manual/qgraphicslayout/flicker/window.h b/tests/manual/qgraphicslayout/flicker/window.h
index 3a0eb77fcc..190e9c4890 100644
--- a/tests/manual/qgraphicslayout/flicker/window.h
+++ b/tests/manual/qgraphicslayout/flicker/window.h
@@ -43,7 +43,21 @@
 #define WINDOW_H
 
 
-#include <QtWidgets>
+#include <QGraphicsScene>
+#include <QGraphicsWidget>
+#include <QGraphicsLinearLayout>
+#include <QGraphicsView>
+#include <QSpinBox>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QLabel>
+#include <QHBoxLayout>
+#include <QPainter>
+#include <QApplication>
+#include <QThread>
+#include <QMap>
+#include <QTime>
+#include <QDebug>
 
 struct Statistics {
     Statistics() : setGeometryCount(0), sleepMsecs(0), output(0),
@@ -57,7 +71,11 @@ struct Statistics {
     QLabel *output;
     void sleep()
     {
+#if QT_VERSION >= 0x050000
         QThread::msleep(sleepMsecs);
+#else
+        qWarning("%s unimplemented", Q_FUNC_INFO);
+#endif
     }
     int currentBenchmarkIteration;
     bool relayoutClicked;
diff --git a/tests/manual/qimagereader/main.cpp b/tests/manual/qimagereader/main.cpp
index ea33ef1e01..4dc41ac542 100644
--- a/tests/manual/qimagereader/main.cpp
+++ b/tests/manual/qimagereader/main.cpp
@@ -39,7 +39,12 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QWidget>
+#include <QHBoxLayout>
+#include <QApplication>
+#include <QPainter>
+#include <QImage>
+#include <QImageReader>
 
 class MyWidget : public QWidget
 {
diff --git a/tests/manual/qlocale/calendar.cpp b/tests/manual/qlocale/calendar.cpp
index d7ac33e6a4..6b3d3c213d 100644
--- a/tests/manual/qlocale/calendar.cpp
+++ b/tests/manual/qlocale/calendar.cpp
@@ -38,10 +38,17 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
-
 #include "calendar.h"
 
+#include <QComboBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QCalendarWidget>
+#include <QLabel>
+#include <QDateEdit>
+#include <QCheckBox>
+#include <QTextCharFormat>
+
 CalendarWidget::CalendarWidget()
 {
     createPreviewGroupBox();
diff --git a/tests/manual/qlocale/calendar.h b/tests/manual/qlocale/calendar.h
index fd5f2c3931..ec152a7f4e 100644
--- a/tests/manual/qlocale/calendar.h
+++ b/tests/manual/qlocale/calendar.h
@@ -41,7 +41,17 @@
 #ifndef CALENDAR_H
 #define CALENDAR_H
 
-#include <QtWidgets>
+#include <QWidget>
+#include <QDate>
+#include <QLocale>
+
+class QComboBox;
+class QGridLayout;
+class QGroupBox;
+class QCalendarWidget;
+class QLabel;
+class QDateEdit;
+class QCheckBox;
 
 class CalendarWidget : public QWidget
 {
diff --git a/tests/manual/qlocale/currency.cpp b/tests/manual/qlocale/currency.cpp
index 46d1cd9b29..5be527ae91 100644
--- a/tests/manual/qlocale/currency.cpp
+++ b/tests/manual/qlocale/currency.cpp
@@ -39,6 +39,10 @@
 ****************************************************************************/
 
 #include "currency.h"
+#include <QLineEdit>
+#include <QLabel>
+#include <QHBoxLayout>
+#include <QLocale>
 
 CurrencyWidget::CurrencyWidget()
 {
diff --git a/tests/manual/qlocale/currency.h b/tests/manual/qlocale/currency.h
index 5185a35983..b81a67e51e 100644
--- a/tests/manual/qlocale/currency.h
+++ b/tests/manual/qlocale/currency.h
@@ -41,7 +41,11 @@
 #ifndef CURRENCY_H
 #define CURRENCY_H
 
-#include <QtWidgets>
+#include <QWidget>
+#include <QLocale>
+
+class QLabel;
+class QLineEdit;
 
 class CurrencyWidget : public QWidget
 {
diff --git a/tests/manual/qlocale/dateformats.cpp b/tests/manual/qlocale/dateformats.cpp
index ffdef0993f..3b523ca863 100644
--- a/tests/manual/qlocale/dateformats.cpp
+++ b/tests/manual/qlocale/dateformats.cpp
@@ -40,6 +40,13 @@
 
 #include "dateformats.h"
 
+#include <QLineEdit>
+#include <QScrollArea>
+#include <QGridLayout>
+#include <QComboBox>
+#include <QLabel>
+#include <QDateTime>
+
 DateFormatsWidget::DateFormatsWidget()
 {
     scrollArea = new QScrollArea;
diff --git a/tests/manual/qlocale/dateformats.h b/tests/manual/qlocale/dateformats.h
index cd50e14cbc..ae3621403e 100644
--- a/tests/manual/qlocale/dateformats.h
+++ b/tests/manual/qlocale/dateformats.h
@@ -41,7 +41,13 @@
 #ifndef DATEFORMATS_H
 #define DATEFORMATS_H
 
-#include <QtWidgets>
+#include <QWidget>
+#include <QLocale>
+
+class QLineEdit;
+class QScrollArea;
+class QGridLayout;
+class QComboBox;
 
 class DateFormatsWidget : public QWidget
 {
diff --git a/tests/manual/qlocale/info.cpp b/tests/manual/qlocale/info.cpp
index 229d167209..e3d392fd46 100644
--- a/tests/manual/qlocale/info.cpp
+++ b/tests/manual/qlocale/info.cpp
@@ -40,6 +40,12 @@
 
 #include "info.h"
 
+#include <QLineEdit>
+#include <QScrollArea>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLocale>
+
 InfoWidget::InfoWidget()
 {
     scrollArea = new QScrollArea;
diff --git a/tests/manual/qlocale/info.h b/tests/manual/qlocale/info.h
index 877151d53d..9657f3264c 100644
--- a/tests/manual/qlocale/info.h
+++ b/tests/manual/qlocale/info.h
@@ -41,7 +41,12 @@
 #ifndef INFO_H
 #define INFO_H
 
-#include <QtWidgets>
+#include <QWidget>
+#include <QLocale>
+
+class QLineEdit;
+class QScrollArea;
+class QGridLayout;
 
 class InfoWidget : public QWidget
 {
diff --git a/tests/manual/qlocale/languages.cpp b/tests/manual/qlocale/languages.cpp
index 9f285530b7..828b43ae62 100644
--- a/tests/manual/qlocale/languages.cpp
+++ b/tests/manual/qlocale/languages.cpp
@@ -40,6 +40,10 @@
 
 #include "languages.h"
 
+#include <QLabel>
+#include <QListWidget>
+#include <QHBoxLayout>
+
 LanguagesWidget::LanguagesWidget()
 {
     QVBoxLayout *l = new QVBoxLayout(this);
diff --git a/tests/manual/qlocale/languages.h b/tests/manual/qlocale/languages.h
index b685bd04c3..57fbf456f3 100644
--- a/tests/manual/qlocale/languages.h
+++ b/tests/manual/qlocale/languages.h
@@ -41,7 +41,11 @@
 #ifndef LANGUAGES_H
 #define LANGUAGES_H
 
-#include <QtWidgets>
+#include <QWidget>
+#include <QLocale>
+
+class QLabel;
+class QListWidget;
 
 class LanguagesWidget : public QWidget
 {
diff --git a/tests/manual/qlocale/main.cpp b/tests/manual/qlocale/main.cpp
index 0ca64d3d7c..cacc0c0181 100644
--- a/tests/manual/qlocale/main.cpp
+++ b/tests/manual/qlocale/main.cpp
@@ -38,7 +38,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
 
 #include "window.h"
 
diff --git a/tests/manual/qlocale/miscellaneous.cpp b/tests/manual/qlocale/miscellaneous.cpp
index 374ee588a4..62ebac09e4 100644
--- a/tests/manual/qlocale/miscellaneous.cpp
+++ b/tests/manual/qlocale/miscellaneous.cpp
@@ -40,6 +40,10 @@
 
 #include "miscellaneous.h"
 
+#include <QLineEdit>
+#include <QVBoxLayout>
+#include <QLabel>
+
 MiscWidget::MiscWidget()
 {
     QGridLayout *l = new QGridLayout;
diff --git a/tests/manual/qlocale/miscellaneous.h b/tests/manual/qlocale/miscellaneous.h
index fe11ecd89b..29543a81e6 100644
--- a/tests/manual/qlocale/miscellaneous.h
+++ b/tests/manual/qlocale/miscellaneous.h
@@ -41,7 +41,11 @@
 #ifndef MISCELLANEOUS_H
 #define MISCELLANEOUS_H
 
-#include <QtWidgets>
+#include <QWidget>
+#include <QLocale>
+
+class QLineEdit;
+class QLabel;
 
 class MiscWidget : public QWidget
 {
diff --git a/tests/manual/qlocale/numberformats.cpp b/tests/manual/qlocale/numberformats.cpp
index 3882009f81..edab69b48c 100644
--- a/tests/manual/qlocale/numberformats.cpp
+++ b/tests/manual/qlocale/numberformats.cpp
@@ -40,6 +40,12 @@
 
 #include "numberformats.h"
 
+#include <QGridLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QLocale>
+#include <QVBoxLayout>
+
 NumberFormatsWidget::NumberFormatsWidget()
 {
     QGridLayout *l = new QGridLayout;
diff --git a/tests/manual/qlocale/numberformats.h b/tests/manual/qlocale/numberformats.h
index dde5f1fa2c..2a91dd3f81 100644
--- a/tests/manual/qlocale/numberformats.h
+++ b/tests/manual/qlocale/numberformats.h
@@ -41,7 +41,11 @@
 #ifndef NUMBERFORMATS_H
 #define NUMBERFORMATS_H
 
-#include <QtWidgets>
+#include <QWidget>
+#include <QLocale>
+
+class QLineEdit;
+class QLabel;
 
 class NumberFormatsWidget : public QWidget
 {
diff --git a/tests/manual/qlocale/window.cpp b/tests/manual/qlocale/window.cpp
index 9a2e3e3188..40d1316050 100644
--- a/tests/manual/qlocale/window.cpp
+++ b/tests/manual/qlocale/window.cpp
@@ -40,6 +40,13 @@
 
 #include "window.h"
 
+#include <QComboBox>
+#include <QLocale>
+#include <QLabel>
+#include <QTabWidget>
+#include <QHBoxLayout>
+#include <QEvent>
+
 Window::Window()
 {
     localeCombo = new QComboBox;
diff --git a/tests/manual/qlocale/window.h b/tests/manual/qlocale/window.h
index b7d3369e57..25b8de0ce5 100644
--- a/tests/manual/qlocale/window.h
+++ b/tests/manual/qlocale/window.h
@@ -41,7 +41,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include <QtWidgets>
+#include <QMainWindow>
 
 #include "calendar.h"
 #include "currency.h"
@@ -51,6 +51,9 @@
 #include "miscellaneous.h"
 #include "info.h"
 
+class QLabel;
+class QComboBox;
+
 class Window : public QMainWindow
 {
     Q_OBJECT
diff --git a/tests/manual/qtbug-8933/main.cpp b/tests/manual/qtbug-8933/main.cpp
index 97dbafd059..75f36e54af 100644
--- a/tests/manual/qtbug-8933/main.cpp
+++ b/tests/manual/qtbug-8933/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QApplication>
+#include <QApplication>
 #include "widget.h"
 
 int main(int argc, char *argv[])
diff --git a/tests/manual/qtouchevent/main.cpp b/tests/manual/qtouchevent/main.cpp
index e0bd9ad063..7c1ed81c37 100644
--- a/tests/manual/qtouchevent/main.cpp
+++ b/tests/manual/qtouchevent/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
 #include <QtTest>
 
 #include "ui_form.h"
@@ -55,6 +55,7 @@ public:
     {
         setAttribute(Qt::WA_QuitOnClose, false);
         setupUi(this);
+        setWindowTitle(QT_VERSION_STR);
     }
 
     void closeEvent(QCloseEvent *event)
diff --git a/tests/manual/qtouchevent/qtouchevent.pro b/tests/manual/qtouchevent/qtouchevent.pro
index aa4339f693..6a1ca85335 100644
--- a/tests/manual/qtouchevent/qtouchevent.pro
+++ b/tests/manual/qtouchevent/qtouchevent.pro
@@ -1,4 +1,5 @@
-QT += widgets testlib
+QT += testlib
+greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 SOURCES = main.cpp \
     touchwidget.cpp
 FORMS += form.ui
diff --git a/tests/manual/qwidget_zorder/main.cpp b/tests/manual/qwidget_zorder/main.cpp
index 7697cc1794..7773ecef9c 100644
--- a/tests/manual/qwidget_zorder/main.cpp
+++ b/tests/manual/qwidget_zorder/main.cpp
@@ -39,7 +39,11 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
+#include <QPushButton>
+#include <QPlainTextEdit>
+#include <QCalendarWidget>
+#include <QVBoxLayout>
 
 class Widget : public QWidget
 {
diff --git a/tests/manual/repaint/mainwindow/main.cpp b/tests/manual/repaint/mainwindow/main.cpp
index eb3096a59c..abf5857afc 100644
--- a/tests/manual/repaint/mainwindow/main.cpp
+++ b/tests/manual/repaint/mainwindow/main.cpp
@@ -39,7 +39,14 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
+#include <QMainWindow>
+#include <QToolBar>
+#include <QDockWidget>
+#include <QStatusBar>
+#include <QSpinBox>
+#include <QAction>
+
 #include "../shared/shared.h"
 
 int main(int argc, char **argv)
diff --git a/tests/manual/repaint/scrollarea/main.cpp b/tests/manual/repaint/scrollarea/main.cpp
index 6102ab8ee8..dbe5cab893 100644
--- a/tests/manual/repaint/scrollarea/main.cpp
+++ b/tests/manual/repaint/scrollarea/main.cpp
@@ -39,7 +39,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
+#include <QMainWindow>
+#include <QScrollArea>
+
 #include "../shared/shared.h"
 
 int main(int argc, char **argv)
diff --git a/tests/manual/repaint/shared/shared.h b/tests/manual/repaint/shared/shared.h
index 8cc5a61aca..8550e6e907 100644
--- a/tests/manual/repaint/shared/shared.h
+++ b/tests/manual/repaint/shared/shared.h
@@ -39,7 +39,11 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QWidget>
+#include <QPainter>
+#include <QMouseEvent>
+#include <QDebug>
+
 class StaticWidget : public QWidget
 {
 Q_OBJECT
diff --git a/tests/manual/repaint/splitter/main.cpp b/tests/manual/repaint/splitter/main.cpp
index 2c01053ae1..44f76eae2c 100644
--- a/tests/manual/repaint/splitter/main.cpp
+++ b/tests/manual/repaint/splitter/main.cpp
@@ -39,9 +39,12 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
 #include "../shared/shared.h"
 
+#include <QApplication>
+#include <QMainWindow>
+#include <QSplitter>
+
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
diff --git a/tests/manual/repaint/tableview/main.cpp b/tests/manual/repaint/tableview/main.cpp
index 71f8209d6d..c26c1264d7 100644
--- a/tests/manual/repaint/tableview/main.cpp
+++ b/tests/manual/repaint/tableview/main.cpp
@@ -39,9 +39,13 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
 #include "../shared/shared.h"
 
+#include <QApplication>
+#include <QMainWindow>
+#include <QTableWidget>
+#include <QPaintEvent>
+
 class CellWidget : public QWidget
 {
 public:
diff --git a/tests/manual/repaint/task141091/main.cpp b/tests/manual/repaint/task141091/main.cpp
index b5b6ae92d7..d8a37299be 100644
--- a/tests/manual/repaint/task141091/main.cpp
+++ b/tests/manual/repaint/task141091/main.cpp
@@ -39,7 +39,9 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
+#include <QMainWindow>
+#include <QPaintEvent>
 #include <QDebug>
 
 class MyWidget : public QWidget
diff --git a/tests/manual/repaint/toplevel/main.cpp b/tests/manual/repaint/toplevel/main.cpp
index 006da2635f..fd2902f21b 100644
--- a/tests/manual/repaint/toplevel/main.cpp
+++ b/tests/manual/repaint/toplevel/main.cpp
@@ -39,9 +39,10 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
 #include "../shared/shared.h"
 
+#include <QApplication>
+
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
diff --git a/tests/manual/repaint/widget/main.cpp b/tests/manual/repaint/widget/main.cpp
index 22011a160c..e2370abf3e 100644
--- a/tests/manual/repaint/widget/main.cpp
+++ b/tests/manual/repaint/widget/main.cpp
@@ -39,9 +39,11 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
 #include "../shared/shared.h"
 
+#include <QApplication>
+#include <QPushButton>
+
 class Child : public StaticWidget
 {
 Q_OBJECT
diff --git a/tests/manual/textrendering/glyphshaping/main.cpp b/tests/manual/textrendering/glyphshaping/main.cpp
index 21e57152dd..e7720522fb 100644
--- a/tests/manual/textrendering/glyphshaping/main.cpp
+++ b/tests/manual/textrendering/glyphshaping/main.cpp
@@ -39,7 +39,15 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
+#include <QStringList>
+#include <QVector>
+#include <QFile>
+#include <QDir>
+#include <QPainter>
+#include <QFontMetrics>
+#include <QImage>
+#include <QXmlStreamReader>
 
 static const int fontPixelSize = 25;
 static const QLatin1String fontFamily("Series 60 Sans");
diff --git a/tests/manual/textrendering/textperformance/main.cpp b/tests/manual/textrendering/textperformance/main.cpp
index 7d02c8c03b..373102436c 100644
--- a/tests/manual/textrendering/textperformance/main.cpp
+++ b/tests/manual/textrendering/textperformance/main.cpp
@@ -39,7 +39,12 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets>
+#include <QApplication>
+#include <QDialog>
+#include <QFontDatabase>
+#include <QPainter>
+#include <QTime>
+#include <QTimer>
 
 static const int lastMeasurementsCount = 50;
 
diff --git a/tests/manual/widgets/itemviews/delegate/example.cpp b/tests/manual/widgets/itemviews/delegate/example.cpp
index ae45561f03..c65f49f266 100644
--- a/tests/manual/widgets/itemviews/delegate/example.cpp
+++ b/tests/manual/widgets/itemviews/delegate/example.cpp
@@ -39,7 +39,12 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/QtWidgets>
+#include <QLineEdit>
+#include <QApplication>
+#include <QTableView>
+#include <QStandardItemModel>
+#include <QItemDelegate>
+#include <QDebug>
 
 class ExampleEditor : public QLineEdit
 {
-- 
cgit v1.2.3