From 42f5786104f9eef9542df2c7469a03324978281d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Fri, 20 May 2011 13:56:11 +0200
Subject: Get the QWidget auto-test compiling and running.

---
 src/testlib/qtest_gui.h            | 2 +-
 src/testlib/qtestkeyboard.h        | 4 ++--
 src/testlib/qtestmouse.h           | 4 ++--
 src/testlib/qtesttouch.h           | 2 +-
 tests/auto/qwidget/qwidget.pro     | 2 +-
 tests/auto/qwidget/tst_qwidget.cpp | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h
index 7d34c3098b..76d1d82a9c 100644
--- a/src/testlib/qtest_gui.h
+++ b/src/testlib/qtest_gui.h
@@ -57,7 +57,7 @@
 #include <QtTest/qtesttouch.h>
 #include <QtTest/qtestkeyboard.h>
 
-#include <QtGui/qicon.h>
+#include <QtWidgets/qicon.h>
 #include <QtGui/qpixmap.h>
 
 #if 0
diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h
index 37be098512..cc2130181a 100644
--- a/src/testlib/qtestkeyboard.h
+++ b/src/testlib/qtestkeyboard.h
@@ -53,9 +53,9 @@
 #include <QtTest/qtestspontaneevent.h>
 
 #include <QtCore/qpointer.h>
-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>
 #include <QtGui/qevent.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h
index 5abb019786..6b0de3804f 100644
--- a/src/testlib/qtestmouse.h
+++ b/src/testlib/qtestmouse.h
@@ -54,9 +54,9 @@
 
 #include <QtCore/qpoint.h>
 #include <QtCore/qstring.h>
-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>
 #include <QtGui/qevent.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h
index 664c60ba9a..6a7fd14a7a 100644
--- a/src/testlib/qtesttouch.h
+++ b/src/testlib/qtesttouch.h
@@ -54,7 +54,7 @@
 
 #include <QtCore/qmap.h>
 #include <QtGui/qevent.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 
 QT_BEGIN_HEADER
 
diff --git a/tests/auto/qwidget/qwidget.pro b/tests/auto/qwidget/qwidget.pro
index dfb7358127..dfc35a0157 100644
--- a/tests/auto/qwidget/qwidget.pro
+++ b/tests/auto/qwidget/qwidget.pro
@@ -1,6 +1,6 @@
 load(qttest_p4)
 
-QT += core-private gui-private
+QT += widgets core-private gui-private widgets-private
 
 SOURCES  += tst_qwidget.cpp
 RESOURCES     = qwidget.qrc
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index f282b5d7d3..23e1d3186a 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -72,8 +72,8 @@
 #include <private/qbackingstore_p.h>
 #include <qmenubar.h>
 
-#include <QtGui/QGraphicsView>
-#include <QtGui/QGraphicsProxyWidget>
+#include <QtWidgets/QGraphicsView>
+#include <QtWidgets/QGraphicsProxyWidget>
 
 #include "../../shared/util.h"
 
-- 
cgit v1.2.3