diff options
Diffstat (limited to 'src/designer/src/components')
107 files changed, 311 insertions, 311 deletions
diff --git a/src/designer/src/components/buddyeditor/buddyeditor.cpp b/src/designer/src/components/buddyeditor/buddyeditor.cpp index 34e1681ef..da20a1409 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 17b93e1b5..18372cd7b 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 3779789fa..1464f9962 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 c0a51dede..017414521 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 9eba71eef..41044353a 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 43e2700fe..06cac7279 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 b7030689d..9202f945f 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 e35f30077..3c84aa2be 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 6d665dd79..b361267c6 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 10e3c72d8..bfdcc047e 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 10f4509df..6254748e0 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 792496c08..4aa58a6dd 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 e50072aac..477766ebf 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 1abf7cd71..e9600da27 100644 --- a/src/designer/src/components/formeditor/formwindow.cpp +++ b/src/designer/src/components/formeditor/formwindow.cpp @@ -87,22 +87,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 5b8f86b0f..8f16f3830 100644 --- a/src/designer/src/components/formeditor/formwindow_dnditem.cpp +++ b/src/designer/src/components/formeditor/formwindow_dnditem.cpp @@ -48,7 +48,7 @@ #include <QtDesigner/QDesignerFormEditorInterface> -#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 ac20e8ac1..b9646a8ff 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 56f9743bb..67ab06aa0 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 e58fdaf66..456151605 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 04d5f8ca5..87a1391f1 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 f5c6f53e3..0fef04e6a 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 e04c55d5a..7fe73b742 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 59cf809c8..82792d42b 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 34e51b178..72e709e8a 100644 --- a/src/designer/src/components/formeditor/layout_propertysheet.cpp +++ b/src/designer/src/components/formeditor/layout_propertysheet.cpp @@ -50,7 +50,7 @@ #include <qlayout_widget_p.h> #include <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 72a59f876..fc5c980db 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 64699eaa5..685d4c3c6 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 607212c41..e3f25341d 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 9ba65512b..33da10170 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 62957d30b..959a50f6d 100644 --- a/src/designer/src/components/formeditor/qdesigner_resource.cpp +++ b/src/designer/src/components/formeditor/qdesigner_resource.cpp @@ -85,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 56bb04f9e..2c64d1866 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 49c49fa8e..5c67f3601 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 d2664b418..07fc83acf 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 6151c97ff..d22bbf72c 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 670d1d062..8e3dc6147 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 453e67109..20e5a4098 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 d88bcf2f6..bbccf7a0b 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 43a1e5f62..32c1ad18e 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 ca7de1c56..fc5bcdea9 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 f595044f4..199b5b823 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 6ea37c4d4..965ad6254 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 ea1c29b3f..46ccfab5b 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 456967f59..1c4eb3929 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 501859130..d01049488 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 7b033641c..2a394dc52 100644 --- a/src/designer/src/components/lib/lib.pro +++ b/src/designer/src/components/lib/lib.pro @@ -8,7 +8,7 @@ QT += gui-private win32|mac: CONFIG += debug_and_release DESTDIR = $$QT_BUILD_TREE/lib !wince*:DLLDESTDIR = $$QT.designer.bins -QT += designer-private uilib-private +QT += widgets widgets-private designer-private uilib-private # QtDesignerComponents uses DEFINES += QT_STATICPLUGIN diff --git a/src/designer/src/components/objectinspector/objectinspector.cpp b/src/designer/src/components/objectinspector/objectinspector.cpp index 8bcd49e15..85f2cc9a3 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 20f0ff18f..3386e5b55 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 499a99afb..56f8fb90c 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 5c008e2c4..998c1ddea 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 d96eba90b..09894b1f1 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 4f4bb3c17..9ca2f7939 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 32277a0ba..692e9ab75 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 7c3966a43..9e3554123 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 c3047591d..eac1e5dca 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 9caed1965..b2c31d2f6 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 567605a19..fc7a93d7f 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 5e426c9c7..c20c35e26 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 567fd7f7a..e78890ff4 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 31ef2dae7..c88380fab 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 cd55eff2e..243fdf81f 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 07bd291f5..2ab784ce5 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 64be11345..cefe035d3 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 dd81483d5..237d2d618 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 673864032..77b9fbe96 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 7e1f67f08..d03d299d2 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 a56acc37d..559e9bc93 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/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 0d0683554..c8568ecc5 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 diff --git a/src/designer/src/components/signalsloteditor/signalsloteditorwindow.h b/src/designer/src/components/signalsloteditor/signalsloteditorwindow.h index 179b6c5f4..c96d66ee4 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 2932adca0..9946d1889 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 3eacd3739..2499baded 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 49581e5f6..99486fa68 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 2914cb58a..120c5f3b6 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 953996b8c..10ab79705 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 e7350ca87..2a34dcdb0 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 2b9b1fe19..3c0d8d9dc 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 c1eee4837..b8631212b 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 9b6265f27..07a218416 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 1fae0f8ba..5d219c0ec 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 d30d8b1b6..16fd81683 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 47554b3a8..d6b05adab 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 a04246de5..0ae2c6603 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 ffacad293..ae9f684d0 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 5f0acb209..4ff039fe5 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 7f3549128..007682dbf 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 10d5d7c54..52a5f54a2 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 c00c493b1..cc138e63d 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 239590bb8..43328faab 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 bd8f6b9f8..90b1860a6 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 e7e527a38..5221065b7 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 e1259f1c0..36fab5c2b 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 12d0591f2..0938b24a4 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 cbcecb122..423040d45 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 e98714f62..dff119948 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 cbf71fea6..ea5f467ef 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 1d5ad1f57..3a5ee277e 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 510a32f5f..5721267fd 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 1429f315e..489cf2025 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 8db233ca2..2ab2764f0 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 6818e2607..2cea0e2fb 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 96210dcdb..c9734a71d 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 e5a9e9073..6b7ecd6d0 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 c26bd1808..dc1973be8 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 f502bf3e4..1207aef10 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 c9b0d040a..41ae82702 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 c122c8411..5964de8c3 100644 --- a/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp +++ b/src/designer/src/components/widgetbox/widgetbox_dnditem.cpp @@ -55,8 +55,8 @@ #include <QtDesigner/QDesignerFormEditorInterface> #include <QtDesigner/QDesignerFormWindowManagerInterface> -#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 d2a0d43c0..840ed2621 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 5e6df1149..896dd3cb3 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 cbb62445f..6b84aa354 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 db4f7cdb1..0e22c2ad7 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 |