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/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 ++++-
 17 files changed, 96 insertions(+), 11 deletions(-)

(limited to 'tests/manual/qlocale')

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
-- 
cgit v1.2.3