Qt Designer: Fix Qt include statements

Change
 #include <QtCore/QDebug>
to
 #include <QtCore/qdebug.h>

according to the coding style.

Change-Id: I2ba2e99d003f245c61ce836acb5af3208e1e0b29
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

31 files changed, 228 insertions, 233 deletions

diff --git a/src/designer/src/designer/appfontdialog.cpp b/src/designer/src/designer/appfontdialog.cpp
index 67ce8121e..58069b4fa 100644
--- a/src/designer/src/designer/appfontdialog.cpp
+++ b/src/designer/src/designer/appfontdialog.cpp
@@ -30,26 +30,25 @@
 
 #include <iconloader_p.h>
 
-#include <QtDesigner/QDesignerSettingsInterface>
-
-#include <QtWidgets/QTreeView>
-#include <QtWidgets/QToolButton>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QSpacerItem>
-#include <QtWidgets/QFileDialog>
-#include <QtGui/QStandardItemModel>
-#include <QtWidgets/QMessageBox>
-#include <QtGui/QFontDatabase>
-#include <QtWidgets/QDialogButtonBox>
-
-#include <QtCore/QSettings>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QStringList>
-#include <QtCore/QFileInfo>
-#include <QtCore/QtAlgorithms>
-#include <QtCore/QVector>
-#include <QtCore/QDebug>
+#include <QtDesigner/abstractsettings.h>
+
+#include <QtWidgets/qtreeview.h>
+#include <QtWidgets/qtoolbutton.h>
+#include <QtWidgets/qboxlayout.h>
+#include <QtWidgets/qlayoutitem.h>
+#include <QtWidgets/qfiledialog.h>
+#include <QtGui/qstandarditemmodel.h>
+#include <QtWidgets/qmessagebox.h>
+#include <QtGui/qfontdatabase.h>
+#include <QtWidgets/qdialogbuttonbox.h>
+
+#include <QtCore/qsettings.h>
+#include <QtCore/qcoreapplication.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qalgorithms.h>
+#include <QtCore/qvector.h>
+#include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/appfontdialog.h b/src/designer/src/designer/appfontdialog.h
index 98799cb33..ca5bc3320 100644
--- a/src/designer/src/designer/appfontdialog.h
+++ b/src/designer/src/designer/appfontdialog.h
@@ -29,8 +29,8 @@
 #ifndef QDESIGNER_APPFONTWIDGET_H
 #define QDESIGNER_APPFONTWIDGET_H
 
-#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QDialog>
+#include <QtWidgets/qgroupbox.h>
+#include <QtWidgets/qdialog.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/assistantclient.cpp b/src/designer/src/designer/assistantclient.cpp
index ffceeff1d..fb1ab9a1e 100644
--- a/src/designer/src/designer/assistantclient.cpp
+++ b/src/designer/src/designer/assistantclient.cpp
@@ -28,15 +28,15 @@
 
 #include "assistantclient.h"
 
-#include <QtCore/QString>
-#include <QtCore/QProcess>
-#include <QtCore/QDir>
-#include <QtCore/QLibraryInfo>
-#include <QtCore/QDebug>
-#include <QtCore/QFileInfo>
-#include <QtCore/QObject>
-#include <QtCore/QTextStream>
-#include <QtCore/QCoreApplication>
+#include <QtCore/qstring.h>
+#include <QtCore/qprocess.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qlibraryinfo.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qobject.h>
+#include <QtCore/qtextstream.h>
+#include <QtCore/qcoreapplication.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp
index 295dcf4fd..1f76bc71d 100644
--- a/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp
+++ b/src/designer/src/designer/doc/snippets/plugins/doc_src_qtdesigner.cpp
@@ -234,7 +234,7 @@ QObject *AGeneralExtensionFactory::createExtension(QObject *object,
 #include customwidgettwointerface.h
 #include customwidgetthreeinterface.h
 
-#include <QtDesigner/QtDesigner>
+#include <QtDesigner/qtdesigner.h>
 #include <QtCore/qplugin.h>
 
 class MyCustomWidgets: public QObject, public QDesignerCustomWidgetCollectionInterface
diff --git a/src/designer/src/designer/main.cpp b/src/designer/src/designer/main.cpp
index a0a6667c5..54667c689 100644
--- a/src/designer/src/designer/main.cpp
+++ b/src/designer/src/designer/main.cpp
@@ -27,8 +27,8 @@
 ****************************************************************************/
 
 #include "qdesigner.h"
-#include <QtCore/QLibraryInfo>
-#include <QtCore/QDir>
+#include <QtCore/qlibraryinfo.h>
+#include <QtCore/qdir.h>
 
 #include <stdlib.h>
 
diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp
index fcfa4ecac..3fe04f45b 100644
--- a/src/designer/src/designer/mainwindow.cpp
+++ b/src/designer/src/designer/mainwindow.cpp
@@ -35,20 +35,20 @@
 #include "qdesigner_settings.h"
 #include "qttoolbardialog.h"
 
-#include <QtDesigner/QDesignerFormWindowInterface>
-
-#include <QtWidgets/QAction>
-#include <QtGui/QCloseEvent>
-#include <QtWidgets/QToolBar>
-#include <QtWidgets/QMdiSubWindow>
-#include <QtWidgets/QStatusBar>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QLayout>
-#include <QtWidgets/QDockWidget>
-
-#include <QtCore/QUrl>
-#include <QtCore/QDebug>
-#include <QtCore/QMimeData>
+#include <QtDesigner/abstractformwindow.h>
+
+#include <QtWidgets/qaction.h>
+#include <QtGui/qevent.h>
+#include <QtWidgets/qtoolbar.h>
+#include <QtWidgets/qmdisubwindow.h>
+#include <QtWidgets/qstatusbar.h>
+#include <QtWidgets/qmenu.h>
+#include <QtWidgets/qlayout.h>
+#include <QtWidgets/qdockwidget.h>
+
+#include <QtCore/qurl.h>
+#include <QtCore/qdebug.h>
+#include <QtCore/qmimedata.h>
 
 static const char *uriListMimeFormatC = "text/uri-list";
 
diff --git a/src/designer/src/designer/mainwindow.h b/src/designer/src/designer/mainwindow.h
index b94b57a58..79c0ef7ac 100644
--- a/src/designer/src/designer/mainwindow.h
+++ b/src/designer/src/designer/mainwindow.h
@@ -29,9 +29,9 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtWidgets/QMainWindow>
-#include <QtCore/QVector>
-#include <QtWidgets/QMdiArea>
+#include <QtWidgets/qmainwindow.h>
+#include <QtCore/qvector.h>
+#include <QtWidgets/qmdiarea.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/newform.cpp b/src/designer/src/designer/newform.cpp
index 09f3909cb..b4eb49554 100644
--- a/src/designer/src/designer/newform.cpp
+++ b/src/designer/src/designer/newform.cpp
@@ -34,22 +34,22 @@
 
 #include <newformwidget_p.h>
 
-#include <QtDesigner/QDesignerFormEditorInterface>
-
-#include <QtCore/QDir>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDebug>
-#include <QtCore/QDir>
-#include <QtCore/QTemporaryFile>
-
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QCheckBox>
-#include <QtWidgets/QFrame>
-#include <QtWidgets/QMessageBox>
+#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>
+#include <QtWidgets/qdialogbuttonbox.h>
+#include <QtWidgets/qmenu.h>
+#include <QtWidgets/qcheckbox.h>
+#include <QtWidgets/qframe.h>
+#include <QtWidgets/qmessagebox.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/newform.h b/src/designer/src/designer/newform.h
index 582e3a47b..6d38ffa8e 100644
--- a/src/designer/src/designer/newform.h
+++ b/src/designer/src/designer/newform.h
@@ -29,7 +29,7 @@
 #ifndef NEWFORM_H
 #define NEWFORM_H
 
-#include <QtWidgets/QDialog>
+#include <QtWidgets/qdialog.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/preferencesdialog.cpp b/src/designer/src/designer/preferencesdialog.cpp
index 51b61043d..439f0194b 100644
--- a/src/designer/src/designer/preferencesdialog.cpp
+++ b/src/designer/src/designer/preferencesdialog.cpp
@@ -30,11 +30,11 @@
 #include "ui_preferencesdialog.h"
 #include "qdesigner_appearanceoptions.h"
 
-#include <QtDesigner/QDesignerOptionsPageInterface>
-#include <QtDesigner/QDesignerFormEditorInterface>
+#include <QtDesigner/abstractoptionspage.h>
+#include <QtDesigner/abstractformeditor.h>
 
-#include <QtWidgets/QFileDialog>
-#include <QtWidgets/QPushButton>
+#include <QtWidgets/qfiledialog.h>
+#include <QtWidgets/qpushbutton.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/preferencesdialog.h b/src/designer/src/designer/preferencesdialog.h
index 993fc4a6b..16b625314 100644
--- a/src/designer/src/designer/preferencesdialog.h
+++ b/src/designer/src/designer/preferencesdialog.h
@@ -29,7 +29,7 @@
 #ifndef PREFERENCESDIALOG_H
 #define PREFERENCESDIALOG_H
 
-#include <QtWidgets/QDialog>
+#include <QtWidgets/qdialog.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp
index d4b9b7552..10b55e564 100644
--- a/src/designer/src/designer/qdesigner.cpp
+++ b/src/designer/src/designer/qdesigner.cpp
@@ -36,21 +36,20 @@
 
 #include <qdesigner_propertysheet_p.h>
 
-#include <QtGui/QFileOpenEvent>
-#include <QtGui/QCloseEvent>
-#include <QtWidgets/QMessageBox>
-#include <QtGui/QIcon>
-#include <QtWidgets/QErrorMessage>
-#include <QtCore/QMetaObject>
-#include <QtCore/QFile>
-#include <QtCore/QLibraryInfo>
-#include <QtCore/QLocale>
-#include <QtCore/QTimer>
-#include <QtCore/QTranslator>
-#include <QtCore/QFileInfo>
+#include <QtGui/qevent.h>
+#include <QtWidgets/qmessagebox.h>
+#include <QtGui/qicon.h>
+#include <QtWidgets/qerrormessage.h>
+#include <QtCore/qmetaobject.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qlibraryinfo.h>
+#include <QtCore/qlocale.h>
+#include <QtCore/qtimer.h>
+#include <QtCore/qtranslator.h>
+#include <QtCore/qfileinfo.h>
 #include <QtCore/qdebug.h>
-#include <QtCore/QCommandLineParser>
-#include <QtCore/QCommandLineOption>
+#include <QtCore/qcommandlineparser.h>
+#include <QtCore/qcommandlineoption.h>
 
 #include <QtDesigner/QDesignerComponents>
 
diff --git a/src/designer/src/designer/qdesigner.h b/src/designer/src/designer/qdesigner.h
index fd82b2b9c..908010727 100644
--- a/src/designer/src/designer/qdesigner.h
+++ b/src/designer/src/designer/qdesigner.h
@@ -29,8 +29,8 @@
 #ifndef QDESIGNER_H
 #define QDESIGNER_H
 
-#include <QtCore/QPointer>
-#include <QtWidgets/QApplication>
+#include <QtCore/qpointer.h>
+#include <QtWidgets/qapplication.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp
index b7707f541..9db4b0b98 100644
--- a/src/designer/src/designer/qdesigner_actions.cpp
+++ b/src/designer/src/designer/qdesigner_actions.cpp
@@ -47,49 +47,49 @@
 #include <qdesigner_formwindowmanager_p.h>
 
 // sdk
-#include <QtDesigner/QDesignerFormEditorInterface>
-#include <QtDesigner/QDesignerFormWindowInterface>
-#include <QtDesigner/QDesignerIntegrationInterface>
-#include <QtDesigner/QDesignerLanguageExtension>
-#include <QtDesigner/QDesignerMetaDataBaseInterface>
-#include <QtDesigner/QDesignerFormWindowManagerInterface>
-#include <QtDesigner/QDesignerFormWindowCursorInterface>
-#include <QtDesigner/QDesignerFormEditorPluginInterface>
-#include <QtDesigner/QExtensionManager>
+#include <QtDesigner/abstractformeditor.h>
+#include <QtDesigner/abstractformwindow.h>
+#include <QtDesigner/abstractintegration.h>
+#include <QtDesigner/abstractlanguage.h>
+#include <QtDesigner/abstractmetadatabase.h>
+#include <QtDesigner/abstractformwindowmanager.h>
+#include <QtDesigner/abstractformwindowcursor.h>
+#include <QtDesigner/abstractformeditorplugin.h>
+#include <QtDesigner/qextensionmanager.h>
 
 #include <QtDesigner/private/shared_settings_p.h>
 #include <QtDesigner/private/formwindowbase_p.h>
 
-#include <QtWidgets/QAction>
-#include <QtWidgets/QActionGroup>
-#include <QtWidgets/QStyleFactory>
-#include <QtGui/QCloseEvent>
-#include <QtWidgets/QFileDialog>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QPushButton>
-#include <QtGui/QIcon>
-#include <QtGui/QImage>
-#include <QtGui/QPixmap>
-#include <QtWidgets/QMdiSubWindow>
+#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 <QtGui/qevent.h>
+#include <QtGui/qicon.h>
+#include <QtGui/qimage.h>
+#include <QtGui/qpixmap.h>
 #ifndef QT_NO_PRINTER
-#include <QtPrintSupport/QPrintDialog>
+#include <QtPrintSupport/qprintdialog.h>
 #endif
-#include <QtGui/QPainter>
-#include <QtGui/QTransform>
-#include <QtGui/QCursor>
-#include <QtCore/QSizeF>
-
-#include <QtCore/QLibraryInfo>
-#include <QtCore/QBuffer>
-#include <QtCore/QPluginLoader>
+#include <QtGui/qpainter.h>
+#include <QtGui/qtransform.h>
+#include <QtGui/qcursor.h>
+#include <QtCore/qsize.h>
+
+#include <QtCore/qlibraryinfo.h>
+#include <QtCore/qbuffer.h>
+#include <QtCore/qpluginloader.h>
 #include <QtCore/qdebug.h>
-#include <QtCore/QTimer>
-#include <QtCore/QMetaObject>
-#include <QtCore/QFileInfo>
-#include <QtWidgets/QStatusBar>
-#include <QtWidgets/QDesktopWidget>
-#include <QtXml/QDomDocument>
+#include <QtCore/qtimer.h>
+#include <QtCore/qmetaobject.h>
+#include <QtCore/qfileinfo.h>
+#include <QtWidgets/qstatusbar.h>
+#include <QtWidgets/qdesktopwidget.h>
+#include <QtXml/qdom.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/qdesigner_actions.h b/src/designer/src/designer/qdesigner_actions.h
index a3d56f055..7fc0d260c 100644
--- a/src/designer/src/designer/qdesigner_actions.h
+++ b/src/designer/src/designer/qdesigner_actions.h
@@ -32,10 +32,10 @@
 #include "assistantclient.h"
 #include "qdesigner_settings.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
+#include <QtCore/qobject.h>
+#include <QtCore/qpointer.h>
 #ifndef QT_NO_PRINTER
-#include <QtPrintSupport/QPrinter>
+#include <QtPrintSupport/qprinter.h>
 #endif
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/designer/qdesigner_appearanceoptions.cpp b/src/designer/src/designer/qdesigner_appearanceoptions.cpp
index 33d42ad2b..fbdb4268a 100644
--- a/src/designer/src/designer/qdesigner_appearanceoptions.cpp
+++ b/src/designer/src/designer/qdesigner_appearanceoptions.cpp
@@ -32,9 +32,9 @@
 #include "qdesigner_settings.h"
 #include "qdesigner_toolwindow.h"
 
-#include <QtDesigner/QDesignerFormEditorInterface>
-#include <QtCore/QTimer>
-#include <QtCore/QDebug>
+#include <QtDesigner/abstractformeditor.h>
+#include <QtCore/qtimer.h>
+#include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/qdesigner_appearanceoptions.h b/src/designer/src/designer/qdesigner_appearanceoptions.h
index f1d1aea05..14ea0d8e1 100644
--- a/src/designer/src/designer/qdesigner_appearanceoptions.h
+++ b/src/designer/src/designer/qdesigner_appearanceoptions.h
@@ -32,11 +32,11 @@
 #include "designer_enums.h"
 #include "qdesigner_toolwindow.h"
 
-#include <QtDesigner/QDesignerOptionsPageInterface>
+#include <QtDesigner/abstractoptionspage.h>
 
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtWidgets/QWidget>
+#include <QtCore/qobject.h>
+#include <QtCore/qpointer.h>
+#include <QtWidgets/qwidget.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/qdesigner_formwindow.cpp b/src/designer/src/designer/qdesigner_formwindow.cpp
index cbf2c48a2..1a109ed7b 100644
--- a/src/designer/src/designer/qdesigner_formwindow.cpp
+++ b/src/designer/src/designer/qdesigner_formwindow.cpp
@@ -31,27 +31,25 @@
 #include "formwindowbase_p.h"
 
 // sdk
-#include <QtDesigner/QDesignerFormWindowInterface>
-#include <QtDesigner/QDesignerFormEditorInterface>
-#include <QtDesigner/QDesignerPropertySheetExtension>
-#include <QtDesigner/QDesignerPropertyEditorInterface>
-#include <QtDesigner/QDesignerFormWindowManagerInterface>
-#include <QtDesigner/QDesignerTaskMenuExtension>
-#include <QtDesigner/QExtensionManager>
+#include <QtDesigner/abstractformwindow.h>
+#include <QtDesigner/abstractformeditor.h>
+#include <QtDesigner/propertysheet.h>
+#include <QtDesigner/abstractpropertyeditor.h>
+#include <QtDesigner/abstractformwindowmanager.h>
+#include <QtDesigner/taskmenu.h>
+#include <QtDesigner/qextensionmanager.h>
 
-#include <QtCore/QEvent>
-#include <QtCore/QFile>
-#include <QtCore/QRegularExpression>
+#include <QtCore/qfile.h>
+#include <QtCore/qregularexpression.h>
 
-#include <QtWidgets/QAction>
-#include <QtGui/QCloseEvent>
-#include <QtWidgets/QFileDialog>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QVBoxLayout>
-#include <QtWidgets/QUndoCommand>
-#include <QtGui/QWindowStateChangeEvent>
+#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/qevent.h>
 QT_BEGIN_NAMESPACE
 
 QDesignerFormWindow::QDesignerFormWindow(QDesignerFormWindowInterface *editor, QDesignerWorkbench *workbench, QWidget *parent, Qt::WindowFlags flags)
diff --git a/src/designer/src/designer/qdesigner_formwindow.h b/src/designer/src/designer/qdesigner_formwindow.h
index 4c6db524d..f1525ab0d 100644
--- a/src/designer/src/designer/qdesigner_formwindow.h
+++ b/src/designer/src/designer/qdesigner_formwindow.h
@@ -29,8 +29,8 @@
 #ifndef QDESIGNER_FORMWINDOW_H
 #define QDESIGNER_FORMWINDOW_H
 
-#include <QtCore/QPointer>
-#include <QtWidgets/QWidget>
+#include <QtCore/qpointer.h>
+#include <QtWidgets/qwidget.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/qdesigner_pch.h b/src/designer/src/designer/qdesigner_pch.h
index fd728d7e5..3615232c7 100644
--- a/src/designer/src/designer/qdesigner_pch.h
+++ b/src/designer/src/designer/qdesigner_pch.h
@@ -27,14 +27,14 @@
 ****************************************************************************/
 
 #if defined __cplusplus
-#include <QtCore/QObject>
-#include <QtCore/QPointer>
-#include <QtCore/QSettings>
+#include <QtCore/qobject.h>
+#include <QtCore/qpointer.h>
+#include <QtCore/qsettings.h>
 #include <QtCore/qdebug.h>
-#include <QtGui/QCloseEvent>
-#include <QtWidgets/QHeaderView>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QVBoxLayout>
+#include <QtGui/qevent.h>
+#include <QtWidgets/qheaderview.h>
+#include <QtWidgets/qmessagebox.h>
+#include <QtWidgets/qboxlayout.h>
 #include <QtDesigner/abstractformeditor.h>
 #include <QtDesigner/abstractformwindow.h>
 
diff --git a/src/designer/src/designer/qdesigner_server.cpp b/src/designer/src/designer/qdesigner_server.cpp
index 704bc2385..dc1098e8f 100644
--- a/src/designer/src/designer/qdesigner_server.cpp
+++ b/src/designer/src/designer/qdesigner_server.cpp
@@ -26,12 +26,12 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QFileInfo>
-#include <QtCore/QStringList>
+#include <QtCore/qfileinfo.h>
+#include <QtCore/qstringlist.h>
 
-#include <QtNetwork/QHostAddress>
-#include <QtNetwork/QTcpServer>
-#include <QtNetwork/QTcpSocket>
+#include <QtNetwork/qhostaddress.h>
+#include <QtNetwork/qtcpserver.h>
+#include <QtNetwork/qtcpsocket.h>
 
 #include "qdesigner.h"
 #include "qdesigner_server.h"
diff --git a/src/designer/src/designer/qdesigner_server.h b/src/designer/src/designer/qdesigner_server.h
index 9a9f15829..8c1649c94 100644
--- a/src/designer/src/designer/qdesigner_server.h
+++ b/src/designer/src/designer/qdesigner_server.h
@@ -29,7 +29,7 @@
 #ifndef QDESIGNER_SERVER_H
 #define QDESIGNER_SERVER_H
 
-#include <QtCore/QObject>
+#include <QtCore/qobject.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/qdesigner_settings.cpp b/src/designer/src/designer/qdesigner_settings.cpp
index cb1a9d20f..8ac61c52a 100644
--- a/src/designer/src/designer/qdesigner_settings.cpp
+++ b/src/designer/src/designer/qdesigner_settings.cpp
@@ -31,18 +31,18 @@
 #include "qdesigner_toolwindow.h"
 #include "qdesigner_workbench.h"
 
-#include <QtDesigner/QDesignerSettingsInterface>
+#include <QtDesigner/abstractsettings.h>
 
 #include <abstractformeditor.h>
 #include <qdesigner_utils_p.h>
 #include <previewmanager_p.h>
 
-#include <QtCore/QVariant>
-#include <QtCore/QDir>
+#include <QtCore/qvariant.h>
+#include <QtCore/qdir.h>
 
-#include <QtWidgets/QDesktopWidget>
-#include <QtWidgets/QStyle>
-#include <QtWidgets/QListView>
+#include <QtWidgets/qdesktopwidget.h>
+#include <QtWidgets/qstyle.h>
+#include <QtWidgets/qlistview.h>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/designer/src/designer/qdesigner_settings.h b/src/designer/src/designer/qdesigner_settings.h
index e8233ec80..52ef46b85 100644
--- a/src/designer/src/designer/qdesigner_settings.h
+++ b/src/designer/src/designer/qdesigner_settings.h
@@ -31,10 +31,10 @@
 
 #include "designer_enums.h"
 #include <shared_settings_p.h>
-#include <QtCore/QMap>
-#include <QtCore/QRect>
-#include <QtCore/QStringList>
-#include <QtCore/QVariant>
+#include <QtCore/qmap.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qstringlist.h>
+#include <QtCore/qvariant.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/qdesigner_toolwindow.cpp b/src/designer/src/designer/qdesigner_toolwindow.cpp
index 22446e91f..0c77b1dbd 100644
--- a/src/designer/src/designer/qdesigner_toolwindow.cpp
+++ b/src/designer/src/designer/qdesigner_toolwindow.cpp
@@ -31,17 +31,16 @@
 #include "qdesigner_settings.h"
 #include "qdesigner_workbench.h"
 
-#include <QtDesigner/QDesignerPropertyEditorInterface>
-#include <QtDesigner/QDesignerFormEditorInterface>
-#include <QtDesigner/QDesignerActionEditorInterface>
-#include <QtDesigner/QDesignerObjectInspectorInterface>
-#include <QtDesigner/QDesignerWidgetBoxInterface>
+#include <QtDesigner/abstractpropertyeditor.h>
+#include <QtDesigner/abstractformeditor.h>
+#include <QtDesigner/abstractactioneditor.h>
+#include <QtDesigner/abstractobjectinspector.h>
+#include <QtDesigner/abstractwidgetbox.h>
 #include <QtDesigner/QDesignerComponents>
 
-#include <QtCore/QEvent>
-#include <QtCore/QDebug>
-#include <QtWidgets/QAction>
-#include <QtGui/QCloseEvent>
+#include <QtCore/qdebug.h>
+#include <QtWidgets/qaction.h>
+#include <QtGui/qevent.h>
 
 enum { debugToolWindow = 0 };
 
diff --git a/src/designer/src/designer/qdesigner_toolwindow.h b/src/designer/src/designer/qdesigner_toolwindow.h
index 4ad6797c7..1049d6dcc 100644
--- a/src/designer/src/designer/qdesigner_toolwindow.h
+++ b/src/designer/src/designer/qdesigner_toolwindow.h
@@ -31,9 +31,9 @@
 
 #include "mainwindow.h"
 
-#include <QtCore/QPointer>
-#include <QtGui/QFontDatabase>
-#include <QtWidgets/QMainWindow>
+#include <QtCore/qpointer.h>
+#include <QtGui/qfontdatabase.h>
+#include <QtWidgets/qmainwindow.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp
index 5c919dd1c..28e42e26e 100644
--- a/src/designer/src/designer/qdesigner_workbench.cpp
+++ b/src/designer/src/designer/qdesigner_workbench.cpp
@@ -35,38 +35,38 @@
 #include "qdesigner_formwindow.h"
 #include "appfontdialog.h"
 
-#include <QtDesigner/QDesignerFormEditorInterface>
-#include <QtDesigner/QDesignerFormWindowInterface>
-#include <QtDesigner/QDesignerFormWindowManagerInterface>
-#include <QtDesigner/QDesignerFormEditorPluginInterface>
-#include <QtDesigner/QDesignerWidgetBoxInterface>
-#include <QtDesigner/QDesignerMetaDataBaseInterface>
+#include <QtDesigner/abstractformeditor.h>
+#include <QtDesigner/abstractformwindow.h>
+#include <QtDesigner/abstractformwindowmanager.h>
+#include <QtDesigner/abstractformeditorplugin.h>
+#include <QtDesigner/abstractwidgetbox.h>
+#include <QtDesigner/abstractmetadatabase.h>
 
 #include <QtDesigner/QDesignerComponents>
-#include <QtDesigner/QDesignerIntegrationInterface>
+#include <QtDesigner/abstractintegration.h>
 #include <QtDesigner/private/pluginmanager_p.h>
 #include <QtDesigner/private/formwindowbase_p.h>
 #include <QtDesigner/private/actioneditor_p.h>
 
-#include <QtCore/QDir>
-#include <QtCore/QFile>
-#include <QtCore/QUrl>
-#include <QtCore/QTimer>
-#include <QtCore/QPluginLoader>
+#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>
-#include <QtGui/QCloseEvent>
-#include <QtWidgets/QDesktopWidget>
-#include <QtWidgets/QDockWidget>
-#include <QtWidgets/QMenu>
-#include <QtWidgets/QMenuBar>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QToolBar>
-#include <QtWidgets/QMdiArea>
-#include <QtWidgets/QMdiSubWindow>
-#include <QtWidgets/QLayout>
+#include <QtWidgets/qactiongroup.h>
+#include <QtGui/qevent.h>
+#include <QtWidgets/qdesktopwidget.h>
+#include <QtWidgets/qdockwidget.h>
+#include <QtWidgets/qmenu.h>
+#include <QtWidgets/qmenubar.h>
+#include <QtWidgets/qmessagebox.h>
+#include <QtWidgets/qpushbutton.h>
+#include <QtWidgets/qtoolbar.h>
+#include <QtWidgets/qmdiarea.h>
+#include <QtWidgets/qmdisubwindow.h>
+#include <QtWidgets/qlayout.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/qdesigner_workbench.h b/src/designer/src/designer/qdesigner_workbench.h
index 8f0e4cc38..c5b4d8497 100644
--- a/src/designer/src/designer/qdesigner_workbench.h
+++ b/src/designer/src/designer/qdesigner_workbench.h
@@ -31,11 +31,11 @@
 
 #include "designer_enums.h"
 
-#include <QtCore/QObject>
-#include <QtCore/QHash>
-#include <QtCore/QSet>
-#include <QtCore/QRect>
-#include <QtCore/QVector>
+#include <QtCore/qobject.h>
+#include <QtCore/qhash.h>
+#include <QtCore/qset.h>
+#include <QtCore/qrect.h>
+#include <QtCore/qvector.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/designer/saveformastemplate.cpp b/src/designer/src/designer/saveformastemplate.cpp
index ac063bf22..aad8603e1 100644
--- a/src/designer/src/designer/saveformastemplate.cpp
+++ b/src/designer/src/designer/saveformastemplate.cpp
@@ -29,10 +29,10 @@
 #include "saveformastemplate.h"
 #include "qdesigner_settings.h"
 
-#include <QtCore/QFile>
-#include <QtWidgets/QFileDialog>
-#include <QtWidgets/QMessageBox>
-#include <QtWidgets/QPushButton>
+#include <QtCore/qfile.h>
+#include <QtWidgets/qfiledialog.h>
+#include <QtWidgets/qmessagebox.h>
+#include <QtWidgets/qpushbutton.h>
 
 #include <QtDesigner/abstractformeditor.h>
 #include <QtDesigner/abstractformwindow.h>
diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp
index 908ffd99e..abbcabd65 100644
--- a/src/designer/src/designer/versiondialog.cpp
+++ b/src/designer/src/designer/versiondialog.cpp
@@ -26,15 +26,15 @@
 **
 ****************************************************************************/
 
-#include <QtCore/QVector>
-#include <QtGui/QMouseEvent>
-#include <QtWidgets/QGridLayout>
-#include <QtWidgets/QLabel>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QDialogButtonBox>
-#include <QtGui/QPainter>
-#include <QtGui/QPainterPath>
-#include <QtWidgets/QStyleOption>
+#include <QtCore/qvector.h>
+#include <QtGui/qevent.h>
+#include <QtWidgets/qgridlayout.h>
+#include <QtWidgets/qlabel.h>
+#include <QtWidgets/qpushbutton.h>
+#include <QtWidgets/qdialogbuttonbox.h>
+#include <QtGui/qpainter.h>
+#include <QtGui/qpainterpath.h>
+#include <QtWidgets/qstyleoption.h>
 #include "versiondialog.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/designer/versiondialog.h b/src/designer/src/designer/versiondialog.h
index e0af73da0..ff26da292 100644
--- a/src/designer/src/designer/versiondialog.h
+++ b/src/designer/src/designer/versiondialog.h
@@ -29,7 +29,7 @@
 #ifndef VERSIONDIALOG_H
 #define VERSIONDIALOG_H
 
-#include <QtWidgets/QDialog>
+#include <QtWidgets/qdialog.h>
 
 QT_BEGIN_NAMESPACE