fix includes

29 files changed, 61 insertions, 61 deletions

diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h
index 856fd92f10..765fba1d9f 100644
--- a/src/widgets/kernel/qaction.h
+++ b/src/widgets/kernel/qaction.h
@@ -44,9 +44,9 @@
 
 #include <QtGui/qkeysequence.h>
 #include <QtCore/qstring.h>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 #include <QtCore/qvariant.h>
-#include <QtGui/qicon.h>
+#include <QtWidgets/qicon.h>
 
 QT_BEGIN_HEADER
 
@@ -252,7 +252,7 @@ private:
 };
 
 QT_BEGIN_INCLUDE_NAMESPACE
-#include <QtGui/qactiongroup.h>
+#include <QtWidgets/qactiongroup.h>
 QT_END_INCLUDE_NAMESPACE
 
 #endif // QT_NO_ACTION
diff --git a/src/widgets/kernel/qaction_p.h b/src/widgets/kernel/qaction_p.h
index f3154f90c1..652c9358e1 100644
--- a/src/widgets/kernel/qaction_p.h
+++ b/src/widgets/kernel/qaction_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "QtGui/qaction.h"
-#include "QtGui/qmenu.h"
+#include "QtWidgets/qaction.h"
+#include "QtWidgets/qmenu.h"
 #include "private/qgraphicswidget_p.h"
 #include "private/qobject_p.h"
 
diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h
index 88f4fe8eac..998d312f35 100644
--- a/src/widgets/kernel/qactiongroup.h
+++ b/src/widgets/kernel/qactiongroup.h
@@ -42,7 +42,7 @@
 #ifndef QACTIONGROUP_H
 #define QACTIONGROUP_H
 
-#include <QtGui/qaction.h>
+#include <QtWidgets/qaction.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index af32c9f890..4e7119fdf9 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -67,7 +67,7 @@
 #include "private/qstylesheetstyle_p.h"
 #include "private/qstyle_p.h"
 #include "qmessagebox.h"
-#include <QtGui/qgraphicsproxywidget.h>
+#include <QtWidgets/qgraphicsproxywidget.h>
 
 #include "qinputcontext.h"
 #include "private/qkeymapper_p.h"
diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h
index 3a5f02f144..16c7c7f4c3 100644
--- a/src/widgets/kernel/qapplication.h
+++ b/src/widgets/kernel/qapplication.h
@@ -48,10 +48,10 @@
 #include <QtCore/qsize.h>
 #include <QtGui/qcursor.h>
 #ifdef QT_INCLUDE_COMPAT
-# include <QtGui/qdesktopwidget.h>
+# include <QtWidgets/qdesktopwidget.h>
 #endif
 #ifdef QT3_SUPPORT
-# include <QtGui/qwidget.h>
+# include <QtWidgets/qwidget.h>
 # include <QtGui/qpalette.h>
 #endif
 #ifdef Q_WS_QWS
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h
index a089a6ba40..41d3eaeb27 100644
--- a/src/widgets/kernel/qapplication_p.h
+++ b/src/widgets/kernel/qapplication_p.h
@@ -54,7 +54,7 @@
 // We mean it.
 //
 
-#include "QtGui/qapplication.h"
+#include "QtWidgets/qapplication.h"
 #include "QtGui/qevent.h"
 #include "QtGui/qfont.h"
 #include "QtGui/qcursor.h"
@@ -65,7 +65,7 @@
 #include "QtCore/qhash.h"
 #include "QtCore/qpointer.h"
 #include "private/qcoreapplication_p.h"
-#include "QtGui/private/qshortcutmap_p.h"
+#include "private/qshortcutmap_p.h"
 #include <private/qthread_p.h>
 #include "QtCore/qpoint.h"
 #include <QTime>
@@ -76,7 +76,7 @@
 #include <QWindowSystemInterface>
 #include "private/qwindowsysteminterface_qpa_p.h"
 #include "QtGui/qplatformintegration_qpa.h"
-#include "QtGui/private/qguiapplication_p.h"
+#include "private/qguiapplication_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/widgets/kernel/qbackingstore.cpp b/src/widgets/kernel/qbackingstore.cpp
index 1ee66f09cc..5e0c158cec 100644
--- a/src/widgets/kernel/qbackingstore.cpp
+++ b/src/widgets/kernel/qbackingstore.cpp
@@ -48,9 +48,9 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtGui/qevent.h>
-#include <QtGui/qapplication.h>
+#include <QtWidgets/qapplication.h>
 #include <QtGui/qpaintengine.h>
-#include <QtGui/qgraphicsproxywidget.h>
+#include <QtWidgets/qgraphicsproxywidget.h>
 
 #include <private/qwidget_p.h>
 #include <private/qapplication_p.h>
diff --git a/src/widgets/kernel/qbackingstore_p.h b/src/widgets/kernel/qbackingstore_p.h
index 05f4bfcb6c..fe448da901 100644
--- a/src/widgets/kernel/qbackingstore_p.h
+++ b/src/widgets/kernel/qbackingstore_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QDebug>
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 #include <private/qwidget_p.h>
 #include <private/qwindowsurface_p.h>
 #ifdef Q_WS_QWS
diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h
index 66ce23a9f5..b97d909994 100644
--- a/src/widgets/kernel/qboxlayout.h
+++ b/src/widgets/kernel/qboxlayout.h
@@ -42,9 +42,9 @@
 #ifndef QBOXLAYOUT_H
 #define QBOXLAYOUT_H
 
-#include <QtGui/qlayout.h>
+#include <QtWidgets/qlayout.h>
 #ifdef QT_INCLUDE_COMPAT
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 #endif
 
 #include <limits.h>
diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h
index deb896029a..7e836b25f2 100644
--- a/src/widgets/kernel/qdesktopwidget.h
+++ b/src/widgets/kernel/qdesktopwidget.h
@@ -42,7 +42,7 @@
 #ifndef QDESKTOPWIDGET_H
 #define QDESKTOPWIDGET_H
 
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h
index f229ac2d83..60ce12cd3a 100644
--- a/src/widgets/kernel/qformlayout.h
+++ b/src/widgets/kernel/qformlayout.h
@@ -42,7 +42,7 @@
 #ifndef QFORMLAYOUT_H
 #define QFORMLAYOUT_H
 
-#include <QtGui/QLayout>
+#include <QtWidgets/QLayout>
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h
index 0ac66e8f87..cbfc6f7e48 100644
--- a/src/widgets/kernel/qgridlayout.h
+++ b/src/widgets/kernel/qgridlayout.h
@@ -42,9 +42,9 @@
 #ifndef QGRIDLAYOUT_H
 #define QGRIDLAYOUT_H
 
-#include <QtGui/qlayout.h>
+#include <QtWidgets/qlayout.h>
 #ifdef QT_INCLUDE_COMPAT
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 #endif
 
 #include <limits.h>
diff --git a/src/widgets/kernel/qguiplatformplugin_p.h b/src/widgets/kernel/qguiplatformplugin_p.h
index 49e2d9294a..18dd66615f 100644
--- a/src/widgets/kernel/qguiplatformplugin_p.h
+++ b/src/widgets/kernel/qguiplatformplugin_p.h
@@ -55,7 +55,7 @@
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
-#include <QtGui/qdialog.h>
+#include <QtWidgets/qdialog.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/kernel/qicon_p.h b/src/widgets/kernel/qicon_p.h
index 0bf7e65cc1..06eae53daf 100644
--- a/src/widgets/kernel/qicon_p.h
+++ b/src/widgets/kernel/qicon_p.h
@@ -57,8 +57,8 @@
 #include <QtCore/qsize.h>
 #include <QtCore/qlist.h>
 #include <QtGui/qpixmap.h>
-#include <QtGui/qicon.h>
-#include <QtGui/qiconengine.h>
+#include <QtWidgets/qicon.h>
+#include <QtWidgets/qiconengine.h>
 
 #ifndef QT_NO_ICON
 QT_BEGIN_NAMESPACE
diff --git a/src/widgets/kernel/qiconengine.h b/src/widgets/kernel/qiconengine.h
index 12caea8a20..282dd38aa9 100644
--- a/src/widgets/kernel/qiconengine.h
+++ b/src/widgets/kernel/qiconengine.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/qglobal.h>
 #include <QtCore/qlist.h>
-#include <QtGui/qicon.h>
+#include <QtWidgets/qicon.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/kernel/qiconloader.cpp b/src/widgets/kernel/qiconloader.cpp
index 19be636e9c..361a49a7ee 100644
--- a/src/widgets/kernel/qiconloader.cpp
+++ b/src/widgets/kernel/qiconloader.cpp
@@ -45,10 +45,10 @@
 #include <private/qicon_p.h>
 #include <private/qguiplatformplugin_p.h>
 
-#include <QtGui/QIconEnginePlugin>
+#include <QtWidgets/QIconEnginePlugin>
 #include <QtGui/QPixmapCache>
-#include <QtGui/QIconEngine>
-#include <QtGui/QStyleOption>
+#include <QtWidgets/QIconEngine>
+#include <QtWidgets/QStyleOption>
 #include <QtCore/QList>
 #include <QtCore/QHash>
 #include <QtCore/QDir>
diff --git a/src/widgets/kernel/qiconloader_p.h b/src/widgets/kernel/qiconloader_p.h
index 00a3976b40..eff8bbf663 100644
--- a/src/widgets/kernel/qiconloader_p.h
+++ b/src/widgets/kernel/qiconloader_p.h
@@ -54,8 +54,8 @@
 // We mean it.
 //
 
-#include <QtGui/QIcon>
-#include <QtGui/QIconEngine>
+#include <QtWidgets/QIcon>
+#include <QtWidgets/QIconEngine>
 #include <QtGui/QPixmapCache>
 #include <private/qicon_p.h>
 #include <private/qfactoryloader_p.h>
diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h
index 5333150072..aca1748f99 100644
--- a/src/widgets/kernel/qlayout.h
+++ b/src/widgets/kernel/qlayout.h
@@ -43,8 +43,8 @@
 #define QLAYOUT_H
 
 #include <QtCore/qobject.h>
-#include <QtGui/qlayoutitem.h>
-#include <QtGui/qsizepolicy.h>
+#include <QtWidgets/qlayoutitem.h>
+#include <QtWidgets/qsizepolicy.h>
 #include <QtCore/qrect.h>
 #include <QtCore/qmargins.h>
 
@@ -233,8 +233,8 @@ inline void QLayoutIterator::deleteCurrent() { delete  layout->takeAt(index); }
 //### support old includes
 #if 1 //def QT3_SUPPORT
 QT_BEGIN_INCLUDE_NAMESPACE
-#include <QtGui/qboxlayout.h>
-#include <QtGui/qgridlayout.h>
+#include <QtWidgets/qboxlayout.h>
+#include <QtWidgets/qgridlayout.h>
 QT_END_INCLUDE_NAMESPACE
 #endif
 
diff --git a/src/widgets/kernel/qlayoutengine_p.h b/src/widgets/kernel/qlayoutengine_p.h
index da07f3bab1..eede314348 100644
--- a/src/widgets/kernel/qlayoutengine_p.h
+++ b/src/widgets/kernel/qlayoutengine_p.h
@@ -53,8 +53,8 @@
 // We mean it.
 //
 
-#include "QtGui/qlayoutitem.h"
-#include "QtGui/qstyle.h"
+#include "QtWidgets/qlayoutitem.h"
+#include "QtWidgets/qstyle.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/widgets/kernel/qlayoutitem.h b/src/widgets/kernel/qlayoutitem.h
index a75011f3ff..52878b2c8b 100644
--- a/src/widgets/kernel/qlayoutitem.h
+++ b/src/widgets/kernel/qlayoutitem.h
@@ -42,7 +42,7 @@
 #ifndef QLAYOUTITEM_H
 #define QLAYOUTITEM_H
 
-#include <QtGui/qsizepolicy.h>
+#include <QtWidgets/qsizepolicy.h>
 #include <QtCore/qrect.h>
 
 #include <limits.h>
diff --git a/src/widgets/kernel/qsoftkeymanager_p.h b/src/widgets/kernel/qsoftkeymanager_p.h
index 78999a97bd..726c8f7211 100644
--- a/src/widgets/kernel/qsoftkeymanager_p.h
+++ b/src/widgets/kernel/qsoftkeymanager_p.h
@@ -54,7 +54,7 @@
 //
 
 #include <QtCore/qobject.h>
-#include "QtGui/qaction.h"
+#include "QtWidgets/qaction.h"
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h
index 49b80c6445..b666b0c933 100644
--- a/src/widgets/kernel/qstackedlayout.h
+++ b/src/widgets/kernel/qstackedlayout.h
@@ -42,7 +42,7 @@
 #ifndef QSTACKEDLAYOUT_H
 #define QSTACKEDLAYOUT_H
 
-#include <QtGui/qlayout.h>
+#include <QtWidgets/qlayout.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h
index 4195f1cb3e..076ab0f197 100644
--- a/src/widgets/kernel/qtooltip.h
+++ b/src/widgets/kernel/qtooltip.h
@@ -42,7 +42,7 @@
 #ifndef QTOOLTIP_H
 #define QTOOLTIP_H
 
-#include <QtGui/qwidget.h>
+#include <QtWidgets/qwidget.h>
 
 QT_BEGIN_HEADER
 
diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp
index 5e47ffa56b..908668e1c6 100644
--- a/src/widgets/kernel/qwhatsthis.cpp
+++ b/src/widgets/kernel/qwhatsthis.cpp
@@ -53,7 +53,7 @@
 #include "qcursor.h"
 #include "qbitmap.h"
 #include "qtextdocument.h"
-#include "../text/qtextdocumentlayout_p.h"
+#include "private/qtextdocumentlayout_p.h"
 #include "qtoolbutton.h"
 #include "qdebug.h"
 #ifndef QT_NO_ACCESSIBILITY
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index b6e6a56f4a..e2969aad74 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -114,10 +114,10 @@
 #include "qwidget_p.h"
 #include "qaction_p.h"
 #include "qlayout_p.h"
-#include "QtGui/qgraphicsproxywidget.h"
-#include "QtGui/qgraphicsscene.h"
+#include "QtWidgets/qgraphicsproxywidget.h"
+#include "QtWidgets/qgraphicsscene.h"
 #include "private/qgraphicsproxywidget_p.h"
-#include "QtGui/qabstractscrollarea.h"
+#include "QtWidgets/qabstractscrollarea.h"
 #include "private/qabstractscrollarea_p.h"
 #include "private/qevent_p.h"
 
diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h
index d14e8652be..415fb67b38 100644
--- a/src/widgets/kernel/qwidget.h
+++ b/src/widgets/kernel/qwidget.h
@@ -50,7 +50,7 @@
 #include <QtGui/qfont.h>
 #include <QtGui/qfontmetrics.h>
 #include <QtGui/qfontinfo.h>
-#include <QtGui/qsizepolicy.h>
+#include <QtWidgets/qsizepolicy.h>
 #include <QtGui/qregion.h>
 #include <QtGui/qbrush.h>
 #include <QtGui/qcursor.h>
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h
index 7826cab795..e9d7682289 100644
--- a/src/widgets/kernel/qwidget_p.h
+++ b/src/widgets/kernel/qwidget_p.h
@@ -53,19 +53,19 @@
 // We mean it.
 //
 
-#include "QtGui/qwidget.h"
+#include "QtWidgets/qwidget.h"
 #include "private/qobject_p.h"
 #include "QtCore/qrect.h"
 #include "QtCore/qlocale.h"
 #include "QtCore/qset.h"
 #include "QtGui/qregion.h"
-#include "QtGui/qsizepolicy.h"
-#include "QtGui/qstyle.h"
-#include "QtGui/qapplication.h"
+#include "QtWidgets/qsizepolicy.h"
+#include "QtWidgets/qstyle.h"
+#include "QtWidgets/qapplication.h"
 #include <private/qgraphicseffect_p.h>
-#include "QtGui/qgraphicsproxywidget.h"
-#include "QtGui/qgraphicsscene.h"
-#include "QtGui/qgraphicsview.h"
+#include "QtWidgets/qgraphicsproxywidget.h"
+#include "QtWidgets/qgraphicsscene.h"
+#include "QtWidgets/qgraphicsview.h"
 #include <private/qgesture_p.h>
 
 #ifdef Q_WS_WIN
@@ -82,7 +82,7 @@
 #endif
 
 #if defined(Q_WS_QWS)
-#include "QtGui/qinputcontext.h"
+#include "QtWidgets/qinputcontext.h"
 #include "QtGui/qscreen_qws.h"
 #endif
 
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index d239e6d652..f6833915ec 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -39,14 +39,14 @@
 **
 ****************************************************************************/
 
-#include "QtGui/qwidget.h"
+#include "QtWidgets/qwidget.h"
 #include "QtGui/qevent.h"
-#include "QtGui/qapplication.h"
-#include "QtGui/private/qbackingstore_p.h"
-#include "QtGui/private/qwidget_p.h"
-#include "QtGui/private/qwidgetwindow_qpa_p.h"
-#include "QtGui/private/qapplication_p.h"
-#include "QtGui/qdesktopwidget.h"
+#include "QtWidgets/qapplication.h"
+#include "private/qbackingstore_p.h"
+#include "private/qwidget_p.h"
+#include "private/qwidgetwindow_qpa_p.h"
+#include "private/qapplication_p.h"
+#include "QtWidgets/qdesktopwidget.h"
 #include "QtGui/qplatformwindow_qpa.h"
 #include "QtGui/qplatformglcontext_qpa.h"
 
diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h
index a32b5d60dd..cf9f2e6da5 100644
--- a/src/widgets/kernel/qwidgetaction.h
+++ b/src/widgets/kernel/qwidgetaction.h
@@ -42,7 +42,7 @@
 #ifndef QWIDGETACTION_H
 #define QWIDGETACTION_H
 
-#include <QtGui/qaction.h>
+#include <QtWidgets/qaction.h>
 
 QT_BEGIN_HEADER