Update dependencies

Adapt to
qtbase/bcaff2b06fc46fce8a3ae6d613c025c8d097229c merging the
QAction classes, qtbase/d975ad4ed728553b765c61f38c1e0df899187cf5
merging the QShortcut classes and
qtbase/d975ad4ed728553b765c61f38c1e0df899187cf5 moving the Undo
framework to QtGui.

Clean up include directives.

Change-Id: Ib825f17284390c103d5ac2ae1f2c8fe65a534f1a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

89 files changed, 386 insertions, 277 deletions

diff --git a/src/assistant/assistant/bookmarkmanagerwidget.cpp b/src/assistant/assistant/bookmarkmanagerwidget.cpp
index ba4f5cfd4..73f8405a8 100644
--- a/src/assistant/assistant/bookmarkmanagerwidget.cpp
+++ b/src/assistant/assistant/bookmarkmanagerwidget.cpp
@@ -31,15 +31,16 @@
 #include "tracer.h"
 #include "xbelsupport.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QFile>
-#include <QtCore/QUrl>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>
 
 #include <QtGui/QCloseEvent>
-#include <QtWidgets/QFileDialog>
 #include <QtGui/QKeySequence>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QShortcut>
+#include <QtGui/QShortcut>
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QFile>
+#include <QtCore/QUrl>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/assistant/assistant/globalactions.cpp b/src/assistant/assistant/globalactions.cpp
index 6accd6dcd..20123f1e8 100644
--- a/src/assistant/assistant/globalactions.cpp
+++ b/src/assistant/assistant/globalactions.cpp
@@ -32,9 +32,10 @@
 #include "helpviewer.h"
 #include "tracer.h"
 
-#include <QtWidgets/QAction>
 #include <QtWidgets/QMenu>
 
+#include <QtGui/QAction>
+
 #if defined(BROWSER_QTWEBKIT)
 #  include <QWebHistory>
 #endif
diff --git a/src/assistant/assistant/helpviewer.h b/src/assistant/assistant/helpviewer.h
index e63173b1e..178a6491f 100644
--- a/src/assistant/assistant/helpviewer.h
+++ b/src/assistant/assistant/helpviewer.h
@@ -34,7 +34,7 @@
 #include <QtCore/QUrl>
 #include <QtCore/QVariant>
 
-#include <QtWidgets/QAction>
+#include <QtGui/QAction>
 #include <QtGui/QFont>
 
 #if defined(BROWSER_QTWEBKIT)
diff --git a/src/assistant/assistant/mainwindow.cpp b/src/assistant/assistant/mainwindow.cpp
index 56312583d..b3c0240ba 100644
--- a/src/assistant/assistant/mainwindow.cpp
+++ b/src/assistant/assistant/mainwindow.cpp
@@ -58,12 +58,14 @@
 #include <QtCore/QFileInfo>
 #include <QtCore/QDir>
 
-#include <QtWidgets/QAction>
-#include <QtWidgets/QComboBox>
-#include <QtWidgets/QDockWidget>
+#include <QtGui/QAction>
 #include <QtGui/QFontDatabase>
 #include <QtGui/QImageReader>
 #include <QtGui/QScreen>
+#include <QtGui/QShortcut>
+
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QDockWidget>
 #include <QtWidgets/QFileDialog>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QLayout>
@@ -71,7 +73,6 @@
 #include <QtWidgets/QMenuBar>
 #include <QtWidgets/QMessageBox>
 #include <QtWidgets/QProgressBar>
-#include <QtWidgets/QShortcut>
 #include <QtWidgets/QStatusBar>
 #include <QtWidgets/QToolBar>
 #include <QtWidgets/QToolButton>
diff --git a/src/designer/src/components/buddyeditor/buddyeditor.cpp b/src/designer/src/components/buddyeditor/buddyeditor.cpp
index 8fb9184e1..55eb63e2a 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor.cpp
+++ b/src/designer/src/components/buddyeditor/buddyeditor.cpp
@@ -40,13 +40,15 @@
 #include <connectionedit_p.h>
 #include <metadatabase_p.h>
 
-#include <QtCore/qdebug.h>
-#include <QtCore/qvector.h>
 #include <QtWidgets/qlabel.h>
 #include <QtWidgets/qmenu.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qapplication.h>
 
+#include <QtGui/qaction.h>
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qvector.h>
+
 #include <algorithm>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/buddyeditor/buddyeditor_plugin.cpp b/src/designer/src/components/buddyeditor/buddyeditor_plugin.cpp
index ec7a13941..868c52125 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor_plugin.cpp
+++ b/src/designer/src/components/buddyeditor/buddyeditor_plugin.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/qaction.h>
+#include <QtGui/qaction.h>
 
 #include "buddyeditor_plugin.h"
 #include "buddyeditor_tool.h"
diff --git a/src/designer/src/components/buddyeditor/buddyeditor_tool.cpp b/src/designer/src/components/buddyeditor/buddyeditor_tool.cpp
index 51b6e4988..2cbb5ec8b 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor_tool.cpp
+++ b/src/designer/src/components/buddyeditor/buddyeditor_tool.cpp
@@ -31,7 +31,7 @@
 
 #include <QtDesigner/abstractformwindow.h>
 
-#include <QtWidgets/qaction.h>
+#include <QtGui/qaction.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/default_actionprovider.cpp b/src/designer/src/components/formeditor/default_actionprovider.cpp
index 663ce8731..6a479e4b1 100644
--- a/src/designer/src/components/formeditor/default_actionprovider.cpp
+++ b/src/designer/src/components/formeditor/default_actionprovider.cpp
@@ -30,8 +30,10 @@
 #include "invisible_widget_p.h"
 #include "qdesigner_toolbar_p.h"
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qapplication.h>
+
+#include <QtGui/qaction.h>
+
 #include <QtCore/qrect.h>
 #include <QtCore/qdebug.h>
 
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index 8285d84c5..b5c5e27e0 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -72,23 +72,11 @@
 
 #include <abstractdialoggui_p.h>
 
-#include <QtCore/qdebug.h>
-#include <QtCore/qbuffer.h>
-#include <QtCore/qtimer.h>
-#include <QtCore/qvector.h>
-#include <QtCore/qxmlstream.h>
 #include <QtWidgets/qmenu.h>
-#include <QtWidgets/qaction.h>
-#include <QtWidgets/qactiongroup.h>
-#if QT_CONFIG(clipboard)
-#include <QtGui/qclipboard.h>
-#endif
-#include <QtWidgets/qundogroup.h>
 #include <QtWidgets/qscrollarea.h>
 #include <QtWidgets/qrubberband.h>
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qsplitter.h>
-#include <QtGui/qpainter.h>
 #include <QtWidgets/qgroupbox.h>
 #include <QtWidgets/qdockwidget.h>
 #include <QtWidgets/qtoolbox.h>
@@ -96,6 +84,20 @@
 #include <QtWidgets/qtabwidget.h>
 #include <QtWidgets/qbuttongroup.h>
 
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
+#if QT_CONFIG(clipboard)
+#  include <QtGui/qclipboard.h>
+#endif
+#include <QtGui/qpainter.h>
+#include <QtGui/qundogroup.h>
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qbuffer.h>
+#include <QtCore/qtimer.h>
+#include <QtCore/qvector.h>
+#include <QtCore/qxmlstream.h>
+
 Q_DECLARE_METATYPE(QWidget*)
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/formeditor/formwindow.h b/src/designer/src/components/formeditor/formwindow.h
index cb5019d35..6bc7dd342 100644
--- a/src/designer/src/components/formeditor/formwindow.h
+++ b/src/designer/src/components/formeditor/formwindow.h
@@ -33,7 +33,7 @@
 #include <formwindowbase_p.h>
 
 // Qt
-#include <QtWidgets/qundostack.h>
+#include <QtGui/qundostack.h>
 #include <QtCore/qhash.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qmap.h>
diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp
index 4c93c7674..da6512211 100644
--- a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp
+++ b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp
@@ -29,11 +29,12 @@
 #include "formwindow_widgetstack.h"
 #include <QtDesigner/abstractformwindowtool.h>
 
-#include <QtWidgets/qwidget.h>
-#include <QtGui/qevent.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qstackedlayout.h>
 #include <QtWidgets/qboxlayout.h>
+#include <QtWidgets/qwidget.h>
+
+#include <QtGui/qevent.h>
+#include <QtGui/qaction.h>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp
index ce3db6583..75af54fe3 100644
--- a/src/designer/src/components/formeditor/formwindowmanager.cpp
+++ b/src/designer/src/components/formeditor/formwindowmanager.cpp
@@ -60,18 +60,19 @@
 #include <QtDesigner/abstractwidgetbox.h>
 #include <QtDesigner/abstractintegration.h>
 
-#include <QtWidgets/qundogroup.h>
-#include <QtWidgets/qaction.h>
-#include <QtWidgets/qsplitter.h>
-#include <QtGui/qevent.h>
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qsizegrip.h>
-#if QT_CONFIG(clipboard)
-#include <QtGui/qclipboard.h>
-#endif
 #include <QtWidgets/qmdiarea.h>
 #include <QtWidgets/qmdisubwindow.h>
 #include <QtWidgets/qmessagebox.h>
+#include <QtWidgets/qsplitter.h>
+
+#include <QtGui/qaction.h>
+#if QT_CONFIG(clipboard)
+#  include <QtGui/qclipboard.h>
+#endif
+#include <QtGui/qevent.h>
+#include <QtGui/qundogroup.h>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/designer/src/components/formeditor/previewactiongroup.h b/src/designer/src/components/formeditor/previewactiongroup.h
index 2e5d77dca..dae1abbe1 100644
--- a/src/designer/src/components/formeditor/previewactiongroup.h
+++ b/src/designer/src/components/formeditor/previewactiongroup.h
@@ -40,7 +40,7 @@
 #ifndef PREVIEWACTIONGROUP_H
 #define PREVIEWACTIONGROUP_H
 
-#include <QtWidgets/qactiongroup.h>
+#include <QtGui/qactiongroup.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index 2a1cdce3f..0acfc4fc9 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -81,8 +81,6 @@
 #include <QtWidgets/qstackedwidget.h>
 #include <QtWidgets/qtoolbar.h>
 #include <QtWidgets/qtabbar.h>
-#include <QtWidgets/qaction.h>
-#include <QtWidgets/qactiongroup.h>
 #include <QtWidgets/qbuttongroup.h>
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qmainwindow.h>
@@ -94,6 +92,9 @@
 #include <QtWidgets/qwizard.h>
 #include <private/qlayoutengine_p.h>
 
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
+
 #include <QtCore/qbuffer.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qmetaobject.h>
diff --git a/src/designer/src/components/formeditor/tool_widgeteditor.cpp b/src/designer/src/components/formeditor/tool_widgeteditor.cpp
index bdfdc2675..582eb0c9e 100644
--- a/src/designer/src/components/formeditor/tool_widgeteditor.cpp
+++ b/src/designer/src/components/formeditor/tool_widgeteditor.cpp
@@ -38,10 +38,12 @@
 #include <qdesigner_dnditem_p.h>
 #include <qdesigner_resource.h>
 
-#include <QtGui/qevent.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qmainwindow.h>
+
+#include <QtGui/qaction.h>
 #include <QtGui/qcursor.h>
+#include <QtGui/qevent.h>
+
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/objectinspector/objectinspectormodel.cpp b/src/designer/src/components/objectinspector/objectinspectormodel.cpp
index f6e7c78f2..ee3957270 100644
--- a/src/designer/src/components/objectinspector/objectinspectormodel.cpp
+++ b/src/designer/src/components/objectinspector/objectinspectormodel.cpp
@@ -41,10 +41,12 @@
 #include <QtDesigner/abstractmetadatabase.h>
 #include <QtDesigner/qextensionmanager.h>
 #include <QtWidgets/qlayout.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qlayoutitem.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qbuttongroup.h>
+
+#include <QtGui/qaction.h>
+
 #include <QtCore/qset.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qcoreapplication.h>
diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
index 94853da86..3088dfc1f 100644
--- a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
+++ b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
@@ -48,25 +48,26 @@
 #include <iconselector_p.h>
 #include <abstractdialoggui_p.h>
 
+#include <QtWidgets/qapplication.h>
 #include <QtWidgets/qlabel.h>
 #include <QtWidgets/qtoolbutton.h>
 #include <QtWidgets/qboxlayout.h>
-#include <QtCore/qfileinfo.h>
-#if QT_CONFIG(clipboard)
-#include <QtGui/qclipboard.h>
-#endif
 #include <QtWidgets/qlineedit.h>
 #include <QtWidgets/qdialogbuttonbox.h>
 #include <QtWidgets/qpushbutton.h>
 #include <QtWidgets/qfiledialog.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qkeysequenceedit.h>
+
+#include <QtGui/qaction.h>
+#if QT_CONFIG(clipboard)
+#include <QtGui/qclipboard.h>
+#endif
 #include <QtGui/qevent.h>
-#include <QtWidgets/qapplication.h>
-#include <QtCore/qurl.h>
 
 #include <QtCore/qdebug.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qurl.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/propertyeditor/paletteeditor.cpp b/src/designer/src/components/propertyeditor/paletteeditor.cpp
index 64ed49a61..bf67ad321 100644
--- a/src/designer/src/components/propertyeditor/paletteeditor.cpp
+++ b/src/designer/src/components/propertyeditor/paletteeditor.cpp
@@ -37,17 +37,6 @@
 #include <QtDesigner/abstractformeditor.h>
 #include <QtDesigner/abstractformwindowmanager.h>
 
-#include <QtCore/qfile.h>
-#include <QtCore/qmetaobject.h>
-#include <QtCore/qsavefile.h>
-#include <QtCore/qxmlstream.h>
-#include <QtGui/qguiapplication.h>
-#include <QtGui/qpainter.h>
-#include <QtGui/qscreen.h>
-#if QT_CONFIG(clipboard)
-#  include <QtGui/qclipboard.h>
-#endif
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qfiledialog.h>
 #include <QtWidgets/qmessagebox.h>
 #include <QtWidgets/qpushbutton.h>
@@ -56,6 +45,19 @@
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qheaderview.h>
 
+#include <QtGui/qaction.h>
+#if QT_CONFIG(clipboard)
+#  include <QtGui/qclipboard.h>
+#endif
+#include <QtGui/qguiapplication.h>
+#include <QtGui/qpainter.h>
+#include <QtGui/qscreen.h>
+
+#include <QtCore/qfile.h>
+#include <QtCore/qmetaobject.h>
+#include <QtCore/qsavefile.h>
+#include <QtCore/qxmlstream.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace qdesigner_internal {
diff --git a/src/designer/src/components/propertyeditor/previewwidget.cpp b/src/designer/src/components/propertyeditor/previewwidget.cpp
index d041ec9be..c489fc09a 100644
--- a/src/designer/src/components/propertyeditor/previewwidget.cpp
+++ b/src/designer/src/components/propertyeditor/previewwidget.cpp
@@ -28,9 +28,10 @@
 
 #include "previewwidget.h"
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qmenu.h>
 
+#include <QtGui/qaction.h>
+
 #include <QtCore/qabstractitemmodel.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp
index 70bbcdb34..6880c8fd2 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -53,7 +53,7 @@
 #include <iconloader_p.h>
 #include <widgetfactory_p.h>
 
-#include <QtWidgets/qaction.h>
+#include <QtWidgets/qlabel.h>
 #include <QtWidgets/qlineedit.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qapplication.h>
@@ -62,8 +62,9 @@
 #include <QtWidgets/qstackedwidget.h>
 #include <QtWidgets/qtoolbar.h>
 #include <QtWidgets/qtoolbutton.h>
-#include <QtWidgets/qactiongroup.h>
-#include <QtWidgets/qlabel.h>
+
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
 #include <QtGui/qpainter.h>
 
 #include <QtCore/qdebug.h>
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
index a510acdb5..2e60d3051 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
@@ -40,9 +40,10 @@
 #include <QtDesigner/abstractmetadatabase.h>
 
 #include <QtWidgets/qapplication.h>
-#include <QtWidgets/qundostack.h>
 #include <QtWidgets/qmenu.h>
 
+#include <QtGui/qundostack.h>
+
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdebug.h>
 
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp
index acf835aaa..60cfdfa6a 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp
@@ -32,7 +32,7 @@
 #include <QtDesigner/abstractformeditor.h>
 #include <QtDesigner/abstractformwindowmanager.h>
 
-#include <QtWidgets/qaction.h>
+#include <QtGui/qaction.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
index f322c90cb..ec828b017 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
@@ -32,7 +32,8 @@
 #include <QtDesigner/private/ui4_p.h>
 #include <QtDesigner/abstractformwindow.h>
 
-#include <QtWidgets/qaction.h>
+#include <QtGui/qaction.h>
+
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
index 70668c362..ef70f0cc4 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -45,13 +45,8 @@
 #include <QtDesigner/abstractformwindowcursor.h>
 #include <abstractdialoggui_p.h>
 
-#include <QtCore/qabstractitemmodel.h>
-#include <QtCore/qdebug.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qbuttongroup.h>
 #include <QtWidgets/qmenu.h>
-#include <QtCore/qsortfilterproxymodel.h>
-#include <QtGui/qstandarditemmodel.h>
 #include <QtWidgets/qcombobox.h>
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qitemdelegate.h>
@@ -63,6 +58,13 @@
 #include <QtWidgets/qbuttongroup.h>
 #include <QtWidgets/qtoolbar.h>
 
+#include <QtGui/qaction.h>
+#include <QtGui/qstandarditemmodel.h>
+
+#include <QtCore/qabstractitemmodel.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qsortfilterproxymodel.h>
+
 QT_BEGIN_NAMESPACE
 
 // Add suitable form widgets to a list of objects for the  signal slot
diff --git a/src/designer/src/components/tabordereditor/tabordereditor_plugin.cpp b/src/designer/src/components/tabordereditor/tabordereditor_plugin.cpp
index 4e224ef15..a95d1fe16 100644
--- a/src/designer/src/components/tabordereditor/tabordereditor_plugin.cpp
+++ b/src/designer/src/components/tabordereditor/tabordereditor_plugin.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <QtWidgets/qaction.h>
+#include <QtGui/qaction.h>
 
 #include "tabordereditor_plugin.h"
 #include "tabordereditor_tool.h"
diff --git a/src/designer/src/components/tabordereditor/tabordereditor_tool.cpp b/src/designer/src/components/tabordereditor/tabordereditor_tool.cpp
index c70f3032c..64da96937 100644
--- a/src/designer/src/components/tabordereditor/tabordereditor_tool.cpp
+++ b/src/designer/src/components/tabordereditor/tabordereditor_tool.cpp
@@ -31,8 +31,9 @@
 
 #include <QtDesigner/abstractformwindow.h>
 
+#include <QtGui/qaction.h>
+
 #include <QtCore/qcoreevent.h>
-#include <QtWidgets/qaction.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/taskmenu/button_taskmenu.cpp b/src/designer/src/components/taskmenu/button_taskmenu.cpp
index 9940fcfdc..bd7fd448a 100644
--- a/src/designer/src/components/taskmenu/button_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/button_taskmenu.cpp
@@ -38,14 +38,16 @@
 #include <QtDesigner/abstractobjectinspector.h>
 #include <QtDesigner/abstractpropertyeditor.h>
 
-#include <QtWidgets/qaction.h>
-#include <QtWidgets/qactiongroup.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qstyle.h>
 #include <QtWidgets/qstyleoption.h>
 #include <QtWidgets/qabstractbutton.h>
 #include <QtWidgets/qbuttongroup.h>
 #include <QtWidgets/qapplication.h>
+
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
+
 #include <QtCore/qdebug.h>
 
 Q_DECLARE_METATYPE(QButtonGroup*)
diff --git a/src/designer/src/components/taskmenu/combobox_taskmenu.cpp b/src/designer/src/components/taskmenu/combobox_taskmenu.cpp
index dbf367529..37bd05b91 100644
--- a/src/designer/src/components/taskmenu/combobox_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/combobox_taskmenu.cpp
@@ -33,12 +33,13 @@
 
 #include <QtDesigner/abstractformwindow.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qstyle.h>
 #include <QtWidgets/qlineedit.h>
 #include <QtWidgets/qfontcombobox.h>
 #include <QtWidgets/qstyleoption.h>
 
+#include <QtGui/qaction.h>
+
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
diff --git a/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp b/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
index 47d03e794..2fe3a39d1 100644
--- a/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
@@ -38,7 +38,6 @@
 #include <promotiontaskmenu_p.h>
 #include <widgetdatabase_p.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qmainwindow.h>
 #include <QtWidgets/qtoolbox.h>
 #include <QtWidgets/qstackedwidget.h>
@@ -48,6 +47,8 @@
 #include <QtWidgets/qwizard.h>
 #include <QtWidgets/qmenu.h>
 
+#include <QtGui/qaction.h>
+
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
index c40f77468..1871cd50c 100644
--- a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
@@ -31,10 +31,11 @@
 
 #include <QtDesigner/abstractformwindow.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qstyle.h>
 #include <QtWidgets/qstyleoption.h>
 
+#include <QtGui/qaction.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace qdesigner_internal {
diff --git a/src/designer/src/components/taskmenu/inplace_widget_helper.cpp b/src/designer/src/components/taskmenu/inplace_widget_helper.cpp
index 44145bdba..5b38e832f 100644
--- a/src/designer/src/components/taskmenu/inplace_widget_helper.cpp
+++ b/src/designer/src/components/taskmenu/inplace_widget_helper.cpp
@@ -29,10 +29,12 @@
 #include "abstractformwindow.h"
 #include "inplace_widget_helper.h"
 
-#include <QtGui/qevent.h>
+
 #include <QtWidgets/qpushbutton.h>
 #include <QtWidgets/qtoolbutton.h>
-#include <QtWidgets/qshortcut.h>
+
+#include <QtGui/qevent.h>
+#include <QtGui/qshortcut.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/taskmenu/label_taskmenu.cpp b/src/designer/src/components/taskmenu/label_taskmenu.cpp
index c446e5ab1..607a10815 100644
--- a/src/designer/src/components/taskmenu/label_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/label_taskmenu.cpp
@@ -31,9 +31,10 @@
 
 #include <QtDesigner/abstractformwindow.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qstyle.h>
 #include <QtWidgets/qstyleoption.h>
+
+#include <QtGui/qaction.h>
 #include <QtGui/qtextdocument.h>
 
 static const char *textPropertyC = "text";
diff --git a/src/designer/src/components/taskmenu/layouttaskmenu.cpp b/src/designer/src/components/taskmenu/layouttaskmenu.cpp
index 82a1a9687..f28593c57 100644
--- a/src/designer/src/components/taskmenu/layouttaskmenu.cpp
+++ b/src/designer/src/components/taskmenu/layouttaskmenu.cpp
@@ -32,7 +32,8 @@
 
 #include <QtDesigner/abstractformwindow.h>
 
-#include <QtWidgets/qaction.h>
+#include <QtGui/qaction.h>
+
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
index 5315f59d8..5f9aa9a9a 100644
--- a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
@@ -31,10 +31,11 @@
 
 #include <QtDesigner/abstractformwindow.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qstyle.h>
 #include <QtWidgets/qstyleoption.h>
 
+#include <QtGui/qaction.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace qdesigner_internal {
diff --git a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp
index 323b3da7a..b5f9bc200 100644
--- a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp
@@ -33,11 +33,12 @@
 
 #include <QtDesigner/abstractformwindow.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qstyle.h>
 #include <QtWidgets/qlineedit.h>
 #include <QtWidgets/qstyleoption.h>
 
+#include <QtGui/qaction.h>
+
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
diff --git a/src/designer/src/components/taskmenu/menutaskmenu.cpp b/src/designer/src/components/taskmenu/menutaskmenu.cpp
index 73efae9d2..35f6ab9be 100644
--- a/src/designer/src/components/taskmenu/menutaskmenu.cpp
+++ b/src/designer/src/components/taskmenu/menutaskmenu.cpp
@@ -30,7 +30,8 @@
 
 #include <promotiontaskmenu_p.h>
 
-#include <QtWidgets/qaction.h>
+#include <QtGui/qaction.h>
+
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
index aad9aede0..51945a9f3 100644
--- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
@@ -32,11 +32,12 @@
 #include <QtDesigner/abstractformwindow.h>
 
 #include <QtWidgets/qtablewidget.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qlineedit.h>
 #include <QtWidgets/qstyle.h>
 #include <QtWidgets/qstyleoption.h>
 
+#include <QtGui/qaction.h>
+
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
diff --git a/src/designer/src/components/taskmenu/textedit_taskmenu.cpp b/src/designer/src/components/taskmenu/textedit_taskmenu.cpp
index b2c6f8e10..f95c99103 100644
--- a/src/designer/src/components/taskmenu/textedit_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/textedit_taskmenu.cpp
@@ -30,7 +30,8 @@
 
 #include <QtDesigner/abstractformwindow.h>
 
-#include <QtWidgets/qaction.h>
+#include <QtGui/qaction.h>
+
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qdebug.h>
 
diff --git a/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp b/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp
index 6ac558546..7571836e2 100644
--- a/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp
@@ -34,8 +34,8 @@
 #include <promotiontaskmenu_p.h>
 #include <qdesigner_command_p.h>
 
-#include <QtWidgets/qaction.h>
-#include <QtWidgets/qundostack.h>
+#include <QtGui/qaction.h>
+#include <QtGui/qundostack.h>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp
index e0c14a4bc..77ebd2eca 100644
--- a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp
@@ -31,11 +31,12 @@
 
 #include <QtDesigner/abstractformwindow.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qstyle.h>
 #include <QtWidgets/qlineedit.h>
 #include <QtWidgets/qstyleoption.h>
 
+#include <QtGui/qaction.h>
+
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index 9c1112eb8..56eee5772 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -43,13 +43,14 @@
 
 #include <QtUiPlugin/customwidget.h>
 
-#include <QtWidgets/qheaderview.h>
 #include <QtWidgets/qapplication.h>
+#include <QtWidgets/qheaderview.h>
+#include <QtWidgets/qmenu.h>
 #include <QtWidgets/qtreewidget.h>
+
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
 #include <QtGui/qevent.h>
-#include <QtWidgets/qaction.h>
-#include <QtWidgets/qactiongroup.h>
-#include <QtWidgets/qmenu.h>
 
 #include <QtCore/qfile.h>
 #include <QtCore/qtimer.h>
diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp
index 8e2e4dc0f..09f956117 100644
--- a/src/designer/src/designer/mainwindow.cpp
+++ b/src/designer/src/designer/mainwindow.cpp
@@ -37,8 +37,6 @@
 
 #include <QtDesigner/abstractformwindow.h>
 
-#include <QtWidgets/qaction.h>
-#include <QtGui/qevent.h>
 #include <QtWidgets/qtoolbar.h>
 #include <QtWidgets/qmdisubwindow.h>
 #include <QtWidgets/qstatusbar.h>
@@ -46,6 +44,10 @@
 #include <QtWidgets/qlayout.h>
 #include <QtWidgets/qdockwidget.h>
 
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
+#include <QtGui/qevent.h>
+
 #include <QtCore/qurl.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qmimedata.h>
diff --git a/src/designer/src/designer/newform.cpp b/src/designer/src/designer/newform.cpp
index 35199927a..6a7b1637b 100644
--- a/src/designer/src/designer/newform.cpp
+++ b/src/designer/src/designer/newform.cpp
@@ -36,12 +36,6 @@
 
 #include <QtDesigner/abstractformeditor.h>
 
-#include <QtCore/qdir.h>
-#include <QtCore/qfileinfo.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qtemporaryfile.h>
-
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qboxlayout.h>
 #include <QtWidgets/qpushbutton.h>
@@ -51,6 +45,15 @@
 #include <QtWidgets/qframe.h>
 #include <QtWidgets/qmessagebox.h>
 
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
+
+#include <QtCore/qdir.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qtemporaryfile.h>
+
 QT_BEGIN_NAMESPACE
 
 NewForm::NewForm(QDesignerWorkbench *workbench, QWidget *parentWidget, const QString &fileName)
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index cfb9e5cac..37f87cf20 100644
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -60,14 +60,17 @@
 #include <QtDesigner/private/shared_settings_p.h>
 #include <QtDesigner/private/formwindowbase_p.h>
 
-#include <QtWidgets/qaction.h>
-#include <QtWidgets/qactiongroup.h>
 #include <QtWidgets/qstylefactory.h>
 #include <QtWidgets/qfiledialog.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qmessagebox.h>
 #include <QtWidgets/qmdisubwindow.h>
 #include <QtWidgets/qpushbutton.h>
+#include <QtWidgets/qstatusbar.h>
+#include <QtWidgets/qdesktopwidget.h>
+
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
 #include <QtGui/qevent.h>
 #include <QtGui/qicon.h>
 #include <QtGui/qimage.h>
@@ -83,8 +86,8 @@
 #include <QtGui/qpainter.h>
 #include <QtGui/qtransform.h>
 #include <QtGui/qcursor.h>
-#include <QtCore/qsize.h>
 
+#include <QtCore/qsize.h>
 #include <QtCore/qlibraryinfo.h>
 #include <QtCore/qbuffer.h>
 #include <QtCore/qpluginloader.h>
@@ -94,8 +97,6 @@
 #include <QtCore/qfileinfo.h>
 #include <QtCore/qsavefile.h>
 #include <QtCore/qscopedpointer.h>
-#include <QtWidgets/qstatusbar.h>
-#include <QtWidgets/qdesktopwidget.h>
 #include <QtXml/qdom.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/designer/qdesigner_formwindow.cpp b/src/designer/src/designer/qdesigner_formwindow.cpp
index 19c79e52d..100b0c3a7 100644
--- a/src/designer/src/designer/qdesigner_formwindow.cpp
+++ b/src/designer/src/designer/qdesigner_formwindow.cpp
@@ -39,17 +39,18 @@
 #include <QtDesigner/taskmenu.h>
 #include <QtDesigner/qextensionmanager.h>
 
-#include <QtCore/qfile.h>
-#include <QtCore/qregularexpression.h>
-
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qfiledialog.h>
 #include <QtWidgets/qmessagebox.h>
 #include <QtWidgets/qpushbutton.h>
 #include <QtWidgets/qboxlayout.h>
-#include <QtWidgets/qundostack.h>
 
+#include <QtGui/qaction.h>
 #include <QtGui/qevent.h>
+#include <QtGui/qundostack.h>
+
+#include <QtCore/qfile.h>
+#include <QtCore/qregularexpression.h>
+
 QT_BEGIN_NAMESPACE
 
 QDesignerFormWindow::QDesignerFormWindow(QDesignerFormWindowInterface *editor, QDesignerWorkbench *workbench, QWidget *parent, Qt::WindowFlags flags)
diff --git a/src/designer/src/designer/qdesigner_toolwindow.cpp b/src/designer/src/designer/qdesigner_toolwindow.cpp
index e71edcb0c..6262d15ac 100644
--- a/src/designer/src/designer/qdesigner_toolwindow.cpp
+++ b/src/designer/src/designer/qdesigner_toolwindow.cpp
@@ -38,10 +38,11 @@
 #include <QtDesigner/abstractwidgetbox.h>
 #include <QtDesigner/QDesignerComponents>
 
-#include <QtCore/qdebug.h>
-#include <QtWidgets/qaction.h>
+#include <QtGui/qaction.h>
 #include <QtGui/qevent.h>
 
+#include <QtCore/qdebug.h>
+
 enum { debugToolWindow = 0 };
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index b3b14d1c0..9af0b3138 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -48,16 +48,6 @@
 #include <QtDesigner/private/formwindowbase_p.h>
 #include <QtDesigner/private/actioneditor_p.h>
 
-#include <QtCore/qdir.h>
-#include <QtCore/qfile.h>
-#include <QtCore/qurl.h>
-#include <QtCore/qtimer.h>
-#include <QtCore/qpluginloader.h>
-#include <QtCore/qdebug.h>
-
-#include <QtWidgets/qactiongroup.h>
-#include <QtGui/qevent.h>
-#include <QtGui/qscreen.h>
 #include <QtWidgets/qdockwidget.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qmenubar.h>
@@ -68,6 +58,17 @@
 #include <QtWidgets/qmdisubwindow.h>
 #include <QtWidgets/qlayout.h>
 
+#include <QtGui/qactiongroup.h>
+#include <QtGui/qevent.h>
+#include <QtGui/qscreen.h>
+
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qurl.h>
+#include <QtCore/qtimer.h>
+#include <QtCore/qpluginloader.h>
+#include <QtCore/qdebug.h>
+
 QT_BEGIN_NAMESPACE
 
 static const char *appFontPrefixC = "AppFonts";
diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp
index 006a4048d..12cef9179 100644
--- a/src/designer/src/lib/shared/actioneditor.cpp
+++ b/src/designer/src/lib/shared/actioneditor.cpp
@@ -49,21 +49,23 @@
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qtoolbar.h>
 #include <QtWidgets/qsplitter.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qapplication.h>
 #if QT_CONFIG(clipboard)
 #include <QtGui/qclipboard.h>
 #endif
 #include <QtWidgets/qitemdelegate.h>
-#include <QtGui/qpainter.h>
 #include <QtWidgets/qboxlayout.h>
 #include <QtWidgets/qlineedit.h>
 #include <QtWidgets/qlabel.h>
 #include <QtWidgets/qpushbutton.h>
 #include <QtWidgets/qtoolbutton.h>
+
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
 #include <QtGui/qevent.h>
-#include <QtCore/qitemselectionmodel.h>
+#include <QtGui/qpainter.h>
 
+#include <QtCore/qitemselectionmodel.h>
 #include <QtCore/qregularexpression.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qbuffer.h>
diff --git a/src/designer/src/lib/shared/actionrepository.cpp b/src/designer/src/lib/shared/actionrepository.cpp
index 6162d02e2..0ed567bc1 100644
--- a/src/designer/src/lib/shared/actionrepository.cpp
+++ b/src/designer/src/lib/shared/actionrepository.cpp
@@ -35,16 +35,17 @@
 #include <QtDesigner/propertysheet.h>
 #include <QtDesigner/qextensionmanager.h>
 
-#include <QtGui/qdrag.h>
-#include <QtGui/qevent.h>
-#include <QtGui/qstandarditemmodel.h>
 #include <QtWidgets/qtoolbutton.h>
-#include <QtGui/qpixmap.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qheaderview.h>
 #include <QtWidgets/qtoolbar.h>
 #include <QtWidgets/qmenu.h>
+
+#include <QtGui/qpixmap.h>
+#include <QtGui/qaction.h>
+#include <QtGui/qdrag.h>
 #include <QtGui/qevent.h>
+#include <QtGui/qstandarditemmodel.h>
+
 #include <QtCore/qset.h>
 #include <QtCore/qdebug.h>
 
diff --git a/src/designer/src/lib/shared/codedialog.cpp b/src/designer/src/lib/shared/codedialog.cpp
index e3b3f0d74..34bc56196 100644
--- a/src/designer/src/lib/shared/codedialog.cpp
+++ b/src/designer/src/lib/shared/codedialog.cpp
@@ -32,21 +32,22 @@
 
 #include <texteditfindwidget.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qapplication.h>
 #if QT_CONFIG(clipboard)
 #include <QtGui/qclipboard.h>
 #endif
 #include <QtWidgets/qdialogbuttonbox.h>
 #include <QtWidgets/qfiledialog.h>
-#include <QtGui/qicon.h>
-#include <QtGui/qevent.h>
 #include <QtWidgets/qmessagebox.h>
 #include <QtWidgets/qpushbutton.h>
 #include <QtWidgets/qtextedit.h>
 #include <QtWidgets/qtoolbar.h>
 #include <QtWidgets/qboxlayout.h>
 
+#include <QtGui/qaction.h>
+#include <QtGui/qevent.h>
+#include <QtGui/qicon.h>
+
 #include <QtCore/qdebug.h>
 #include <QtCore/qdir.h>
 #include <QtCore/qmimedatabase.h>
diff --git a/src/designer/src/lib/shared/connectionedit.cpp b/src/designer/src/lib/shared/connectionedit.cpp
index 5e43607d4..5bfdd3d18 100644
--- a/src/designer/src/lib/shared/connectionedit.cpp
+++ b/src/designer/src/lib/shared/connectionedit.cpp
@@ -31,14 +31,15 @@
 
 #include <QtDesigner/abstractformwindow.h>
 
+#include <QtWidgets/qapplication.h>
+#include <QtWidgets/qmenu.h>
+
+#include <QtGui/qaction.h>
 #include <QtGui/qpainter.h>
 #include <QtGui/qevent.h>
 #include <QtGui/qfontmetrics.h>
 #include <QtGui/qpixmap.h>
 #include <QtGui/qtransform.h>
-#include <QtWidgets/qapplication.h>
-#include <QtWidgets/qmenu.h>
-#include <QtWidgets/qaction.h>
 
 #include <QtCore/qmap.h>
 
diff --git a/src/designer/src/lib/shared/connectionedit_p.h b/src/designer/src/lib/shared/connectionedit_p.h
index 51ad450f8..141cee8d9 100644
--- a/src/designer/src/lib/shared/connectionedit_p.h
+++ b/src/designer/src/lib/shared/connectionedit_p.h
@@ -51,8 +51,7 @@
 #include <QtWidgets/qwidget.h>
 #include <QtGui/qpixmap.h>
 #include <QtGui/qpolygon.h>
-
-#include <QtWidgets/qundostack.h>
+#include <QtGui/qundostack.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/lib/shared/formlayoutmenu.cpp b/src/designer/src/lib/shared/formlayoutmenu.cpp
index 58631b5db..220c3805b 100644
--- a/src/designer/src/lib/shared/formlayoutmenu.cpp
+++ b/src/designer/src/lib/shared/formlayoutmenu.cpp
@@ -41,13 +41,14 @@
 #include <QtDesigner/abstractwidgetdatabase.h>
 #include <QtDesigner/abstractlanguage.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qwidget.h>
 #include <QtWidgets/qformlayout.h>
-#include <QtWidgets/qundostack.h>
 #include <QtWidgets/qdialog.h>
 #include <QtWidgets/qpushbutton.h>
+
+#include <QtGui/qaction.h>
 #include <QtGui/qvalidator.h>
+#include <QtGui/qundostack.h>
 
 #include <QtCore/qpair.h>
 #include <QtCore/qcoreapplication.h>
diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp
index 7f2dd4d55..81529d1ad 100644
--- a/src/designer/src/lib/shared/formwindowbase.cpp
+++ b/src/designer/src/lib/shared/formwindowbase.cpp
@@ -45,10 +45,6 @@
 #include <QtDesigner/taskmenu.h>
 #include <QtDesigner/abstractintegration.h>
 
-#include <QtCore/qdebug.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qset.h>
-#include <QtCore/qtimer.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qlistwidget.h>
 #include <QtWidgets/qtreewidget.h>
@@ -59,9 +55,15 @@
 #include <QtWidgets/qtoolbar.h>
 #include <QtWidgets/qstatusbar.h>
 #include <QtWidgets/qmenu.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qlabel.h>
 
+#include <QtGui/qaction.h>
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qlist.h>
+#include <QtCore/qset.h>
+#include <QtCore/qtimer.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace qdesigner_internal {
diff --git a/src/designer/src/lib/shared/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp
index ccfdc5c18..cb2ba770a 100644
--- a/src/designer/src/lib/shared/iconselector.cpp
+++ b/src/designer/src/lib/shared/iconselector.cpp
@@ -42,7 +42,6 @@
 
 #include <QtWidgets/qtoolbutton.h>
 #include <QtWidgets/qcombobox.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qdialogbuttonbox.h>
 #include <QtWidgets/qpushbutton.h>
 #include <QtWidgets/qdialog.h>
@@ -53,7 +52,10 @@
 #include <QtWidgets/qdialogbuttonbox.h>
 #include <QtWidgets/qlineedit.h>
 #include <QtWidgets/qlabel.h>
+
+#include <QtGui/qaction.h>
 #include <QtGui/qvalidator.h>
+
 #include <QtCore/qdebug.h>
 #include <QtCore/qvector.h>
 
diff --git a/src/designer/src/lib/shared/morphmenu.cpp b/src/designer/src/lib/shared/morphmenu.cpp
index f92d9600b..976a27ded 100644
--- a/src/designer/src/lib/shared/morphmenu.cpp
+++ b/src/designer/src/lib/shared/morphmenu.cpp
@@ -44,11 +44,10 @@
 #include <QtDesigner/propertysheet.h>
 
 #include <QtWidgets/qwidget.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qlayout.h>
-#include <QtWidgets/qundostack.h>
+#include <QtGui/qundostack.h>
 #include <QtWidgets/qsplitter.h>
 
 #include <QtWidgets/qframe.h>
@@ -63,6 +62,8 @@
 #include <QtWidgets/qplaintextedit.h>
 #include <QtWidgets/qlabel.h>
 
+#include <QtGui/qaction.h>
+
 #include <QtCore/qstringlist.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qvariant.h>
diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp
index 68466d597..2caaa13ba 100644
--- a/src/designer/src/lib/shared/previewmanager.cpp
+++ b/src/designer/src/lib/shared/previewmanager.cpp
@@ -51,8 +51,8 @@
 #include <QtWidgets/qboxlayout.h>
 #include <QtWidgets/qdialog.h>
 #include <QtWidgets/qmenu.h>
-#include <QtWidgets/qaction.h>
-#include <QtWidgets/qactiongroup.h>
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
 #include <QtGui/qcursor.h>
 #include <QtGui/qtransform.h>
 
diff --git a/src/designer/src/lib/shared/promotiontaskmenu.cpp b/src/designer/src/lib/shared/promotiontaskmenu.cpp
index 33554707a..c458d2604 100644
--- a/src/designer/src/lib/shared/promotiontaskmenu.cpp
+++ b/src/designer/src/lib/shared/promotiontaskmenu.cpp
@@ -42,9 +42,11 @@
 #include <QtDesigner/abstractformeditor.h>
 #include <QtDesigner/qextensionmanager.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qwidget.h>
 #include <QtWidgets/qmenu.h>
+
+#include <QtGui/qaction.h>
+
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h b/src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h
index e6ee08301..071c090c6 100644
--- a/src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h
+++ b/src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h
@@ -41,8 +41,11 @@
 #define QDESIGNER_FORMEDITORCOMMAND_H
 
 #include "shared_global_p.h"
+
+#include <QtGui/qundostack.h>
+
 #include <QtCore/qpointer.h>
-#include <QtWidgets/qundostack.h>
+
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h b/src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h
index bccc11d1b..ff5328792 100644
--- a/src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h
+++ b/src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h
@@ -42,8 +42,9 @@
 
 #include "shared_global_p.h"
 
+#include <QtGui/qundostack.h>
+
 #include <QtCore/qpointer.h>
-#include <QtWidgets/qundostack.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/lib/shared/qdesigner_menu.cpp b/src/designer/src/lib/shared/qdesigner_menu.cpp
index a8cad50d3..01d6eec37 100644
--- a/src/designer/src/lib/shared/qdesigner_menu.cpp
+++ b/src/designer/src/lib/shared/qdesigner_menu.cpp
@@ -37,23 +37,24 @@
 #include "qdesigner_utils_p.h"
 #include "qdesigner_objectinspector_p.h"
 
-#include <QtCore/qtimer.h>
-#include <QtCore/qdebug.h>
-
 #include <QtDesigner/abstractformeditor.h>
 #include <QtDesigner/abstractwidgetfactory.h>
 #include <QtDesigner/abstractmetadatabase.h>
 #include <QtDesigner/qextensionmanager.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qlineedit.h>
-#include <QtGui/qpainter.h>
-#include <QtGui/qdrag.h>
 #include <QtWidgets/qrubberband.h>
 #include <QtWidgets/qtooltip.h>
 #include <QtWidgets/qtoolbar.h>
+
+#include <QtGui/qaction.h>
+#include <QtGui/qdrag.h>
 #include <QtGui/qevent.h>
+#include <QtGui/qpainter.h>
+
+#include <QtCore/qtimer.h>
+#include <QtCore/qdebug.h>
 
 Q_DECLARE_METATYPE(QAction*)
 
diff --git a/src/designer/src/lib/shared/qdesigner_menu_p.h b/src/designer/src/lib/shared/qdesigner_menu_p.h
index 5fc8f3c8e..1093961eb 100644
--- a/src/designer/src/lib/shared/qdesigner_menu_p.h
+++ b/src/designer/src/lib/shared/qdesigner_menu_p.h
@@ -42,9 +42,11 @@
 
 #include "shared_global_p.h"
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qmenu.h>
+
+#include <QtGui/qaction.h>
 #include <QtGui/qpixmap.h>
+
 #include <QtCore/qhash.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/lib/shared/qdesigner_menubar_p.h b/src/designer/src/lib/shared/qdesigner_menubar_p.h
index bd86b809f..87631ea5b 100644
--- a/src/designer/src/lib/shared/qdesigner_menubar_p.h
+++ b/src/designer/src/lib/shared/qdesigner_menubar_p.h
@@ -42,9 +42,10 @@
 
 #include "shared_global_p.h"
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qmenubar.h>
 
+#include <QtGui/qaction.h>
+
 #include <QtCore/qpointer.h>
 #include <QtCore/qmimedata.h>
 
diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
index e2dd81509..186410fd0 100644
--- a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
+++ b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp
@@ -39,22 +39,24 @@
 #include <QtDesigner/abstractintegration.h>
 #include <abstractdialoggui_p.h>
 
-#include <QtCore/qtimer.h>
 #include <QtWidgets/qboxlayout.h>
 #include <QtWidgets/qformlayout.h>
 #include <QtWidgets/qdialogbuttonbox.h>
 #include <QtWidgets/qtreeview.h>
 #include <QtWidgets/qheaderview.h>
 #include <QtWidgets/qpushbutton.h>
-#include <QtCore/qitemselectionmodel.h>
 #include <QtWidgets/qcombobox.h>
 #include <QtWidgets/qlineedit.h>
 #include <QtWidgets/qcheckbox.h>
-#include <QtGui/qvalidator.h>
 #include <QtWidgets/qlabel.h>
 #include <QtWidgets/qlayoutitem.h>
 #include <QtWidgets/qmenu.h>
-#include <QtWidgets/qaction.h>
+
+#include <QtGui/qaction.h>
+#include <QtGui/qvalidator.h>
+
+#include <QtCore/qitemselectionmodel.h>
+#include <QtCore/qtimer.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
index 8eec59868..c8e9df2d3 100644
--- a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp
@@ -45,15 +45,17 @@
 #include <QtDesigner/abstractwidgetdatabase.h>
 #include <QtDesigner/qextensionmanager.h>
 
-#include <QtCore/qsize.h>
-#include <QtCore/qtextstream.h>
 #include <QtWidgets/qwidget.h>
 #include <QtWidgets/qapplication.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qdialog.h>
 #include <QtWidgets/qpushbutton.h>
 #include <QtWidgets/qlayout.h>
-#include <qdebug.h>
+
+#include <QtGui/qaction.h>
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qsize.h>
+#include <QtCore/qtextstream.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp b/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp
index 69f1cdf87..a31b6ab08 100644
--- a/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp
@@ -34,10 +34,12 @@
 #include <QtDesigner/propertysheet.h>
 #include <QtDesigner/qextensionmanager.h>
 #include <widgetfactory_p.h>
-#include <QtWidgets/qaction.h>
+
 #include <QtWidgets/qlineedit.h>
 #include <QtWidgets/qabstractbutton.h>
 
+#include <QtGui/qaction.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace qdesigner_internal {
diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
index cf0933757..163107732 100644
--- a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
+++ b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
@@ -39,8 +39,6 @@
 #include <QtDesigner/abstractformeditor.h>
 #include <QtDesigner/abstractwidgetdatabase.h>
 
-#include <QtCore/qdebug.h>
-
 #include <QtWidgets/qlayout.h>
 #include <QtWidgets/qdockwidget.h>
 #include <QtWidgets/qdialog.h>
@@ -49,12 +47,15 @@
 #include <QtWidgets/qgroupbox.h>
 #include <QtWidgets/qstyle.h>
 #include <QtWidgets/qabstractbutton.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qtoolbar.h>
 #include <QtWidgets/qmainwindow.h>
 #include <QtWidgets/qmenubar.h>
 
+#include <QtGui/qaction.h>
+
+#include <QtCore/qdebug.h>
+
 QT_BEGIN_NAMESPACE
 
 #define USE_LAYOUT_SIZE_CONSTRAINT
diff --git a/src/designer/src/lib/shared/qdesigner_stackedbox.cpp b/src/designer/src/lib/shared/qdesigner_stackedbox.cpp
index a85df2693..c62b12972 100644
--- a/src/designer/src/lib/shared/qdesigner_stackedbox.cpp
+++ b/src/designer/src/lib/shared/qdesigner_stackedbox.cpp
@@ -36,10 +36,12 @@
 #include <QtDesigner/abstractformwindow.h>
 
 #include <QtWidgets/qtoolbutton.h>
-#include <QtWidgets/qaction.h>
-#include <QtGui/qevent.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qstackedwidget.h>
+
+#include <QtGui/qaction.h>
+#include <QtGui/qevent.h>
+
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
index 42a72b403..0dcc82e07 100644
--- a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
+++ b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp
@@ -36,13 +36,14 @@
 
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qtabbar.h>
-#include <QtWidgets/qaction.h>
-#include <QtGui/qevent.h>
-#include <QtGui/qdrag.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qlabel.h>
 #include <QtWidgets/qtabwidget.h>
 
+#include <QtGui/qaction.h>
+#include <QtGui/qevent.h>
+#include <QtGui/qdrag.h>
+
 #include <QtCore/qdebug.h>
 #include <QtCore/qmimedata.h>
 
diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp
index f2a399752..c73a99d86 100644
--- a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp
+++ b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp
@@ -60,8 +60,6 @@
 #include <QtDesigner/abstractintegration.h>
 #include <QtDesigner/qextensionmanager.h>
 
-#include <QtWidgets/qaction.h>
-#include <QtWidgets/qactiongroup.h>
 #include <QtWidgets/qwidget.h>
 #include <QtWidgets/qmenubar.h>
 #include <QtWidgets/qmainwindow.h>
@@ -69,7 +67,11 @@
 #include <QtWidgets/qdialogbuttonbox.h>
 #include <QtWidgets/qboxlayout.h>
 #include <QtWidgets/qpushbutton.h>
-#include <QtWidgets/qundostack.h>
+
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
+#include <QtGui/qundostack.h>
+
 #include <QtCore/qdebug.h>
 #include <QtCore/qcoreapplication.h>
 
diff --git a/src/designer/src/lib/shared/qdesigner_toolbar.cpp b/src/designer/src/lib/shared/qdesigner_toolbar.cpp
index 83637eedc..62dd127ce 100644
--- a/src/designer/src/lib/shared/qdesigner_toolbar.cpp
+++ b/src/designer/src/lib/shared/qdesigner_toolbar.cpp
@@ -41,14 +41,15 @@
 #include <QtDesigner/qextensionmanager.h>
 #include <QtDesigner/abstractwidgetfactory.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qapplication.h>
 #include <QtWidgets/qtoolbutton.h>
 #include <QtWidgets/qtoolbar.h>
 #include <QtWidgets/qmenu.h>
+
+#include <QtGui/qaction.h>
 #include <QtGui/qevent.h>
 #include <QtGui/qdrag.h>
-#include <QtWidgets/qapplication.h>
+
 #include <QtCore/qdebug.h>
 
 Q_DECLARE_METATYPE(QAction*)
diff --git a/src/designer/src/lib/shared/qdesigner_toolbar_p.h b/src/designer/src/lib/shared/qdesigner_toolbar_p.h
index c9fef9fec..272b5dddc 100644
--- a/src/designer/src/lib/shared/qdesigner_toolbar_p.h
+++ b/src/designer/src/lib/shared/qdesigner_toolbar_p.h
@@ -42,9 +42,10 @@
 
 #include "shared_global_p.h"
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qtoolbutton.h>
 
+#include <QtGui/qaction.h>
+
 #include <QtCore/qlist.h>
 #include <QtCore/qpoint.h>
 
diff --git a/src/designer/src/lib/shared/qdesigner_toolbox.cpp b/src/designer/src/lib/shared/qdesigner_toolbox.cpp
index 3a7ed6307..26b36c8f9 100644
--- a/src/designer/src/lib/shared/qdesigner_toolbox.cpp
+++ b/src/designer/src/lib/shared/qdesigner_toolbox.cpp
@@ -34,12 +34,14 @@
 
 #include <QtDesigner/abstractformwindow.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qtoolbox.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qlayout.h>
 #include <QtWidgets/qapplication.h>
+
+#include <QtGui/qaction.h>
 #include <QtGui/qevent.h>
+
 #include <QtCore/qhash.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/lib/shared/qsimpleresource.cpp b/src/designer/src/lib/shared/qsimpleresource.cpp
index 3d79379b2..47c33ec22 100644
--- a/src/designer/src/lib/shared/qsimpleresource.cpp
+++ b/src/designer/src/lib/shared/qsimpleresource.cpp
@@ -40,13 +40,14 @@
 
 #include <QtUiPlugin/customwidget.h>
 
-#include <QtGui/qicon.h>
 #include <QtWidgets/qwidget.h>
-#include <QtWidgets/qaction.h>
+
+#include <QtGui/qaction.h>
+#include <QtGui/qicon.h>
+
 #include <QtCore/qdebug.h>
 #include <QtCore/qcoreapplication.h>
 
-
 QT_BEGIN_NAMESPACE
 
 namespace qdesigner_internal {
diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp
index 61f00a53d..292329e2e 100644
--- a/src/designer/src/lib/shared/qtresourceview.cpp
+++ b/src/designer/src/lib/shared/qtresourceview.cpp
@@ -35,28 +35,30 @@
 #include <QtDesigner/abstractsettings.h>
 
 #include <QtWidgets/qtoolbar.h>
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qsplitter.h>
 #include <QtWidgets/qtreewidget.h>
 #include <QtWidgets/qlistwidget.h>
 #include <QtWidgets/qheaderview.h>
 #include <QtWidgets/qboxlayout.h>
-#include <QtGui/qpainter.h>
-#include <QtCore/qfileinfo.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qqueue.h>
-#include <QtGui/qpainter.h>
 #include <QtWidgets/qdialogbuttonbox.h>
 #include <QtWidgets/qpushbutton.h>
 #include <QtWidgets/qmessagebox.h>
 #include <QtWidgets/qapplication.h>
-#if QT_CONFIG(clipboard)
-#include <QtGui/qclipboard.h>
-#endif
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qlineedit.h>
+
+#include <QtGui/qaction.h>
+#if QT_CONFIG(clipboard)
+#  include <QtGui/qclipboard.h>
+#endif
 #include <QtGui/qdrag.h>
+#include <QtGui/qpainter.h>
+
 #include <QtCore/qmimedata.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qqueue.h>
+
 #include <QtXml/qdom.h>
 
 #include <algorithm>
diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp
index 666bdd1cb..9eace51bf 100644
--- a/src/designer/src/lib/shared/richtexteditor.cpp
+++ b/src/designer/src/lib/shared/richtexteditor.cpp
@@ -36,29 +36,31 @@
 #include <QtDesigner/abstractformeditor.h>
 #include <QtDesigner/abstractsettings.h>
 
-#include <QtCore/qlist.h>
-#include <QtCore/qmap.h>
-#include <QtCore/qpointer.h>
-#include <QtCore/qxmlstream.h>
-
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qcolordialog.h>
 #include <QtWidgets/qcombobox.h>
-#include <QtGui/qfontdatabase.h>
-#include <QtGui/qtextcursor.h>
-#include <QtGui/qpainter.h>
-#include <QtGui/qicon.h>
 #include <QtWidgets/qmenu.h>
-#include <QtGui/qevent.h>
 #include <QtWidgets/qtabwidget.h>
-#include <QtGui/qtextobject.h>
-#include <QtGui/qtextdocument.h>
 #include <QtWidgets/qtoolbar.h>
 #include <QtWidgets/qtoolbutton.h>
 #include <QtWidgets/qboxlayout.h>
 #include <QtWidgets/qpushbutton.h>
 #include <QtWidgets/qdialogbuttonbox.h>
 
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
+#include <QtGui/qevent.h>
+#include <QtGui/qfontdatabase.h>
+#include <QtGui/qicon.h>
+#include <QtGui/qpainter.h>
+#include <QtGui/qtextcursor.h>
+#include <QtGui/qtextdocument.h>
+#include <QtGui/qtextobject.h>
+
+#include <QtCore/qlist.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qpointer.h>
+#include <QtCore/qxmlstream.h>
+
 QT_BEGIN_NAMESPACE
 
 static const char RichTextDialogGroupC[] = "RichTextDialog";
diff --git a/src/designer/src/lib/shared/stylesheeteditor.cpp b/src/designer/src/lib/shared/stylesheeteditor.cpp
index c7b36c422..2956d1abc 100644
--- a/src/designer/src/lib/shared/stylesheeteditor.cpp
+++ b/src/designer/src/lib/shared/stylesheeteditor.cpp
@@ -44,18 +44,19 @@
 
 #include <texteditfindwidget.h>
 
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qcolordialog.h>
 #include <QtWidgets/qdialogbuttonbox.h>
 #include <QtWidgets/qfontdialog.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qpushbutton.h>
-#include <QtGui/qtextdocument.h>
 #include <QtWidgets/qtoolbar.h>
 #include <QtWidgets/qboxlayout.h>
-#include <private/qcssparser_p.h>
 
+#include <QtGui/qaction.h>
 #include <QtGui/qevent.h>
+#include <QtGui/qtextdocument.h>
+
+#include <private/qcssparser_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp
index 9670958ce..51adb3528 100644
--- a/src/designer/src/lib/shared/zoomwidget.cpp
+++ b/src/designer/src/lib/shared/zoomwidget.cpp
@@ -31,11 +31,12 @@
 #include <QtWidgets/qgraphicsscene.h>
 #include <QtWidgets/qgraphicsproxywidget.h>
 #include <QtWidgets/qmenu.h>
-#include <QtWidgets/qaction.h>
-#include <QtWidgets/qactiongroup.h>
-#include <QtGui/qevent.h>
 #include <QtWidgets/qscrollbar.h>
 
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
+#include <QtGui/qevent.h>
+
 #include <QtCore/qtextstream.h>
 #include <QtCore/qmath.h>
 #include <QtCore/qdebug.h>
diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp
index e9a94c521..c6e9e7d2b 100644
--- a/src/designer/src/lib/uilib/abstractformbuilder.cpp
+++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp
@@ -44,17 +44,6 @@
 #include "ui4_p.h"
 #include "properties_p.h"
 
-#include <QtCore/qvariant.h>
-#include <QtCore/qmetaobject.h>
-#include <QtCore/qfileinfo.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qqueue.h>
-#include <QtCore/qhash.h>
-#include <QtCore/qpair.h>
-#include <QtCore/qdebug.h>
-#include <QtCore/qcoreapplication.h>
-
-#include <QtWidgets/qaction.h>
 #include <QtWidgets/qmainwindow.h>
 #include <QtWidgets/qmenu.h>
 #include <QtWidgets/qmenubar.h>
@@ -82,7 +71,18 @@
 #  include <private/qlayout_p.h> // Compiling within Designer
 #endif
 
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
+
+#include <QtCore/qcoreapplication.h>
 #include <QtCore/qdebug.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qhash.h>
+#include <QtCore/qmetaobject.h>
+#include <QtCore/qpair.h>
+#include <QtCore/qqueue.h>
+#include <QtCore/qvariant.h>
 #include <QtCore/qxmlstream.h>
 
 #include <limits.h>
diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
index bcf792771..2f863781b 100644
--- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
+++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp
@@ -35,15 +35,18 @@
 #include <QtDesigner/abstractformeditor.h>
 #include <QtDesigner/qextensionmanager.h>
 
+#include <ActiveQt/qaxselect.h>
+#include <ActiveQt/qaxtypes.h>
+
 #include <QtWidgets/qmessagebox.h>
-#include <QtWidgets/qundostack.h>
-#include <QtWidgets/qaction.h>
+#include <QtGui/qundostack.h>
+
+#include <QtGui/qaction.h>
+
+#include <QtCore/qt_windows.h>
 #include <QtCore/quuid.h>
-#include <ActiveQt/qaxselect.h>
 
-#include <qt_windows.h>
 #include <olectl.h>
-#include <qaxtypes.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/plugins/tools/view3d/view3d_plugin.cpp b/src/designer/src/plugins/tools/view3d/view3d_plugin.cpp
index 5af4cc007..3bf356e56 100644
--- a/src/designer/src/plugins/tools/view3d/view3d_plugin.cpp
+++ b/src/designer/src/plugins/tools/view3d/view3d_plugin.cpp
@@ -29,12 +29,14 @@
 #include "view3d_plugin.h"
 #include "view3d_tool.h"
 
-#include <QtCore/qdebug.h>
-#include <QtCore/qtplugin.h>
-#include <QtWidgets/qaction.h>
 #include <QtDesigner/qdesignerformeditorinterface.h>
 #include <QtDesigner/qdesignerformwindowmanagerinterface.h>
 
+#include <QtGui/qaction.h>
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qtplugin.h>
+
 QView3DPlugin::QView3DPlugin()
 {
     m_core = 0;
diff --git a/src/designer/src/plugins/tools/view3d/view3d_tool.cpp b/src/designer/src/plugins/tools/view3d/view3d_tool.cpp
index d53e71943..fe52d6aed 100644
--- a/src/designer/src/plugins/tools/view3d/view3d_tool.cpp
+++ b/src/designer/src/plugins/tools/view3d/view3d_tool.cpp
@@ -28,9 +28,10 @@
 
 #include "view3d_tool.h"
 
-#include <QtWidgets/qaction.h>
 #include <QtDesigner/qdesignerformwindowinterface.h>
 
+#include <QtGui/qaction.h>
+
 QView3DTool::QView3DTool(QDesignerFormWindowInterface *formWindow, QObject *parent)
     :  QDesignerFormWindowToolInterface(parent)
 {
diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp
index 058912f4f..22a7aefcd 100644
--- a/src/designer/src/uitools/quiloader.cpp
+++ b/src/designer/src/uitools/quiloader.cpp
@@ -48,16 +48,9 @@
 #include <textbuilder_p.h>
 #include <ui4_p.h>
 
-#include <QtCore/qdebug.h>
-#include <QtCore/qdatastream.h>
-#include <QtWidgets/qaction.h>
-#include <QtWidgets/qactiongroup.h>
 #include <QtWidgets/qapplication.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qlibraryinfo.h>
 #include <QtWidgets/qlayout.h>
 #include <QtWidgets/qwidget.h>
-#include <QtCore/qmap.h>
 #include <QtWidgets/qtabwidget.h>
 #include <QtWidgets/qtreewidget.h>
 #include <QtWidgets/qlistwidget.h>
@@ -66,6 +59,15 @@
 #include <QtWidgets/qcombobox.h>
 #include <QtWidgets/qfontcombobox.h>
 
+#include <QtGui/qaction.h>
+#include <QtGui/qactiongroup.h>
+
+#include <QtCore/qdebug.h>
+#include <QtCore/qdatastream.h>
+#include <QtCore/qmap.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qlibraryinfo.h>
+
 QT_BEGIN_NAMESPACE
 
 typedef QMap<QString, bool> widget_map;
diff --git a/src/linguist/linguist/formpreviewview.cpp b/src/linguist/linguist/formpreviewview.cpp
index 939322a46..4c24229c1 100644
--- a/src/linguist/linguist/formpreviewview.cpp
+++ b/src/linguist/linguist/formpreviewview.cpp
@@ -31,10 +31,6 @@
 
 #include <quiloader.h>
 
-#include <QtCore/QDebug>
-#include <QtCore/QTime>
-
-#include <QtWidgets/QAction>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QFontComboBox>
 #include <QtWidgets/QFrame>
@@ -51,6 +47,11 @@
 #include <QtWidgets/QTreeWidget>
 #include <QtWidgets/QScrollArea>
 
+#include <QtGui/QAction>
+
+#include <QtCore/QDebug>
+#include <QtCore/QTime>
+
 QT_BEGIN_NAMESPACE
 
 #if defined(Q_CC_SUN) || defined(Q_CC_HPACC) || defined(Q_CC_XLC)
diff --git a/src/qdbus/qdbusviewer/mainwindow.cpp b/src/qdbus/qdbusviewer/mainwindow.cpp
index 37a2ef783..1f0a7d6b9 100644
--- a/src/qdbus/qdbusviewer/mainwindow.cpp
+++ b/src/qdbus/qdbusviewer/mainwindow.cpp
@@ -34,7 +34,7 @@
 #include <QtWidgets/QTabWidget>
 #include <QtWidgets/QMenuBar>
 #include <QtWidgets/QMenu>
-#include <QtWidgets/QAction>
+#include <QtGui/QAction>
 #include <QtWidgets/QMessageBox>
 
 #include <QtDBus/QDBusConnection>
diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp
index 18b374f49..83f1ae7d8 100644
--- a/src/qdbus/qdbusviewer/qdbusviewer.cpp
+++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp
@@ -32,14 +32,7 @@
 #include "propertydialog.h"
 #include "logviewer.h"
 
-
-#include <QtCore/QStringListModel>
-#include <QtCore/QMetaProperty>
-#include <QtCore/QSettings>
-#include <QtGui/QKeyEvent>
 #include <QtWidgets/QLineEdit>
-#include <QtWidgets/QAction>
-#include <QtWidgets/QShortcut>
 #include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QSplitter>
 #include <QtWidgets/QInputDialog>
@@ -48,10 +41,19 @@
 #include <QtWidgets/QTableWidget>
 #include <QtWidgets/QTreeWidget>
 #include <QtWidgets/QHeaderView>
+
 #include <QtDBus/QDBusConnectionInterface>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusMetaType>
 
+#include <QtGui/QAction>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QShortcut>
+
+#include <QtCore/QStringListModel>
+#include <QtCore/QMetaProperty>
+#include <QtCore/QSettings>
+
 #include <private/qdbusutil_p.h>
 
 class QDBusViewModel: public QDBusModel
diff --git a/src/shared/findwidget/abstractfindwidget.cpp b/src/shared/findwidget/abstractfindwidget.cpp
index 79cd1ccd0..f627f6b25 100644
--- a/src/shared/findwidget/abstractfindwidget.cpp
+++ b/src/shared/findwidget/abstractfindwidget.cpp
@@ -53,22 +53,22 @@
 
 #include "abstractfindwidget.h"
 
-#include <QtCore/QCoreApplication>
-#include <QtCore/QEvent>
-#include <QtCore/QFile>
-#include <QtCore/QTimer>
-
-#include <QtGui/QKeyEvent>
-
 #include <QtWidgets/QCheckBox>
-#include <QtWidgets/QAction>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QLayout>
 #include <QtWidgets/QLineEdit>
 #include <QtWidgets/QSpacerItem>
-#include <QtWidgets/QShortcut>
 #include <QtWidgets/QToolButton>
 
+#include <QtGui/QAction>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QShortcut>
+
+#include <QtCore/QCoreApplication>
+#include <QtCore/QEvent>
+#include <QtCore/QFile>
+#include <QtCore/QTimer>
+
 QT_BEGIN_NAMESPACE
 
 static QIcon createIconSet(const QString &name)
diff --git a/src/shared/qtgradienteditor/qtgradientview.cpp b/src/shared/qtgradienteditor/qtgradientview.cpp
index 29c33574e..40e698818 100644
--- a/src/shared/qtgradienteditor/qtgradientview.cpp
+++ b/src/shared/qtgradienteditor/qtgradientview.cpp
@@ -41,10 +41,12 @@
 #include "qtgradientmanager.h"
 #include "qtgradientdialog.h"
 #include "qtgradientutils.h"
+
+#include <QtWidgets/QMessageBox>
+
+#include <QtGui/QAction>
 #include <QtGui/QClipboard>
 #include <QtGui/QPainter>
-#include <QtWidgets/QAction>
-#include <QtWidgets/QMessageBox>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/shared/qttoolbardialog/qttoolbardialog.cpp b/src/shared/qttoolbardialog/qttoolbardialog.cpp
index 3de21bd4e..d81a1f1fb 100644
--- a/src/shared/qttoolbardialog/qttoolbardialog.cpp
+++ b/src/shared/qttoolbardialog/qttoolbardialog.cpp
@@ -40,14 +40,16 @@
 #include "qttoolbardialog.h"
 #include "ui_qttoolbardialog.h"
 
-#include <QtCore/QSet>
-#include <QtGui/QtEvents>
-#include <QtWidgets/QAction>
 #include <QtWidgets/QToolBar>
 #include <QtWidgets/QMainWindow>
 #include <QtWidgets/QHeaderView>
 #include <QtWidgets/QPushButton>
 
+#include <QtGui/QAction>
+#include <QtGui/QtEvents>
+
+#include <QtCore/QSet>
+
 #include <algorithm>
 
 QT_BEGIN_NAMESPACE