Merge remote-tracking branch 'origin/refactor' into master

Conflicts:
	src/assistant/help/help.pro
	src/designer/src/components/formeditor/formwindow.cpp
	src/designer/src/components/formeditor/formwindow_dnditem.cpp
	src/designer/src/components/formeditor/layout_propertysheet.cpp
	src/designer/src/components/formeditor/qdesigner_resource.cpp
	src/designer/src/components/lib/lib.pro
	src/designer/src/components/signalsloteditor/signalsloteditor.cpp
	src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
	src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
	src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
	src/designer/src/lib/lib.pro
	src/designer/src/lib/shared/qdesigner_formbuilder.cpp
	src/designer/src/lib/shared/qdesigner_propertysheet.cpp
	src/designer/src/lib/shared/shared.pri
	src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
	src/linguist/lupdate/qdeclarative.cpp
	src/linguist/shared/profileevaluator.cpp
	src/linguist/shared/qph.cpp
	src/linguist/shared/ts.cpp
	src/qtconfig/mainwindow.cpp
	src/shared/qtgradienteditor/qtcolorline.cpp
	src/shared/qtgradienteditor/qtgradientwidget.cpp
	sync.profile

Change-Id: I53f0ce4efae4179257cbf3aab87e1af12c3aa4ff

107 files changed, 322 insertions, 342 deletions

diff --git a/src/designer/src/components/buddyeditor/buddyeditor.cpp b/src/designer/src/components/buddyeditor/buddyeditor.cpp
index d64d66574..ed6cc3e42 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor.cpp
+++ b/src/designer/src/components/buddyeditor/buddyeditor.cpp
@@ -54,10 +54,10 @@
 #include <metadatabase_p.h>
 
 #include <QtCore/qdebug.h>
-#include <QtGui/QLabel>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QApplication>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/buddyeditor/buddyeditor_plugin.cpp b/src/designer/src/components/buddyeditor/buddyeditor_plugin.cpp
index e4e7803e5..64e2a7241 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor_plugin.cpp
+++ b/src/designer/src/components/buddyeditor/buddyeditor_plugin.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QAction>
+#include <QtWidgets/QAction>
 
 #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 ceb422d12..d7fb60f03 100644
--- a/src/designer/src/components/buddyeditor/buddyeditor_tool.cpp
+++ b/src/designer/src/components/buddyeditor/buddyeditor_tool.cpp
@@ -44,7 +44,7 @@
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 
-#include <QtGui/QAction>
+#include <QtWidgets/QAction>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/default_actionprovider.cpp b/src/designer/src/components/formeditor/default_actionprovider.cpp
index ce66548be..c31a8dfba 100644
--- a/src/designer/src/components/formeditor/default_actionprovider.cpp
+++ b/src/designer/src/components/formeditor/default_actionprovider.cpp
@@ -43,8 +43,8 @@
 #include "invisible_widget_p.h"
 #include "qdesigner_toolbar_p.h"
 
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QApplication>
 #include <QtCore/QRect>
 #include <QtCore/QDebug>
 
diff --git a/src/designer/src/components/formeditor/default_actionprovider.h b/src/designer/src/components/formeditor/default_actionprovider.h
index 7b9ff3e26..2f136d83f 100644
--- a/src/designer/src/components/formeditor/default_actionprovider.h
+++ b/src/designer/src/components/formeditor/default_actionprovider.h
@@ -46,9 +46,9 @@
 #include "actionprovider_p.h"
 #include <extensionfactory_p.h>
 
-#include <QtGui/QMenu>
-#include <QtGui/QMenuBar>
-#include <QtGui/QToolBar>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QToolBar>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/default_container.h b/src/designer/src/components/formeditor/default_container.h
index 2771e0035..2b9774efb 100644
--- a/src/designer/src/components/formeditor/default_container.h
+++ b/src/designer/src/components/formeditor/default_container.h
@@ -46,11 +46,11 @@
 #include <QtDesigner/extension.h>
 #include <extensionfactory_p.h>
 
-#include <QtGui/QStackedWidget>
-#include <QtGui/QTabWidget>
-#include <QtGui/QToolBox>
-#include <QtGui/QScrollArea>
-#include <QtGui/QDockWidget>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QToolBox>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QDockWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/deviceprofiledialog.cpp b/src/designer/src/components/formeditor/deviceprofiledialog.cpp
index 7d170b1c1..ecd81b6bd 100644
--- a/src/designer/src/components/formeditor/deviceprofiledialog.cpp
+++ b/src/designer/src/components/formeditor/deviceprofiledialog.cpp
@@ -45,10 +45,10 @@
 #include <abstractdialoggui_p.h>
 #include <deviceprofile_p.h>
 
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QPushButton>
-#include <QtGui/QStyleFactory>
+#include <QtWidgets/QDialogButtonBox>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QStyleFactory>
 #include <QtGui/QFontDatabase>
 
 #include <QtCore/QFileInfo>
diff --git a/src/designer/src/components/formeditor/deviceprofiledialog.h b/src/designer/src/components/formeditor/deviceprofiledialog.h
index f547d2421..bdd22cf4c 100644
--- a/src/designer/src/components/formeditor/deviceprofiledialog.h
+++ b/src/designer/src/components/formeditor/deviceprofiledialog.h
@@ -53,7 +53,7 @@
 #ifndef SYSTEMSETTINGSDIALOG_H
 #define SYSTEMSETTINGSDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 #include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/formeditor/dpi_chooser.cpp b/src/designer/src/components/formeditor/dpi_chooser.cpp
index 8a039d0a2..74d397d5c 100644
--- a/src/designer/src/components/formeditor/dpi_chooser.cpp
+++ b/src/designer/src/components/formeditor/dpi_chooser.cpp
@@ -43,13 +43,13 @@
 
 #include <deviceprofile_p.h>
 
-#include <QtGui/QComboBox>
-#include <QtGui/QSpinBox>
-#include <QtGui/QLabel>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QPushButton>
-#include <QtGui/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QSpinBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QCheckBox>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/dpi_chooser.h b/src/designer/src/components/formeditor/dpi_chooser.h
index 306638c19..2ba7e556d 100644
--- a/src/designer/src/components/formeditor/dpi_chooser.h
+++ b/src/designer/src/components/formeditor/dpi_chooser.h
@@ -53,7 +53,7 @@
 #ifndef DPICHOOSER_H
 #define DPICHOOSER_H
 
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.cpp b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
index d85747c04..b13bfc9c6 100644
--- a/src/designer/src/components/formeditor/embeddedoptionspage.cpp
+++ b/src/designer/src/components/formeditor/embeddedoptionspage.cpp
@@ -55,15 +55,15 @@
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/QDesignerFormWindowManagerInterface>
 
-#include <QtGui/QLabel>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QApplication>
-#include <QtGui/QComboBox>
-#include <QtGui/QToolButton>
-#include <QtGui/QMessageBox>
-#include <QtGui/QLabel>
-#include <QtGui/QGroupBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QGroupBox>
 
 #include <QtCore/QSet>
 
diff --git a/src/designer/src/components/formeditor/embeddedoptionspage.h b/src/designer/src/components/formeditor/embeddedoptionspage.h
index 966a474d4..3fc7a4d85 100644
--- a/src/designer/src/components/formeditor/embeddedoptionspage.h
+++ b/src/designer/src/components/formeditor/embeddedoptionspage.h
@@ -44,7 +44,7 @@
 
 #include <QtDesigner/QDesignerOptionsPageInterface>
 #include <QtCore/QPointer>
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/formeditor_optionspage.cpp b/src/designer/src/components/formeditor/formeditor_optionspage.cpp
index f3b8da4b0..b4b5d8999 100644
--- a/src/designer/src/components/formeditor/formeditor_optionspage.cpp
+++ b/src/designer/src/components/formeditor/formeditor_optionspage.cpp
@@ -55,10 +55,10 @@
 
 #include <QtCore/QString>
 #include <QtCore/QCoreApplication>
-#include <QtGui/QGroupBox>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QFormLayout>
-#include <QtGui/QComboBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QComboBox>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/formwindow.cpp b/src/designer/src/components/formeditor/formwindow.cpp
index 1d9c01cf6..a651e7880 100644
--- a/src/designer/src/components/formeditor/formwindow.cpp
+++ b/src/designer/src/components/formeditor/formwindow.cpp
@@ -69,7 +69,7 @@
 #include <qdesigner_objectinspector_p.h>
 #include <connectionedit_p.h>
 #include <actionprovider_p.h>
-
+#include <private/ui4_p.h>
 #include <deviceprofile_p.h>
 #include <shared_settings_p.h>
 #include <grid_p.h>
@@ -89,22 +89,22 @@
 #include <QtCore/QBuffer>
 #include <QtCore/QTimer>
 #include <QtCore/QXmlStreamReader>
-#include <QtGui/QMenu>
-#include <QtGui/QAction>
-#include <QtGui/QActionGroup>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QActionGroup>
 #include <QtGui/QClipboard>
-#include <QtGui/QUndoGroup>
-#include <QtGui/QScrollArea>
-#include <QtGui/QRubberBand>
-#include <QtGui/QApplication>
-#include <QtGui/QSplitter>
+#include <QtWidgets/QUndoGroup>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QRubberBand>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QSplitter>
 #include <QtGui/QPainter>
-#include <QtGui/QGroupBox>
-#include <QtGui/QDockWidget>
-#include <QtGui/QToolBox>
-#include <QtGui/QStackedWidget>
-#include <QtGui/QTabWidget>
-#include <QtGui/QButtonGroup>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QDockWidget>
+#include <QtWidgets/QToolBox>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QButtonGroup>
 
 Q_DECLARE_METATYPE(QWidget*)
 
diff --git a/src/designer/src/components/formeditor/formwindow_dnditem.cpp b/src/designer/src/components/formeditor/formwindow_dnditem.cpp
index 96ce11463..ec508a5ba 100644
--- a/src/designer/src/components/formeditor/formwindow_dnditem.cpp
+++ b/src/designer/src/components/formeditor/formwindow_dnditem.cpp
@@ -42,13 +42,14 @@
 #include "formwindow_dnditem.h"
 #include "formwindow.h"
 
+#include <private/ui4_p.h>
 #include <qdesigner_resource.h>
 #include <qtresourcemodel_p.h>
 
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/private/ui4_p.h>
 
-#include <QtGui/QLabel>
+#include <QtWidgets/QLabel>
 #include <QtGui/QPixmap>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp
index 83ee77559..40f9aae33 100644
--- a/src/designer/src/components/formeditor/formwindow_widgetstack.cpp
+++ b/src/designer/src/components/formeditor/formwindow_widgetstack.cpp
@@ -42,11 +42,11 @@
 #include "formwindow_widgetstack.h"
 #include <QtDesigner/QDesignerFormWindowToolInterface>
 
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 #include <QtGui/qevent.h>
-#include <QtGui/QAction>
-#include <QtGui/QStackedLayout>
-#include <QtGui/QVBoxLayout>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QStackedLayout>
+#include <QtWidgets/QVBoxLayout>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/designer/src/components/formeditor/formwindow_widgetstack.h b/src/designer/src/components/formeditor/formwindow_widgetstack.h
index 389d88fa6..78eb3d21a 100644
--- a/src/designer/src/components/formeditor/formwindow_widgetstack.h
+++ b/src/designer/src/components/formeditor/formwindow_widgetstack.h
@@ -44,7 +44,7 @@
 
 #include "formeditor_global.h"
 
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/formwindowmanager.cpp b/src/designer/src/components/formeditor/formwindowmanager.cpp
index c82bbf4e5..3aef59ace 100644
--- a/src/designer/src/components/formeditor/formwindowmanager.cpp
+++ b/src/designer/src/components/formeditor/formwindowmanager.cpp
@@ -73,17 +73,17 @@
 #include <QtDesigner/QDesignerWidgetBoxInterface>
 #include <QtDesigner/QDesignerIntegrationInterface>
 
-#include <QtGui/QUndoGroup>
-#include <QtGui/QAction>
-#include <QtGui/QSplitter>
+#include <QtWidgets/QUndoGroup>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QSplitter>
 #include <QtGui/QMouseEvent>
-#include <QtGui/QApplication>
-#include <QtGui/QSizeGrip>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QSizeGrip>
 #include <QtGui/QClipboard>
-#include <QtGui/QMdiArea>
-#include <QtGui/QMdiSubWindow>
-#include <QtGui/QDesktopWidget>
-#include <QtGui/QMessageBox>
+#include <QtWidgets/QMdiArea>
+#include <QtWidgets/QMdiSubWindow>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QMessageBox>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/designer/src/components/formeditor/formwindowsettings.cpp b/src/designer/src/components/formeditor/formwindowsettings.cpp
index 5b3071f2e..a357c797e 100644
--- a/src/designer/src/components/formeditor/formwindowsettings.cpp
+++ b/src/designer/src/components/formeditor/formwindowsettings.cpp
@@ -45,7 +45,7 @@
 #include <formwindowbase_p.h>
 #include <grid_p.h>
 
-#include <QtGui/QStyle>
+#include <QtWidgets/QStyle>
 
 #include <QtCore/QRegExp>
 #include <QtCore/QDebug>
diff --git a/src/designer/src/components/formeditor/formwindowsettings.h b/src/designer/src/components/formeditor/formwindowsettings.h
index 075aed66e..893479ebe 100644
--- a/src/designer/src/components/formeditor/formwindowsettings.h
+++ b/src/designer/src/components/formeditor/formwindowsettings.h
@@ -42,7 +42,7 @@
 #ifndef FORMWINDOWSETTINGS_H
 #define FORMWINDOWSETTINGS_H
 
-#include <QDialog>
+#include <QtWidgets/QDialog>
 
 QT_BEGIN_NAMESPACE
     
diff --git a/src/designer/src/components/formeditor/itemview_propertysheet.cpp b/src/designer/src/components/formeditor/itemview_propertysheet.cpp
index 28d1e30da..31838f39f 100644
--- a/src/designer/src/components/formeditor/itemview_propertysheet.cpp
+++ b/src/designer/src/components/formeditor/itemview_propertysheet.cpp
@@ -43,8 +43,8 @@
 
 #include <QtDesigner/QDesignerFormEditorInterface>
 
-#include <QtGui/QAbstractItemView>
-#include <QtGui/QHeaderView>
+#include <QtWidgets/QAbstractItemView>
+#include <QtWidgets/QHeaderView>
 #include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/formeditor/itemview_propertysheet.h b/src/designer/src/components/formeditor/itemview_propertysheet.h
index 000a78ee8..8f8eee174 100644
--- a/src/designer/src/components/formeditor/itemview_propertysheet.h
+++ b/src/designer/src/components/formeditor/itemview_propertysheet.h
@@ -45,8 +45,8 @@
 #include <qdesigner_propertysheet_p.h>
 #include <extensionfactory_p.h>
 
-#include <QtGui/QTreeView>
-#include <QtGui/QTableView>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QTableView>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/layout_propertysheet.cpp b/src/designer/src/components/formeditor/layout_propertysheet.cpp
index f8803422a..44e2e122c 100644
--- a/src/designer/src/components/formeditor/layout_propertysheet.cpp
+++ b/src/designer/src/components/formeditor/layout_propertysheet.cpp
@@ -51,7 +51,7 @@
 #include <QtDesigner/private/ui4_p.h>
 #include <QtDesigner/private/formbuilderextra_p.h>
 
-#include <QtGui/QFormLayout>
+#include <QtWidgets/QFormLayout>
 
 #include <QtCore/QHash>
 #include <QtCore/QDebug>
diff --git a/src/designer/src/components/formeditor/layout_propertysheet.h b/src/designer/src/components/formeditor/layout_propertysheet.h
index e49db1ec2..b13a76489 100644
--- a/src/designer/src/components/formeditor/layout_propertysheet.h
+++ b/src/designer/src/components/formeditor/layout_propertysheet.h
@@ -45,7 +45,7 @@
 #include <qdesigner_propertysheet_p.h>
 #include <extensionfactory_p.h>
 
-#include <QtGui/QLayout>
+#include <QtWidgets/QLayout>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/line_propertysheet.cpp b/src/designer/src/components/formeditor/line_propertysheet.cpp
index bf9751313..0ba000683 100644
--- a/src/designer/src/components/formeditor/line_propertysheet.cpp
+++ b/src/designer/src/components/formeditor/line_propertysheet.cpp
@@ -45,7 +45,7 @@
 // sdk
 #include <QtDesigner/QExtensionManager>
 
-#include <QtGui/QLayout>
+#include <QtWidgets/QLayout>
 #include <QtCore/QMetaObject>
 #include <QtCore/QMetaProperty>
 #include <QtCore/qdebug.h>
diff --git a/src/designer/src/components/formeditor/previewactiongroup.cpp b/src/designer/src/components/formeditor/previewactiongroup.cpp
index 5c7a2fb74..85030b863 100644
--- a/src/designer/src/components/formeditor/previewactiongroup.cpp
+++ b/src/designer/src/components/formeditor/previewactiongroup.cpp
@@ -44,7 +44,7 @@
 #include <deviceprofile_p.h>
 #include <shared_settings_p.h>
 
-#include <QtGui/QStyleFactory>
+#include <QtWidgets/QStyleFactory>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/formeditor/previewactiongroup.h b/src/designer/src/components/formeditor/previewactiongroup.h
index f3fa3398d..b8c7f9b50 100644
--- a/src/designer/src/components/formeditor/previewactiongroup.h
+++ b/src/designer/src/components/formeditor/previewactiongroup.h
@@ -53,7 +53,7 @@
 #ifndef PREVIEWACTIONGROUP_H
 #define PREVIEWACTIONGROUP_H
 
-#include <QtGui/QActionGroup>
+#include <QtWidgets/QActionGroup>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/qdesigner_resource.cpp b/src/designer/src/components/formeditor/qdesigner_resource.cpp
index 2b6b13abf..c52cdfd4d 100644
--- a/src/designer/src/components/formeditor/qdesigner_resource.cpp
+++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp
@@ -74,7 +74,6 @@
 
 #include <qlayout_widget_p.h>
 #include <qdesigner_utils_p.h>
-
 #include <QtDesigner/private/ui4_p.h>
 
 // sdk
@@ -86,27 +85,27 @@
 #include <QtDesigner/QDesignerContainerExtension>
 #include <abstractdialoggui_p.h>
 
-#include <QtGui/QMenu>
-#include <QtGui/QMessageBox>
-#include <QtGui/QLayout>
-#include <QtGui/QFormLayout>
-#include <QtGui/QTabWidget>
-#include <QtGui/QToolBox>
-#include <QtGui/QStackedWidget>
-#include <QtGui/QToolBar>
-#include <QtGui/QTabBar>
-#include <QtGui/QAction>
-#include <QtGui/QActionGroup>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QApplication>
-#include <QtGui/QMainWindow>
-#include <QtGui/QSplitter>
-#include <QtGui/QMdiArea>
-#include <QtGui/QWorkspace>
-#include <QtGui/QMenuBar>
-#include <QtGui/QFileDialog>
-#include <QtGui/QHeaderView>
-#include <QtGui/QWizardPage>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QMessageBox>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QToolBox>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QTabBar>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QActionGroup>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QSplitter>
+#include <QtWidgets/QMdiArea>
+#include <QtWidgets/QWorkspace>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QWizardPage>
 #include <private/qlayoutengine_p.h>
 
 #include <QtCore/QBuffer>
diff --git a/src/designer/src/components/formeditor/qdesignerundostack.cpp b/src/designer/src/components/formeditor/qdesignerundostack.cpp
index c0adb492d..823a66a3b 100644
--- a/src/designer/src/components/formeditor/qdesignerundostack.cpp
+++ b/src/designer/src/components/formeditor/qdesignerundostack.cpp
@@ -41,8 +41,8 @@
 
 #include "qdesignerundostack.h"
 
-#include <QtGui/QUndoStack>
-#include <QtGui/QUndoCommand>
+#include <QtWidgets/QUndoStack>
+#include <QtWidgets/QUndoCommand>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp b/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp
index 6234dd0be..0de0b2715 100644
--- a/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp
+++ b/src/designer/src/components/formeditor/qlayoutwidget_propertysheet.cpp
@@ -46,7 +46,7 @@
 
 #include <QtDesigner/QExtensionManager>
 
-#include <QtGui/QLayout>
+#include <QtWidgets/QLayout>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/qmainwindow_container.cpp b/src/designer/src/components/formeditor/qmainwindow_container.cpp
index 64475dd97..5ea74348f 100644
--- a/src/designer/src/components/formeditor/qmainwindow_container.cpp
+++ b/src/designer/src/components/formeditor/qmainwindow_container.cpp
@@ -45,11 +45,11 @@
 
 #include <QtCore/qdebug.h>
 
-#include <QtGui/QLayout>
-#include <QtGui/QMenuBar>
-#include <QtGui/QToolBar>
-#include <QtGui/QStatusBar>
-#include <QtGui/QDockWidget>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QMenuBar>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QStatusBar>
+#include <QtWidgets/QDockWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/qmainwindow_container.h b/src/designer/src/components/formeditor/qmainwindow_container.h
index 2b1d18923..44f0413bd 100644
--- a/src/designer/src/components/formeditor/qmainwindow_container.h
+++ b/src/designer/src/components/formeditor/qmainwindow_container.h
@@ -47,7 +47,7 @@
 
 #include <extensionfactory_p.h>
 
-#include <QtGui/QMainWindow>
+#include <QtWidgets/QMainWindow>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/qmdiarea_container.cpp b/src/designer/src/components/formeditor/qmdiarea_container.cpp
index 96875446a..bb83f9ce9 100644
--- a/src/designer/src/components/formeditor/qmdiarea_container.cpp
+++ b/src/designer/src/components/formeditor/qmdiarea_container.cpp
@@ -44,9 +44,9 @@
 #include <QtDesigner/QExtensionManager>
 #include <QtDesigner/QDesignerFormEditorInterface>
 
-#include <QtGui/QMdiArea>
-#include <QtGui/QMdiSubWindow>
-#include <QtGui/QApplication>
+#include <QtWidgets/QMdiArea>
+#include <QtWidgets/QMdiSubWindow>
+#include <QtWidgets/QApplication>
 #include <QtCore/QDebug>
 #include <QtCore/QHash>
 
diff --git a/src/designer/src/components/formeditor/qmdiarea_container.h b/src/designer/src/components/formeditor/qmdiarea_container.h
index f9ace3c62..d7bd49589 100644
--- a/src/designer/src/components/formeditor/qmdiarea_container.h
+++ b/src/designer/src/components/formeditor/qmdiarea_container.h
@@ -48,8 +48,8 @@
 #include <qdesigner_propertysheet_p.h>
 #include <extensionfactory_p.h>
 
-#include <QtGui/QMdiArea>
-#include <QtGui/QWorkspace>
+#include <QtWidgets/QMdiArea>
+#include <QtWidgets/QWorkspace>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/qwizard_container.cpp b/src/designer/src/components/formeditor/qwizard_container.cpp
index bdd40426c..facec786e 100644
--- a/src/designer/src/components/formeditor/qwizard_container.cpp
+++ b/src/designer/src/components/formeditor/qwizard_container.cpp
@@ -44,8 +44,8 @@
 #include <QtDesigner/QExtensionManager>
 #include <QtDesigner/QDesignerFormEditorInterface>
 
-#include <QtGui/QWizard>
-#include <QtGui/QWizardPage>
+#include <QtWidgets/QWizard>
+#include <QtWidgets/QWizardPage>
 #include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/formeditor/qwizard_container.h b/src/designer/src/components/formeditor/qwizard_container.h
index 837d45b15..d8c3fb4cc 100644
--- a/src/designer/src/components/formeditor/qwizard_container.h
+++ b/src/designer/src/components/formeditor/qwizard_container.h
@@ -47,8 +47,8 @@
 #include <qdesigner_propertysheet_p.h>
 #include <extensionfactory_p.h>
 
-#include <QtGui/QWizard>
-#include <QtGui/QWizardPage>
+#include <QtWidgets/QWizard>
+#include <QtWidgets/QWizardPage>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/qworkspace_container.cpp b/src/designer/src/components/formeditor/qworkspace_container.cpp
index 1971cf80a..d3fde23f1 100644
--- a/src/designer/src/components/formeditor/qworkspace_container.cpp
+++ b/src/designer/src/components/formeditor/qworkspace_container.cpp
@@ -42,7 +42,7 @@
 #include "qworkspace_container.h"
 #include "qmdiarea_container.h"
 
-#include <QtGui/QWorkspace>
+#include <QtWidgets/QWorkspace>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/qworkspace_container.h b/src/designer/src/components/formeditor/qworkspace_container.h
index 25973a1de..ce5151574 100644
--- a/src/designer/src/components/formeditor/qworkspace_container.h
+++ b/src/designer/src/components/formeditor/qworkspace_container.h
@@ -46,7 +46,7 @@
 #include <QtDesigner/QExtensionFactory>
 
 #include <extensionfactory_p.h>
-#include <QtGui/QWorkspace>
+#include <QtWidgets/QWorkspace>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/spacer_propertysheet.cpp b/src/designer/src/components/formeditor/spacer_propertysheet.cpp
index b224501af..d46a5aaa9 100644
--- a/src/designer/src/components/formeditor/spacer_propertysheet.cpp
+++ b/src/designer/src/components/formeditor/spacer_propertysheet.cpp
@@ -46,7 +46,7 @@
 
 #include <QtDesigner/QExtensionManager>
 
-#include <QtGui/QLayout>
+#include <QtWidgets/QLayout>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/templateoptionspage.h b/src/designer/src/components/formeditor/templateoptionspage.h
index e834316af..f6270b643 100644
--- a/src/designer/src/components/formeditor/templateoptionspage.h
+++ b/src/designer/src/components/formeditor/templateoptionspage.h
@@ -47,7 +47,7 @@
 #include <QtCore/QPointer>
 #include <QtCore/QStringList>
 
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/formeditor/tool_widgeteditor.cpp b/src/designer/src/components/formeditor/tool_widgeteditor.cpp
index 1b1389a9a..7dfd6fbee 100644
--- a/src/designer/src/components/formeditor/tool_widgeteditor.cpp
+++ b/src/designer/src/components/formeditor/tool_widgeteditor.cpp
@@ -52,8 +52,8 @@
 #include <qdesigner_resource.h>
 
 #include <QtGui/qevent.h>
-#include <QtGui/QAction>
-#include <QtGui/QMainWindow>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMainWindow>
 #include <QtGui/QCursor>
 #include <QtCore/qdebug.h>
 
diff --git a/src/designer/src/components/formeditor/widgetselection.cpp b/src/designer/src/components/formeditor/widgetselection.cpp
index 441dcb4c4..045fb414d 100644
--- a/src/designer/src/components/formeditor/widgetselection.cpp
+++ b/src/designer/src/components/formeditor/widgetselection.cpp
@@ -55,14 +55,14 @@
 #include <formwindowbase_p.h>
 #include <grid_p.h>
 
-#include <QtGui/QMenu>
-#include <QtGui/QWidget>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QWidget>
 #include <QtGui/QMouseEvent>
-#include <QtGui/QStylePainter>
-#include <QtGui/QGridLayout>
-#include <QtGui/QFormLayout>
-#include <QtGui/QStyleOptionToolButton>
-#include <QtGui/QApplication>
+#include <QtWidgets/QStylePainter>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QFormLayout>
+#include <QtWidgets/QStyleOptionToolButton>
+#include <QtWidgets/QApplication>
 
 #include <QtCore/QVariant>
 #include <QtCore/qdebug.h>
diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro
index abfcf24ad..4c255119f 100644
--- a/src/designer/src/components/lib/lib.pro
+++ b/src/designer/src/components/lib/lib.pro
@@ -1,24 +1,19 @@
+MODULE = designercomponents
 load(qt_module)
 
 TEMPLATE = lib
 TARGET = QtDesignerComponents
-contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
-CONFIG += qt depend_prl no_objective_c designer
-QT *= gui-private
-QT *= uilib-private
-win32|mac: CONFIG += debug_and_release
-DESTDIR = $$QT.designer.libs
-!wince*:DLLDESTDIR = $$QT.designer.bins
-QT += designer-private uilib-private
+
+QT += gui-private widgets widgets-private designer designer-private
+
+CONFIG += module
+MODULE_PRI = ../../../../modules/qt_designercomponents.pri
+
+load(qt_module_config)
 
 # QtDesignerComponents uses
 DEFINES += QT_STATICPLUGIN
-
-isEmpty(QT_MAJOR_VERSION) {
-   VERSION=4.3.0
-} else {
-   VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
-}
+DEFINES += QDESIGNER_COMPONENTS_LIBRARY
 
 load(qt_targets)
 QMAKE_TARGET_PRODUCT = Designer
@@ -38,14 +33,6 @@ mac:!static:contains(QT_CONFIG, qt_framework) {
 
 SOURCES += qdesigner_components.cpp
 
-!contains(CONFIG, static) {
-    DEFINES += QDESIGNER_COMPONENTS_LIBRARY
-    CONFIG += dll
-    LIBS += -lQtDesigner
-} else {
-    DEFINES += QT_DESIGNER_STATIC
-}
-
 INCLUDEPATH += . .. \
     $$PWD/../../lib/components \
     $$PWD/../../lib/sdk \
@@ -70,10 +57,3 @@ unix|win32-g++* {
     QMAKE_PKGCONFIG_REQUIRES = QtCore QtDesigner QtGui QtXml
     contains(QT_CONFIG, script): QMAKE_PKGCONFIG_REQUIRES += QtScript
 }
-
-target.path=$$[QT_INSTALL_LIBS]
-INSTALLS        += target
-win32 {
-    dlltarget.path=$$[QT_INSTALL_BINS]
-    INSTALLS += dlltarget
-}
diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp
index ff6772ba3..91fe6946d 100644
--- a/src/designer/src/components/objectinspector/objectinspector.cpp
+++ b/src/designer/src/components/objectinspector/objectinspector.cpp
@@ -63,15 +63,15 @@
 #include <grid_p.h>
 
 // Qt
-#include <QtGui/QApplication>
-#include <QtGui/QHeaderView>
-#include <QtGui/QScrollBar>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QScrollBar>
 #include <QtGui/QPainter>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QItemSelectionModel>
-#include <QtGui/QMenu>
-#include <QtGui/QTreeView>
-#include <QtGui/QItemDelegate>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QItemSelectionModel>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QItemDelegate>
 #include <QtGui/qevent.h>
 
 #include <QtCore/QVector>
diff --git a/src/designer/src/components/objectinspector/objectinspectormodel.cpp b/src/designer/src/components/objectinspector/objectinspectormodel.cpp
index a1cbc1ac9..773160841 100644
--- a/src/designer/src/components/objectinspector/objectinspectormodel.cpp
+++ b/src/designer/src/components/objectinspector/objectinspectormodel.cpp
@@ -53,11 +53,11 @@
 #include <QtDesigner/QDesignerContainerExtension>
 #include <QtDesigner/QDesignerMetaDataBaseInterface>
 #include <QtDesigner/QExtensionManager>
-#include <QtGui/QLayout>
-#include <QtGui/QAction>
-#include <QtGui/QLayoutItem>
-#include <QtGui/QMenu>
-#include <QtGui/QButtonGroup>
+#include <QtWidgets/QLayout>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QLayoutItem>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QButtonGroup>
 #include <QtCore/QSet>
 #include <QtCore/QDebug>
 #include <QtCore/QCoreApplication>
diff --git a/src/designer/src/components/objectinspector/objectinspectormodel_p.h b/src/designer/src/components/objectinspector/objectinspectormodel_p.h
index 6e1121d73..474e942f3 100644
--- a/src/designer/src/components/objectinspector/objectinspectormodel_p.h
+++ b/src/designer/src/components/objectinspector/objectinspectormodel_p.h
@@ -55,8 +55,8 @@
 
 #include <layoutinfo_p.h>
 
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QIcon>
+#include <QtWidgets/QStandardItemModel>
+#include <QtWidgets/QIcon>
 #include <QtCore/QModelIndex>
 #include <QtCore/QString>
 #include <QtCore/QList>
diff --git a/src/designer/src/components/propertyeditor/brushpropertymanager.h b/src/designer/src/components/propertyeditor/brushpropertymanager.h
index aa50a1166..221e752b5 100644
--- a/src/designer/src/components/propertyeditor/brushpropertymanager.h
+++ b/src/designer/src/components/propertyeditor/brushpropertymanager.h
@@ -44,7 +44,7 @@
 
 #include <QtCore/QMap>
 #include <QtGui/QBrush>
-#include <QtGui/QIcon>
+#include <QtWidgets/QIcon>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
index dfba2feae..8007eac8e 100644
--- a/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
+++ b/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
@@ -56,19 +56,19 @@
 #include <iconselector_p.h>
 #include <abstractdialoggui_p.h>
 
-#include <QtGui/QLabel>
-#include <QtGui/QToolButton>
-#include <QtGui/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QHBoxLayout>
 #include <QtCore/QFileInfo>
 #include <QtGui/QClipboard>
-#include <QtGui/QLineEdit>
-#include <QtGui/QDialogButtonBox>
-#include <QtGui/QPushButton>
-#include <QtGui/QFileDialog>
-#include <QtGui/QAction>
-#include <QtGui/QMenu>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QDialogButtonBox>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QFileDialog>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMenu>
 #include <QtGui/QContextMenuEvent>
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 #include <QtCore/QUrl>
 
 #include <QtCore/QDebug>
diff --git a/src/designer/src/components/propertyeditor/designerpropertymanager.h b/src/designer/src/components/propertyeditor/designerpropertymanager.h
index 58085f9f5..0f33820bd 100644
--- a/src/designer/src/components/propertyeditor/designerpropertymanager.h
+++ b/src/designer/src/components/propertyeditor/designerpropertymanager.h
@@ -52,7 +52,7 @@
 #include <QtCore/QUrl>
 #include <QtCore/QMap>
 #include <QtGui/QFont>
-#include <QtGui/QIcon>
+#include <QtWidgets/QIcon>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
index ee369c2c5..5426b8514 100644
--- a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
+++ b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
@@ -44,7 +44,7 @@
 #include <abstractdialoggui_p.h>
 #include <qdesigner_propertysheet_p.h>
 
-#include <QtGui/QPushButton>
+#include <QtWidgets/QPushButton>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.h b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.h
index e6cd63bf9..9e18551d9 100644
--- a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.h
+++ b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.h
@@ -54,7 +54,7 @@
 //
 
 #include "propertyeditor_global.h"
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 #include <QtCore/QVariant>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/propertyeditor/paletteeditor.cpp b/src/designer/src/components/propertyeditor/paletteeditor.cpp
index 15cd798d6..bd82c851b 100644
--- a/src/designer/src/components/propertyeditor/paletteeditor.cpp
+++ b/src/designer/src/components/propertyeditor/paletteeditor.cpp
@@ -49,9 +49,9 @@
 
 #include <QtCore/QMetaProperty>
 #include <QtGui/QPainter>
-#include <QtGui/QToolButton>
-#include <QtGui/QLabel>
-#include <QtGui/QHeaderView>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QHeaderView>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/propertyeditor/paletteeditor.h b/src/designer/src/components/propertyeditor/paletteeditor.h
index 3474b37b6..bb69fc7be 100644
--- a/src/designer/src/components/propertyeditor/paletteeditor.h
+++ b/src/designer/src/components/propertyeditor/paletteeditor.h
@@ -43,7 +43,7 @@
 #define PALETTEEDITOR_H
 
 #include "ui_paletteeditor.h"
-#include <QtGui/QItemDelegate>
+#include <QtWidgets/QItemDelegate>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/propertyeditor/paletteeditorbutton.h b/src/designer/src/components/propertyeditor/paletteeditorbutton.h
index 16d9365a9..88fefd634 100644
--- a/src/designer/src/components/propertyeditor/paletteeditorbutton.h
+++ b/src/designer/src/components/propertyeditor/paletteeditorbutton.h
@@ -45,7 +45,7 @@
 #include "propertyeditor_global.h"
 
 #include <QtGui/QPalette>
-#include <QtGui/QToolButton>
+#include <QtWidgets/QToolButton>
 
 #include "abstractformeditor.h"
 
diff --git a/src/designer/src/components/propertyeditor/previewframe.cpp b/src/designer/src/components/propertyeditor/previewframe.cpp
index 6629fc956..6d1fac178 100644
--- a/src/designer/src/components/propertyeditor/previewframe.cpp
+++ b/src/designer/src/components/propertyeditor/previewframe.cpp
@@ -45,8 +45,8 @@
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
 #include <QtGui/QPainter>
-#include <QtGui/QMdiArea>
-#include <QtGui/QMdiSubWindow>
+#include <QtWidgets/QMdiArea>
+#include <QtWidgets/QMdiSubWindow>
 #include <QtGui/QPaintEvent>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/propertyeditor/previewframe.h b/src/designer/src/components/propertyeditor/previewframe.h
index 1e26da51c..2642c75fe 100644
--- a/src/designer/src/components/propertyeditor/previewframe.h
+++ b/src/designer/src/components/propertyeditor/previewframe.h
@@ -42,7 +42,7 @@
 #ifndef PREVIEWFRAME_H
 #define PREVIEWFRAME_H
 
-#include <QtGui/QFrame>
+#include <QtWidgets/QFrame>
 #include <QtCore/QPointer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp
index fd5a9474b..0d9b9176f 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -68,17 +68,17 @@
 #ifdef Q_OS_WIN
 #  include <widgetfactory_p.h>
 #endif
-#include <QtGui/QAction>
-#include <QtGui/QLineEdit>
-#include <QtGui/QMenu>
-#include <QtGui/QApplication>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QScrollArea>
-#include <QtGui/QStackedWidget>
-#include <QtGui/QToolBar>
-#include <QtGui/QToolButton>
-#include <QtGui/QActionGroup>
-#include <QtGui/QLabel>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QActionGroup>
+#include <QtWidgets/QLabel>
 #include <QtGui/QPainter>
 
 #include <QtCore/QDebug>
diff --git a/src/designer/src/components/propertyeditor/stringlisteditor.cpp b/src/designer/src/components/propertyeditor/stringlisteditor.cpp
index 7a0e3e0e1..c90815b0e 100644
--- a/src/designer/src/components/propertyeditor/stringlisteditor.cpp
+++ b/src/designer/src/components/propertyeditor/stringlisteditor.cpp
@@ -41,7 +41,7 @@
 
 #include "stringlisteditor.h"
 #include <iconloader_p.h>
-#include <QtGui/QStringListModel>
+#include <QtWidgets/QStringListModel>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/propertyeditor/stringlisteditorbutton.h b/src/designer/src/components/propertyeditor/stringlisteditorbutton.h
index 0a57e3834..de2d9f3f5 100644
--- a/src/designer/src/components/propertyeditor/stringlisteditorbutton.h
+++ b/src/designer/src/components/propertyeditor/stringlisteditorbutton.h
@@ -45,7 +45,7 @@
 #include "propertyeditor_global.h"
 
 #include <QtCore/QStringList>
-#include <QtGui/QToolButton>
+#include <QtWidgets/QToolButton>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/signalsloteditor/connectdialog.cpp b/src/designer/src/components/signalsloteditor/connectdialog.cpp
index 2d55abdcf..4f4f76c6f 100644
--- a/src/designer/src/components/signalsloteditor/connectdialog.cpp
+++ b/src/designer/src/components/signalsloteditor/connectdialog.cpp
@@ -51,7 +51,7 @@
 #include <QtDesigner/QExtensionManager>
 #include <QtDesigner/QDesignerLanguageExtension>
 
-#include <QtGui/QPushButton>
+#include <QtWidgets/QPushButton>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/signalsloteditor/connectdialog_p.h b/src/designer/src/components/signalsloteditor/connectdialog_p.h
index fc07827d6..820ba05da 100644
--- a/src/designer/src/components/signalsloteditor/connectdialog_p.h
+++ b/src/designer/src/components/signalsloteditor/connectdialog_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "ui_connectdialog.h"
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
index 639c5259e..364619199 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor.cpp
@@ -52,9 +52,9 @@
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/QDesignerMetaDataBaseInterface>
 
-#include <QtGui/QApplication>
-#include <QtGui/QUndoCommand>
-#include <QtGui/QMenu>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QUndoCommand>
+#include <QtWidgets/QMenu>
 
 #include <QtCore/QCoreApplication>
 #include <QtCore/QDebug>
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp
index d183a98db..7e82cb6f6 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor_plugin.cpp
@@ -45,7 +45,7 @@
 #include <QtDesigner/QDesignerFormEditorInterface>
 #include <QtDesigner/QDesignerFormWindowManagerInterface>
 
-#include <QtGui/QAction>
+#include <QtWidgets/QAction>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
index 26055a40b..6df375219 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp
@@ -45,7 +45,7 @@
 #include <QtDesigner/private/ui4_p.h>
 #include <QtDesigner/QDesignerFormWindowInterface>
 
-#include <QtGui/QAction>
+#include <QtWidgets/QAction>
 #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 63ace1766..0b4056d2f 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -60,21 +60,21 @@
 
 #include <QtCore/QAbstractItemModel>
 #include <QtCore/QDebug>
-#include <QtGui/QAction>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QMenu>
-#include <QtGui/QSortFilterProxyModel>
-#include <QtGui/QStandardItemModel>
-#include <QtGui/QComboBox>
-#include <QtGui/QApplication>
-#include <QtGui/QItemDelegate>
-#include <QtGui/QItemEditorFactory>
-#include <QtGui/QTreeView>
-#include <QtGui/QHeaderView>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QToolButton>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QToolBar>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QSortFilterProxyModel>
+#include <QtWidgets/QStandardItemModel>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QItemDelegate>
+#include <QtWidgets/QItemEditorFactory>
+#include <QtWidgets/QTreeView>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QToolBar>
 
 QT_BEGIN_NAMESPACE
 
@@ -445,7 +445,7 @@ void InlineEditorModel::addTitle(const QString &title)
     const int cnt = rowCount();
     insertRows(cnt, 1);
     QModelIndex cat_idx = index(cnt, 0);
-    setData(cat_idx, title + QLatin1Char(':'), Qt::DisplayRole);
+    setData(cat_idx, QString(title + QLatin1Char(':')), Qt::DisplayRole);
     setData(cat_idx, TitleItem, Qt::UserRole);
     QFont font = QApplication::font();
     font.setBold(true);
diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.h b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.h
index 6cfc6734b..c1e805be1 100644
--- a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.h
+++ b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.h
@@ -43,7 +43,7 @@
 #define SIGNALSLOTEDITORWINDOW_H
 
 #include <QtCore/QPointer>
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/tabordereditor/tabordereditor.cpp b/src/designer/src/components/tabordereditor/tabordereditor.cpp
index a32ffe4a0..875953ae1 100644
--- a/src/designer/src/components/tabordereditor/tabordereditor.cpp
+++ b/src/designer/src/components/tabordereditor/tabordereditor.cpp
@@ -57,8 +57,8 @@
 #include <QtGui/QPainter>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QResizeEvent>
-#include <QtGui/QMenu>
-#include <QtGui/QApplication>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QApplication>
 
 Q_DECLARE_METATYPE(QWidgetList)
 
diff --git a/src/designer/src/components/tabordereditor/tabordereditor.h b/src/designer/src/components/tabordereditor/tabordereditor.h
index cc0b669a7..82025fe33 100644
--- a/src/designer/src/components/tabordereditor/tabordereditor.h
+++ b/src/designer/src/components/tabordereditor/tabordereditor.h
@@ -45,7 +45,7 @@
 #include "tabordereditor_global.h"
 
 #include <QtCore/QPointer>
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 #include <QtGui/QRegion>
 #include <QtGui/QFont>
 #include <QtGui/QFontMetrics>
diff --git a/src/designer/src/components/tabordereditor/tabordereditor_plugin.cpp b/src/designer/src/components/tabordereditor/tabordereditor_plugin.cpp
index e6309cff9..72ffb83dc 100644
--- a/src/designer/src/components/tabordereditor/tabordereditor_plugin.cpp
+++ b/src/designer/src/components/tabordereditor/tabordereditor_plugin.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <QtGui/QAction>
+#include <QtWidgets/QAction>
 
 #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 ee617b5a4..1c3fb7aca 100644
--- a/src/designer/src/components/tabordereditor/tabordereditor_tool.cpp
+++ b/src/designer/src/components/tabordereditor/tabordereditor_tool.cpp
@@ -45,7 +45,7 @@
 #include <QtDesigner/QDesignerFormWindowInterface>
 
 #include <QtCore/QEvent>
-#include <QtGui/QAction>
+#include <QtWidgets/QAction>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/taskmenu/button_taskmenu.cpp b/src/designer/src/components/taskmenu/button_taskmenu.cpp
index 282abe6ba..8cfbdec39 100644
--- a/src/designer/src/components/taskmenu/button_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/button_taskmenu.cpp
@@ -51,14 +51,14 @@
 #include <QtDesigner/QDesignerObjectInspectorInterface>
 #include <QtDesigner/QDesignerPropertyEditorInterface>
 
-#include <QtGui/QAction>
-#include <QtGui/QActionGroup>
-#include <QtGui/QMenu>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOption>
-#include <QtGui/QAbstractButton>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QApplication>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QActionGroup>
+#include <QtWidgets/QMenu>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QStyleOption>
+#include <QtWidgets/QAbstractButton>
+#include <QtWidgets/QButtonGroup>
+#include <QtWidgets/QApplication>
 #include <QtCore/QDebug>
 
 Q_DECLARE_METATYPE(QButtonGroup*)
diff --git a/src/designer/src/components/taskmenu/button_taskmenu.h b/src/designer/src/components/taskmenu/button_taskmenu.h
index 0473143a6..d1b94eb73 100644
--- a/src/designer/src/components/taskmenu/button_taskmenu.h
+++ b/src/designer/src/components/taskmenu/button_taskmenu.h
@@ -42,9 +42,9 @@
 #ifndef BUTTON_TASKMENU_H
 #define BUTTON_TASKMENU_H
 
-#include <QtGui/QAbstractButton>
-#include <QtGui/QCommandLinkButton>
-#include <QtGui/QButtonGroup>
+#include <QtWidgets/QAbstractButton>
+#include <QtWidgets/QCommandLinkButton>
+#include <QtWidgets/QButtonGroup>
 
 #include <qdesigner_taskmenu_p.h>
 #include <extensionfactory_p.h>
diff --git a/src/designer/src/components/taskmenu/combobox_taskmenu.cpp b/src/designer/src/components/taskmenu/combobox_taskmenu.cpp
index 95842df59..87f05cd5d 100644
--- a/src/designer/src/components/taskmenu/combobox_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/combobox_taskmenu.cpp
@@ -46,11 +46,11 @@
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 
-#include <QtGui/QAction>
-#include <QtGui/QStyle>
-#include <QtGui/QLineEdit>
-#include <QtGui/QFontComboBox>
-#include <QtGui/QStyleOption>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QFontComboBox>
+#include <QtWidgets/QStyleOption>
 
 #include <QtCore/QEvent>
 #include <QtCore/QVariant>
diff --git a/src/designer/src/components/taskmenu/combobox_taskmenu.h b/src/designer/src/components/taskmenu/combobox_taskmenu.h
index a1aa9c843..3ab7bd52e 100644
--- a/src/designer/src/components/taskmenu/combobox_taskmenu.h
+++ b/src/designer/src/components/taskmenu/combobox_taskmenu.h
@@ -42,7 +42,7 @@
 #ifndef COMBOBOX_TASKMENU_H
 #define COMBOBOX_TASKMENU_H
 
-#include <QtGui/QComboBox>
+#include <QtWidgets/QComboBox>
 #include <QtCore/QPointer>
 
 #include <qdesigner_taskmenu_p.h>
diff --git a/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp b/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
index 9568ca146..4165e2d69 100644
--- a/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/containerwidget_taskmenu.cpp
@@ -51,16 +51,16 @@
 #include <promotiontaskmenu_p.h>
 #include <widgetdatabase_p.h>
 
-#include <QtGui/QAction>
-#include <QtGui/QMainWindow>
-#include <QtGui/QToolBox>
-#include <QtGui/QStackedWidget>
-#include <QtGui/QTabWidget>
-#include <QtGui/QScrollArea>
-#include <QtGui/QMdiArea>
-#include <QtGui/QWorkspace>
-#include <QtGui/QWizard>
-#include <QtGui/QMenu>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QMainWindow>
+#include <QtWidgets/QToolBox>
+#include <QtWidgets/QStackedWidget>
+#include <QtWidgets/QTabWidget>
+#include <QtWidgets/QScrollArea>
+#include <QtWidgets/QMdiArea>
+#include <QtWidgets/QWorkspace>
+#include <QtWidgets/QWizard>
+#include <QtWidgets/QMenu>
 
 #include <QtCore/qdebug.h>
 
diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
index e402e8ba2..4c9d31911 100644
--- a/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.cpp
@@ -44,9 +44,9 @@
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 
-#include <QtGui/QAction>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOption>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QStyleOption>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/taskmenu/groupbox_taskmenu.h b/src/designer/src/components/taskmenu/groupbox_taskmenu.h
index bdc720a90..9a5c675f9 100644
--- a/src/designer/src/components/taskmenu/groupbox_taskmenu.h
+++ b/src/designer/src/components/taskmenu/groupbox_taskmenu.h
@@ -42,7 +42,7 @@
 #ifndef GROUPBOX_TASKMENU_H
 #define GROUPBOX_TASKMENU_H
 
-#include <QtGui/QGroupBox>
+#include <QtWidgets/QGroupBox>
 #include <QtCore/QPointer>
 
 #include <qdesigner_taskmenu_p.h>
diff --git a/src/designer/src/components/taskmenu/inplace_widget_helper.cpp b/src/designer/src/components/taskmenu/inplace_widget_helper.cpp
index 6b4343705..2c5abc446 100644
--- a/src/designer/src/components/taskmenu/inplace_widget_helper.cpp
+++ b/src/designer/src/components/taskmenu/inplace_widget_helper.cpp
@@ -43,9 +43,9 @@
 #include "inplace_widget_helper.h"
 
 #include <QtGui/QResizeEvent>
-#include <QtGui/QPushButton>
-#include <QtGui/QToolButton>
-#include <QtGui/QShortcut>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QShortcut>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.cpp b/src/designer/src/components/taskmenu/itemlisteditor.cpp
index d682aff20..f01f1154b 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.cpp
+++ b/src/designer/src/components/taskmenu/itemlisteditor.cpp
@@ -49,7 +49,7 @@
 
 #include <qttreepropertybrowser.h>
 
-#include <QtGui/QSplitter>
+#include <QtWidgets/QSplitter>
 #include <QtCore/QCoreApplication>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/taskmenu/itemlisteditor.h b/src/designer/src/components/taskmenu/itemlisteditor.h
index 57bbeef73..9defb6ad7 100644
--- a/src/designer/src/components/taskmenu/itemlisteditor.h
+++ b/src/designer/src/components/taskmenu/itemlisteditor.h
@@ -44,7 +44,7 @@
 
 #include "ui_itemlisteditor.h"
 
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/taskmenu/label_taskmenu.cpp b/src/designer/src/components/taskmenu/label_taskmenu.cpp
index e3958232b..bfc6bfb64 100644
--- a/src/designer/src/components/taskmenu/label_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/label_taskmenu.cpp
@@ -44,9 +44,9 @@
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 
-#include <QtGui/QAction>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOption>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QStyleOption>
 #include <QtGui/QTextDocument>
 
 static const char *textPropertyC = "text";
diff --git a/src/designer/src/components/taskmenu/label_taskmenu.h b/src/designer/src/components/taskmenu/label_taskmenu.h
index 760aafa02..04af4e533 100644
--- a/src/designer/src/components/taskmenu/label_taskmenu.h
+++ b/src/designer/src/components/taskmenu/label_taskmenu.h
@@ -42,7 +42,7 @@
 #ifndef LABEL_TASKMENU_H
 #define LABEL_TASKMENU_H
 
-#include <QtGui/QLabel>
+#include <QtWidgets/QLabel>
 #include <QtCore/QPointer>
 
 #include <qdesigner_taskmenu_p.h>
diff --git a/src/designer/src/components/taskmenu/layouttaskmenu.cpp b/src/designer/src/components/taskmenu/layouttaskmenu.cpp
index 005bb30ad..ae79a0dd9 100644
--- a/src/designer/src/components/taskmenu/layouttaskmenu.cpp
+++ b/src/designer/src/components/taskmenu/layouttaskmenu.cpp
@@ -45,7 +45,7 @@
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 
-#include <QtGui/QAction>
+#include <QtWidgets/QAction>
 #include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
index b60513423..efbadc38d 100644
--- a/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.cpp
@@ -44,9 +44,9 @@
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 
-#include <QtGui/QAction>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOption>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QStyleOption>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/taskmenu/lineedit_taskmenu.h b/src/designer/src/components/taskmenu/lineedit_taskmenu.h
index 6a4bbc2b4..9d40e8d60 100644
--- a/src/designer/src/components/taskmenu/lineedit_taskmenu.h
+++ b/src/designer/src/components/taskmenu/lineedit_taskmenu.h
@@ -42,7 +42,7 @@
 #ifndef LINEEDIT_TASKMENU_H
 #define LINEEDIT_TASKMENU_H
 
-#include <QtGui/QLineEdit>
+#include <QtWidgets/QLineEdit>
 #include <QtCore/QPointer>
 
 #include <qdesigner_taskmenu_p.h>
diff --git a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp
index 8ecc8408a..bb6162b34 100644
--- a/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.cpp
@@ -46,10 +46,10 @@
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 
-#include <QtGui/QAction>
-#include <QtGui/QStyle>
-#include <QtGui/QLineEdit>
-#include <QtGui/QStyleOption>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QStyleOption>
 
 #include <QtCore/QEvent>
 #include <QtCore/QVariant>
diff --git a/src/designer/src/components/taskmenu/listwidget_taskmenu.h b/src/designer/src/components/taskmenu/listwidget_taskmenu.h
index caaac4d7c..9c1309ecb 100644
--- a/src/designer/src/components/taskmenu/listwidget_taskmenu.h
+++ b/src/designer/src/components/taskmenu/listwidget_taskmenu.h
@@ -42,7 +42,7 @@
 #ifndef LISTWIDGET_TASKMENU_H
 #define LISTWIDGET_TASKMENU_H
 
-#include <QtGui/QListWidget>
+#include <QtWidgets/QListWidget>
 #include <QtCore/QPointer>
 
 #include <qdesigner_taskmenu_p.h>
diff --git a/src/designer/src/components/taskmenu/listwidgeteditor.cpp b/src/designer/src/components/taskmenu/listwidgeteditor.cpp
index 656bcc163..1eeec4cce 100644
--- a/src/designer/src/components/taskmenu/listwidgeteditor.cpp
+++ b/src/designer/src/components/taskmenu/listwidgeteditor.cpp
@@ -46,9 +46,9 @@
 #include <QtDesigner/QDesignerSettingsInterface>
 #include <QtDesigner/QDesignerFormEditorInterface>
 
-#include <QtGui/QComboBox>
-#include <QtGui/QGroupBox>
-#include <QtGui/QDialogButtonBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QDialogButtonBox>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/taskmenu/listwidgeteditor.h b/src/designer/src/components/taskmenu/listwidgeteditor.h
index 30b851b8e..4709ccc54 100644
--- a/src/designer/src/components/taskmenu/listwidgeteditor.h
+++ b/src/designer/src/components/taskmenu/listwidgeteditor.h
@@ -45,7 +45,7 @@
 #include "itemlisteditor.h"
 #include <qdesigner_command_p.h>
 
-#include <QtGui/QWidget>
+#include <QtWidgets/QWidget>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/taskmenu/menutaskmenu.cpp b/src/designer/src/components/taskmenu/menutaskmenu.cpp
index 13b340a4d..6fc9a797a 100644
--- a/src/designer/src/components/taskmenu/menutaskmenu.cpp
+++ b/src/designer/src/components/taskmenu/menutaskmenu.cpp
@@ -43,7 +43,7 @@
 
 #include <promotiontaskmenu_p.h>
 
-#include <QtGui/QAction>
+#include <QtWidgets/QAction>
 #include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
index b77a090ec..33f1e91fd 100644
--- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.cpp
@@ -44,11 +44,11 @@
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 
-#include <QtGui/QTableWidget>
-#include <QtGui/QAction>
-#include <QtGui/QLineEdit>
-#include <QtGui/QStyle>
-#include <QtGui/QStyleOption>
+#include <QtWidgets/QTableWidget>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QStyleOption>
 
 #include <QtCore/QEvent>
 #include <QtCore/QVariant>
diff --git a/src/designer/src/components/taskmenu/tablewidget_taskmenu.h b/src/designer/src/components/taskmenu/tablewidget_taskmenu.h
index ad8b9243b..abc770a70 100644
--- a/src/designer/src/components/taskmenu/tablewidget_taskmenu.h
+++ b/src/designer/src/components/taskmenu/tablewidget_taskmenu.h
@@ -45,7 +45,7 @@
 #include <qdesigner_taskmenu_p.h>
 #include <extensionfactory_p.h>
 
-#include <QtGui/QTableWidget>
+#include <QtWidgets/QTableWidget>
 #include <QtCore/QPointer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/taskmenu/tablewidgeteditor.h b/src/designer/src/components/taskmenu/tablewidgeteditor.h
index f99bdc5b9..ed28ad78a 100644
--- a/src/designer/src/components/taskmenu/tablewidgeteditor.h
+++ b/src/designer/src/components/taskmenu/tablewidgeteditor.h
@@ -46,7 +46,7 @@
 
 #include "listwidgeteditor.h"
 
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/taskmenu/textedit_taskmenu.cpp b/src/designer/src/components/taskmenu/textedit_taskmenu.cpp
index a26656d30..ea4ab0cbb 100644
--- a/src/designer/src/components/taskmenu/textedit_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/textedit_taskmenu.cpp
@@ -43,7 +43,7 @@
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 
-#include <QtGui/QAction>
+#include <QtWidgets/QAction>
 #include <QtCore/QEvent>
 #include <QtCore/qdebug.h>
 
diff --git a/src/designer/src/components/taskmenu/textedit_taskmenu.h b/src/designer/src/components/taskmenu/textedit_taskmenu.h
index 7d1ce1927..6d3df266f 100644
--- a/src/designer/src/components/taskmenu/textedit_taskmenu.h
+++ b/src/designer/src/components/taskmenu/textedit_taskmenu.h
@@ -42,8 +42,8 @@
 #ifndef TEXTEDIT_TASKMENU_H
 #define TEXTEDIT_TASKMENU_H
 
-#include <QtGui/QTextEdit>
-#include <QtGui/QPlainTextEdit>
+#include <QtWidgets/QTextEdit>
+#include <QtWidgets/QPlainTextEdit>
 
 #include <qdesigner_taskmenu_p.h>
 #include <extensionfactory_p.h>
diff --git a/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp b/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp
index 4a8dc877f..56da353ef 100644
--- a/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/toolbar_taskmenu.cpp
@@ -47,8 +47,8 @@
 #include <promotiontaskmenu_p.h>
 #include <qdesigner_command_p.h>
 
-#include <QtGui/QAction>
-#include <QtGui/QUndoStack>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QUndoStack>
 
 #include <QtCore/QDebug>
 
diff --git a/src/designer/src/components/taskmenu/toolbar_taskmenu.h b/src/designer/src/components/taskmenu/toolbar_taskmenu.h
index f8abda29c..7da25e3ec 100644
--- a/src/designer/src/components/taskmenu/toolbar_taskmenu.h
+++ b/src/designer/src/components/taskmenu/toolbar_taskmenu.h
@@ -46,8 +46,8 @@
 
 #include <extensionfactory_p.h>
 
-#include <QtGui/QToolBar>
-#include <QtGui/QStatusBar>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QStatusBar>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp
index 1395e31b4..d79b61d7c 100644
--- a/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp
+++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.cpp
@@ -44,10 +44,10 @@
 
 #include <QtDesigner/QDesignerFormWindowInterface>
 
-#include <QtGui/QAction>
-#include <QtGui/QStyle>
-#include <QtGui/QLineEdit>
-#include <QtGui/QStyleOption>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QStyleOption>
 
 #include <QtCore/QEvent>
 #include <QtCore/QVariant>
diff --git a/src/designer/src/components/taskmenu/treewidget_taskmenu.h b/src/designer/src/components/taskmenu/treewidget_taskmenu.h
index ef7a63208..4c53abbf6 100644
--- a/src/designer/src/components/taskmenu/treewidget_taskmenu.h
+++ b/src/designer/src/components/taskmenu/treewidget_taskmenu.h
@@ -42,7 +42,7 @@
 #ifndef TREEWIDGET_TASKMENU_H
 #define TREEWIDGET_TASKMENU_H
 
-#include <QtGui/QTreeWidget>
+#include <QtWidgets/QTreeWidget>
 #include <QtCore/QPointer>
 
 #include <qdesigner_taskmenu_p.h>
diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.cpp b/src/designer/src/components/taskmenu/treewidgeteditor.cpp
index 50bbc0378..9c400519d 100644
--- a/src/designer/src/components/taskmenu/treewidgeteditor.cpp
+++ b/src/designer/src/components/taskmenu/treewidgeteditor.cpp
@@ -53,8 +53,8 @@
 
 #include <QtCore/QDir>
 #include <QtCore/QQueue>
-#include <QtGui/QHeaderView>
-#include <QtGui/QTreeWidgetItemIterator>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QTreeWidgetItemIterator>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/taskmenu/treewidgeteditor.h b/src/designer/src/components/taskmenu/treewidgeteditor.h
index 63a9da92b..ed9e65430 100644
--- a/src/designer/src/components/taskmenu/treewidgeteditor.h
+++ b/src/designer/src/components/taskmenu/treewidgeteditor.h
@@ -46,7 +46,7 @@
 
 #include "listwidgeteditor.h"
 
-#include <QtGui/QDialog>
+#include <QtWidgets/QDialog>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/widgetbox/widgetbox.cpp b/src/designer/src/components/widgetbox/widgetbox.cpp
index 799e57e52..b0beed0d8 100644
--- a/src/designer/src/components/widgetbox/widgetbox.cpp
+++ b/src/designer/src/components/widgetbox/widgetbox.cpp
@@ -51,10 +51,10 @@
 #include <filterwidget_p.h>
 
 #include <QtGui/QDropEvent>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QApplication>
-#include <QtGui/QToolBar>
-#include <QtGui/QIcon>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QToolBar>
+#include <QtWidgets/QIcon>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
index 82b3f3369..a6f43ebd8 100644
--- a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
+++ b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp
@@ -56,8 +56,8 @@
 #include <QtDesigner/private/ui4_p.h>
 #include <QtDesigner/private/formscriptrunner_p.h>
 
-#include <QtGui/QStyle>
-#include <QtGui/QApplication>
+#include <QtWidgets/QStyle>
+#include <QtWidgets/QApplication>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
index fd5d301ef..ab9968a6d 100644
--- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.cpp
@@ -46,11 +46,11 @@
 
 #include <QtXml/QDomDocument>
 
-#include <QtGui/QIcon>
-#include <QtGui/QListView>
-#include <QtGui/QLineEdit>
-#include <QtGui/QItemDelegate>
-#include <QtGui/QSortFilterProxyModel>
+#include <QtWidgets/QIcon>
+#include <QtWidgets/QListView>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QItemDelegate>
+#include <QtWidgets/QSortFilterProxyModel>
 
 #include <QtCore/QAbstractListModel>
 #include <QtCore/QList>
diff --git a/src/designer/src/components/widgetbox/widgetboxcategorylistview.h b/src/designer/src/components/widgetbox/widgetboxcategorylistview.h
index 9dc628a20..8d70d2055 100644
--- a/src/designer/src/components/widgetbox/widgetboxcategorylistview.h
+++ b/src/designer/src/components/widgetbox/widgetboxcategorylistview.h
@@ -44,7 +44,7 @@
 
 #include <QtDesigner/QDesignerWidgetBoxInterface>
 
-#include <QtGui/QListView>
+#include <QtWidgets/QListView>
 #include <QtCore/QList>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
index 85724d171..57f0d48c7 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.cpp
@@ -55,13 +55,13 @@
 #include <QtDesigner/QDesignerCustomWidgetInterface>
 #include <QtDesigner/QDesignerSettingsInterface>
 
-#include <QtGui/QHeaderView>
-#include <QtGui/QApplication>
-#include <QtGui/QTreeWidgetItem>
+#include <QtWidgets/QHeaderView>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QTreeWidgetItem>
 #include <QtGui/QContextMenuEvent>
-#include <QtGui/QAction>
-#include <QtGui/QActionGroup>
-#include <QtGui/QMenu>
+#include <QtWidgets/QAction>
+#include <QtWidgets/QActionGroup>
+#include <QtWidgets/QMenu>
 
 #include <QtCore/QFile>
 #include <QtCore/QTimer>
diff --git a/src/designer/src/components/widgetbox/widgetboxtreewidget.h b/src/designer/src/components/widgetbox/widgetboxtreewidget.h
index 934e52dfe..40e6b3c5c 100644
--- a/src/designer/src/components/widgetbox/widgetboxtreewidget.h
+++ b/src/designer/src/components/widgetbox/widgetboxtreewidget.h
@@ -44,8 +44,8 @@
 
 #include <qdesigner_widgetbox_p.h>
 
-#include <QtGui/QTreeWidget>
-#include <QtGui/QIcon>
+#include <QtWidgets/QTreeWidget>
+#include <QtWidgets/QIcon>
 #include <QtCore/QList>
 #include <QtCore/QHash>
 #include <QtCore/QXmlStreamReader> // Cannot forward declare them on Mac