diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-05-24 16:10:49 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-05-24 16:17:28 +0200 |
| commit | 5a818d1e1e7f63c30ea00753397f5c9831c6c0d6 (patch) | |
| tree | 698f171c92c0a6fd7539b1cd87a1f005cc224de6 | |
| parent | e7395b807119843d6ce8c27012ac5dd1369d393a (diff) | |
QtTools: Widget library split.
423 files changed, 1244 insertions, 1188 deletions
diff --git a/demos/arthurplugin/plugin.cpp b/demos/arthurplugin/plugin.cpp index 336e88da6..a2b07cd12 100644 --- a/demos/arthurplugin/plugin.cpp +++ b/demos/arthurplugin/plugin.cpp @@ -43,8 +43,8 @@ #include <QtDesigner/QDesignerCustomWidgetInterface> #include <QtCore/qplugin.h> -#include <QtGui/QIcon> -#include <QtGui/QPixmap> +#include <QtWidgets/QIcon> +#include <QtWidgets/QPixmap> #include "xform.h" #include "pathdeform.h" diff --git a/examples/designer/calculatorbuilder/calculatorbuilder.pro b/examples/designer/calculatorbuilder/calculatorbuilder.pro index bf4fb1d13..1e0a35e42 100644 --- a/examples/designer/calculatorbuilder/calculatorbuilder.pro +++ b/examples/designer/calculatorbuilder/calculatorbuilder.pro @@ -5,6 +5,7 @@ HEADERS = calculatorform.h RESOURCES = calculatorbuilder.qrc SOURCES = calculatorform.cpp \ main.cpp +QT += widgets #! [0] # install diff --git a/examples/designer/calculatorbuilder/calculatorform.cpp b/examples/designer/calculatorbuilder/calculatorform.cpp index e14efa497..cc559e54a 100644 --- a/examples/designer/calculatorbuilder/calculatorform.cpp +++ b/examples/designer/calculatorbuilder/calculatorform.cpp @@ -41,7 +41,9 @@ //! [0] #include <QtUiTools> //! [0] -#include <QtGui> +#include <QSpinBox> +#include <QLabel> +#include <QVBoxLayout> #include "calculatorform.h" diff --git a/examples/designer/calculatorform/calculatorform.pro b/examples/designer/calculatorform/calculatorform.pro index 757d313c7..b2a7427c6 100644 --- a/examples/designer/calculatorform/calculatorform.pro +++ b/examples/designer/calculatorform/calculatorform.pro @@ -5,6 +5,7 @@ FORMS = calculatorform.ui #! [1] SOURCES = calculatorform.cpp \ main.cpp +QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/calculatorform diff --git a/examples/designer/containerextension/containerextension.pro b/examples/designer/containerextension/containerextension.pro index a7bc02f4c..fc7a1ff81 100644 --- a/examples/designer/containerextension/containerextension.pro +++ b/examples/designer/containerextension/containerextension.pro @@ -4,6 +4,7 @@ TEMPLATE = lib TARGET = $$qtLibraryTarget($$TARGET) #! [1] CONFIG += designer plugin +QT += widgets #! [1] DESTDIR = $$QT.designer.plugins/designer diff --git a/examples/designer/containerextension/multipagewidget.cpp b/examples/designer/containerextension/multipagewidget.cpp index 5b44f36d2..ff2418b0c 100644 --- a/examples/designer/containerextension/multipagewidget.cpp +++ b/examples/designer/containerextension/multipagewidget.cpp @@ -38,7 +38,9 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QComboBox> +#include <QVBoxLayout> +#include <QStackedWidget> #include "multipagewidget.h" diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.pro b/examples/designer/customwidgetplugin/customwidgetplugin.pro index 3af8cc133..e70fe6575 100644 --- a/examples/designer/customwidgetplugin/customwidgetplugin.pro +++ b/examples/designer/customwidgetplugin/customwidgetplugin.pro @@ -1,5 +1,6 @@ #! [0] #! [1] CONFIG += designer plugin +QT += widgets #! [0] TARGET = $$qtLibraryTarget($$TARGET) #! [2] diff --git a/examples/designer/taskmenuextension/taskmenuextension.pro b/examples/designer/taskmenuextension/taskmenuextension.pro index 4e5df7d1b..aaf3ab89c 100644 --- a/examples/designer/taskmenuextension/taskmenuextension.pro +++ b/examples/designer/taskmenuextension/taskmenuextension.pro @@ -4,6 +4,7 @@ TEMPLATE = lib TARGET = $$qtLibraryTarget($$TARGET) #! [1] CONFIG += designer plugin +QT += widgets #! [1] DESTDIR = $$QT.designer.plugins/designer diff --git a/examples/designer/taskmenuextension/tictactoedialog.cpp b/examples/designer/taskmenuextension/tictactoedialog.cpp index 5af3c6f30..5b6a8c4a3 100644 --- a/examples/designer/taskmenuextension/tictactoedialog.cpp +++ b/examples/designer/taskmenuextension/tictactoedialog.cpp @@ -38,7 +38,9 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QDialogButtonBox> +#include <QPushButton> +#include <QVBoxLayout> #include <QtDesigner> #include "tictactoe.h" diff --git a/examples/designer/worldtimeclockbuilder/main.cpp b/examples/designer/worldtimeclockbuilder/main.cpp index 680394190..e54a95a99 100644 --- a/examples/designer/worldtimeclockbuilder/main.cpp +++ b/examples/designer/worldtimeclockbuilder/main.cpp @@ -41,8 +41,8 @@ //! [0] #include <QtUiTools> //! [0] -#include <QtGui> - +#include <QApplication> +#include <QWidget> //! [1] int main(int argc, char *argv[]) { diff --git a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro index 6d1164d55..005e35043 100644 --- a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro +++ b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro @@ -1,5 +1,6 @@ #! [0] CONFIG += uitools +QT += widgets SOURCES = main.cpp RESOURCES = worldtimeclockbuilder.qrc #! [0] diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro index e394a3dc8..8caad5e92 100644 --- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro +++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro @@ -1,5 +1,6 @@ #! [0] CONFIG += designer plugin +QT += widgets #! [0] TARGET = $$qtLibraryTarget($$TARGET) #! [1] diff --git a/examples/help/contextsensitivehelp/contextsensitivehelp.pro b/examples/help/contextsensitivehelp/contextsensitivehelp.pro index 8941dcbb1..9fa1a2a66 100644 --- a/examples/help/contextsensitivehelp/contextsensitivehelp.pro +++ b/examples/help/contextsensitivehelp/contextsensitivehelp.pro @@ -1,7 +1,7 @@ TEMPLATE = app CONFIG += help - +QT += widgets SOURCES += main.cpp \ wateringconfigdialog.cpp \ helpbrowser.cpp diff --git a/examples/help/contextsensitivehelp/helpbrowser.cpp b/examples/help/contextsensitivehelp/helpbrowser.cpp index d37a72f3b..2182cf57b 100644 --- a/examples/help/contextsensitivehelp/helpbrowser.cpp +++ b/examples/help/contextsensitivehelp/helpbrowser.cpp @@ -39,7 +39,7 @@ ****************************************************************************/ #include <QtCore/QLibraryInfo> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtHelp/QHelpEngineCore> #include "helpbrowser.h" diff --git a/examples/help/contextsensitivehelp/helpbrowser.h b/examples/help/contextsensitivehelp/helpbrowser.h index 684ed6827..245772ac9 100644 --- a/examples/help/contextsensitivehelp/helpbrowser.h +++ b/examples/help/contextsensitivehelp/helpbrowser.h @@ -41,7 +41,7 @@ #ifndef HELPBROWSER_H #define HELPBROWSER_H -#include <QtGui/QTextBrowser> +#include <QtWidgets/QTextBrowser> QT_BEGIN_NAMESPACE class QHelpEngineCore; diff --git a/examples/help/contextsensitivehelp/main.cpp b/examples/help/contextsensitivehelp/main.cpp index ca15d9fb6..d635db298 100644 --- a/examples/help/contextsensitivehelp/main.cpp +++ b/examples/help/contextsensitivehelp/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "wateringconfigdialog.h" diff --git a/examples/help/contextsensitivehelp/wateringconfigdialog.h b/examples/help/contextsensitivehelp/wateringconfigdialog.h index d1fd98643..835c46ec0 100644 --- a/examples/help/contextsensitivehelp/wateringconfigdialog.h +++ b/examples/help/contextsensitivehelp/wateringconfigdialog.h @@ -41,7 +41,7 @@ #ifndef WATERINGCONFIGDIALOG_H #define WATERINGCONFIGDIALOG_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include "ui_wateringconfigdialog.h" class WateringConfigDialog : public QDialog diff --git a/examples/help/remotecontrol/main.cpp b/examples/help/remotecontrol/main.cpp index ad561ce4f..583c2e494 100644 --- a/examples/help/remotecontrol/main.cpp +++ b/examples/help/remotecontrol/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "remotecontrol.h" int main(int argc, char *argv[]) diff --git a/examples/help/remotecontrol/remotecontrol.cpp b/examples/help/remotecontrol/remotecontrol.cpp index 45d3fde82..d666489fb 100644 --- a/examples/help/remotecontrol/remotecontrol.cpp +++ b/examples/help/remotecontrol/remotecontrol.cpp @@ -43,7 +43,7 @@ #include <QtCore/QTextStream> #include <QtCore/QLibraryInfo> -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> #include "remotecontrol.h" diff --git a/examples/help/remotecontrol/remotecontrol.h b/examples/help/remotecontrol/remotecontrol.h index e440add3f..16bd3f33c 100644 --- a/examples/help/remotecontrol/remotecontrol.h +++ b/examples/help/remotecontrol/remotecontrol.h @@ -41,7 +41,7 @@ #ifndef REMOTECONTROL_H #define REMOTECONTROL_H -#include <QtGui/QMainWindow> +#include <QtWidgets/QMainWindow> #include "ui_remotecontrol.h" QT_BEGIN_NAMESPACE diff --git a/examples/help/remotecontrol/remotecontrol.pro b/examples/help/remotecontrol/remotecontrol.pro index 2212db040..79fb7c1be 100644 --- a/examples/help/remotecontrol/remotecontrol.pro +++ b/examples/help/remotecontrol/remotecontrol.pro @@ -1,4 +1,5 @@ TEMPLATE = app +QT += widgets HEADERS += remotecontrol.h SOURCES += main.cpp \ diff --git a/examples/help/simpletextviewer/assistant.cpp b/examples/help/simpletextviewer/assistant.cpp index 2223b4bbf..392f2260e 100644 --- a/examples/help/simpletextviewer/assistant.cpp +++ b/examples/help/simpletextviewer/assistant.cpp @@ -43,7 +43,7 @@ #include <QtCore/QLibraryInfo> #include <QtCore/QProcess> -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> #include "assistant.h" diff --git a/examples/help/simpletextviewer/findfiledialog.cpp b/examples/help/simpletextviewer/findfiledialog.cpp index 086be965d..bbaf038d7 100644 --- a/examples/help/simpletextviewer/findfiledialog.cpp +++ b/examples/help/simpletextviewer/findfiledialog.cpp @@ -39,15 +39,15 @@ ****************************************************************************/ #include <QtCore/QDir> -#include <QtGui/QLayout> -#include <QtGui/QComboBox> -#include <QtGui/QTreeWidget> -#include <QtGui/QLayout> -#include <QtGui/QFileDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QToolButton> -#include <QtGui/QPushButton> -#include <QtGui/QLabel> +#include <QtWidgets/QLayout> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QTreeWidget> +#include <QtWidgets/QLayout> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QLabel> #include "findfiledialog.h" #include "assistant.h" diff --git a/examples/help/simpletextviewer/findfiledialog.h b/examples/help/simpletextviewer/findfiledialog.h index 71abd4aac..9df00edbd 100644 --- a/examples/help/simpletextviewer/findfiledialog.h +++ b/examples/help/simpletextviewer/findfiledialog.h @@ -41,7 +41,7 @@ #ifndef FINDFILEDIALOG_H #define FINDFILEDIALOG_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE class QComboBox; diff --git a/examples/help/simpletextviewer/main.cpp b/examples/help/simpletextviewer/main.cpp index 4c8aab9c8..8780e0d3a 100644 --- a/examples/help/simpletextviewer/main.cpp +++ b/examples/help/simpletextviewer/main.cpp @@ -38,7 +38,7 @@ ** ****************************************************************************/ -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "mainwindow.h" diff --git a/examples/help/simpletextviewer/mainwindow.cpp b/examples/help/simpletextviewer/mainwindow.cpp index 61fbdf3cb..c84c78c2f 100644 --- a/examples/help/simpletextviewer/mainwindow.cpp +++ b/examples/help/simpletextviewer/mainwindow.cpp @@ -39,11 +39,11 @@ ****************************************************************************/ #include <QtCore/QLibraryInfo> -#include <QtGui/QApplication> -#include <QtGui/QAction> -#include <QtGui/QMenu> -#include <QtGui/QMenuBar> -#include <QtGui/QMessageBox> +#include <QtWidgets/QApplication> +#include <QtWidgets/QAction> +#include <QtWidgets/QMenu> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QMessageBox> #include "mainwindow.h" #include "findfiledialog.h" diff --git a/examples/help/simpletextviewer/mainwindow.h b/examples/help/simpletextviewer/mainwindow.h index 4fab382f2..8c2f84123 100644 --- a/examples/help/simpletextviewer/mainwindow.h +++ b/examples/help/simpletextviewer/mainwindow.h @@ -41,7 +41,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QtGui/QMainWindow> +#include <QtWidgets/QMainWindow> class Assistant; class TextEdit; diff --git a/examples/help/simpletextviewer/simpletextviewer.pro b/examples/help/simpletextviewer/simpletextviewer.pro index b51c141c0..5ef14c44a 100644 --- a/examples/help/simpletextviewer/simpletextviewer.pro +++ b/examples/help/simpletextviewer/simpletextviewer.pro @@ -8,6 +8,8 @@ SOURCES = main.cpp \ assistant.cpp \ textedit.cpp +QT += widgets + # install target.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/simpletextviewer sources.files = $$SOURCES $$HEADERS $$RESOURCES documentation *.pro diff --git a/examples/help/simpletextviewer/textedit.h b/examples/help/simpletextviewer/textedit.h index b9ecabd1d..6222ac189 100644 --- a/examples/help/simpletextviewer/textedit.h +++ b/examples/help/simpletextviewer/textedit.h @@ -42,7 +42,7 @@ #define TEXTEDIT_H #include <QtCore/QUrl> -#include <QtGui/QTextEdit> +#include <QtWidgets/QTextEdit> class TextEdit : public QTextEdit { diff --git a/src/assistant/lib/lib.pro b/src/assistant/lib/lib.pro index f524aaa61..280c77915 100644 --- a/src/assistant/lib/lib.pro +++ b/src/assistant/lib/lib.pro @@ -1,6 +1,7 @@ load(qt_module) -QT += sql \ +QT += widgets \ + sql \ xml \ network \ core-private diff --git a/src/assistant/lib/qhelpcontentwidget.cpp b/src/assistant/lib/qhelpcontentwidget.cpp index 988a909e0..7e3cb93d1 100644 --- a/src/assistant/lib/qhelpcontentwidget.cpp +++ b/src/assistant/lib/qhelpcontentwidget.cpp @@ -48,7 +48,7 @@ #include <QtCore/QStack> #include <QtCore/QThread> #include <QtCore/QMutex> -#include <QtGui/QHeaderView> +#include <QtWidgets/QHeaderView> QT_BEGIN_NAMESPACE diff --git a/src/assistant/lib/qhelpcontentwidget.h b/src/assistant/lib/qhelpcontentwidget.h index 0e7567e20..ab7d80a43 100644 --- a/src/assistant/lib/qhelpcontentwidget.h +++ b/src/assistant/lib/qhelpcontentwidget.h @@ -46,7 +46,7 @@ #include <QtCore/QQueue> #include <QtCore/QString> -#include <QtGui/QTreeView> +#include <QtWidgets/QTreeView> QT_BEGIN_HEADER diff --git a/src/assistant/lib/qhelpengine.cpp b/src/assistant/lib/qhelpengine.cpp index f11b52a9c..007cc84a9 100644 --- a/src/assistant/lib/qhelpengine.cpp +++ b/src/assistant/lib/qhelpengine.cpp @@ -51,7 +51,7 @@ #include <QtCore/QFile> #include <QtCore/QLibrary> #include <QtCore/QPluginLoader> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtSql/QSqlQuery> QT_BEGIN_NAMESPACE diff --git a/src/assistant/lib/qhelpenginecore.cpp b/src/assistant/lib/qhelpenginecore.cpp index 1fd22428d..178e11ee6 100644 --- a/src/assistant/lib/qhelpenginecore.cpp +++ b/src/assistant/lib/qhelpenginecore.cpp @@ -50,7 +50,7 @@ #include <QtCore/QPluginLoader> #include <QtCore/QFileInfo> #include <QtCore/QThread> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtSql/QSqlQuery> QT_BEGIN_NAMESPACE diff --git a/src/assistant/lib/qhelpindexwidget.cpp b/src/assistant/lib/qhelpindexwidget.cpp index 82d402442..1b34ca0aa 100644 --- a/src/assistant/lib/qhelpindexwidget.cpp +++ b/src/assistant/lib/qhelpindexwidget.cpp @@ -46,8 +46,8 @@ #include <QtCore/QThread> #include <QtCore/QMutex> -#include <QtGui/QListView> -#include <QtGui/QHeaderView> +#include <QtWidgets/QListView> +#include <QtWidgets/QHeaderView> QT_BEGIN_NAMESPACE diff --git a/src/assistant/lib/qhelpindexwidget.h b/src/assistant/lib/qhelpindexwidget.h index 0c4d307aa..41e66f647 100644 --- a/src/assistant/lib/qhelpindexwidget.h +++ b/src/assistant/lib/qhelpindexwidget.h @@ -45,8 +45,8 @@ #include <QtHelp/qhelp_global.h> #include <QtCore/QUrl> -#include <QtGui/QStringListModel> -#include <QtGui/QListView> +#include <QtWidgets/QStringListModel> +#include <QtWidgets/QListView> QT_BEGIN_HEADER diff --git a/src/assistant/lib/qhelpsearchquerywidget.cpp b/src/assistant/lib/qhelpsearchquerywidget.cpp index e6a789a40..55974ada5 100644 --- a/src/assistant/lib/qhelpsearchquerywidget.cpp +++ b/src/assistant/lib/qhelpsearchquerywidget.cpp @@ -46,13 +46,13 @@ #include <QtCore/QStringList> #include <QtCore/QtGlobal> -#include <QtGui/QCompleter> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QLineEdit> +#include <QtWidgets/QCompleter> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLayout> +#include <QtWidgets/QLineEdit> #include <QtGui/QFocusEvent> -#include <QtGui/QPushButton> -#include <QtGui/QToolButton> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QToolButton> QT_BEGIN_NAMESPACE diff --git a/src/assistant/lib/qhelpsearchquerywidget.h b/src/assistant/lib/qhelpsearchquerywidget.h index e9fb61ceb..e438df0b5 100644 --- a/src/assistant/lib/qhelpsearchquerywidget.h +++ b/src/assistant/lib/qhelpsearchquerywidget.h @@ -49,7 +49,7 @@ #include <QtCore/QString> #include <QtCore/QStringList> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER diff --git a/src/assistant/lib/qhelpsearchresultwidget.cpp b/src/assistant/lib/qhelpsearchresultwidget.cpp index 2b5845062..964185b5e 100644 --- a/src/assistant/lib/qhelpsearchresultwidget.cpp +++ b/src/assistant/lib/qhelpsearchresultwidget.cpp @@ -46,15 +46,15 @@ #include <QtCore/QPointer> #include <QtCore/QStringList> -#include <QtGui/QLabel> -#include <QtGui/QLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLayout> #include <QtGui/QMouseEvent> -#include <QtGui/QHeaderView> -#include <QtGui/QSpacerItem> -#include <QtGui/QToolButton> -#include <QtGui/QTreeWidget> -#include <QtGui/QTextBrowser> -#include <QtGui/QTreeWidgetItem> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QSpacerItem> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QTreeWidget> +#include <QtWidgets/QTextBrowser> +#include <QtWidgets/QTreeWidgetItem> QT_BEGIN_NAMESPACE diff --git a/src/assistant/lib/qhelpsearchresultwidget.h b/src/assistant/lib/qhelpsearchresultwidget.h index cd6ac1051..f9300e979 100644 --- a/src/assistant/lib/qhelpsearchresultwidget.h +++ b/src/assistant/lib/qhelpsearchresultwidget.h @@ -49,7 +49,7 @@ #include <QtCore/QPoint> #include <QtCore/QObject> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER diff --git a/src/assistant/tools/assistant/aboutdialog.cpp b/src/assistant/tools/assistant/aboutdialog.cpp index b4c390e90..d306812bb 100644 --- a/src/assistant/tools/assistant/aboutdialog.cpp +++ b/src/assistant/tools/assistant/aboutdialog.cpp @@ -46,12 +46,12 @@ #include <QtCore/QBuffer> -#include <QtGui/QLabel> -#include <QtGui/QPushButton> -#include <QtGui/QLayout> -#include <QtGui/QApplication> -#include <QtGui/QDesktopWidget> -#include <QtGui/QMessageBox> +#include <QtWidgets/QLabel> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QLayout> +#include <QtWidgets/QApplication> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QMessageBox> #include <QtGui/QDesktopServices> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/aboutdialog.h b/src/assistant/tools/assistant/aboutdialog.h index 292312d05..70b315714 100644 --- a/src/assistant/tools/assistant/aboutdialog.h +++ b/src/assistant/tools/assistant/aboutdialog.h @@ -42,8 +42,8 @@ #ifndef ABOUTDIALOG_H #define ABOUTDIALOG_H -#include <QtGui/QTextBrowser> -#include <QtGui/QDialog> +#include <QtWidgets/QTextBrowser> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/assistant.pro b/src/assistant/tools/assistant/assistant.pro index eeee0ad46..dc8928bad 100644 --- a/src/assistant/tools/assistant/assistant.pro +++ b/src/assistant/tools/assistant/assistant.pro @@ -10,7 +10,7 @@ TARGET = assistant CONFIG += qt \ warn_on \ help -QT += network help +QT += widgets network help PROJECTNAME = Assistant DESTDIR = $$QT.designer.bins target.path = $$[QT_INSTALL_BINS] diff --git a/src/assistant/tools/assistant/bookmarkdialog.cpp b/src/assistant/tools/assistant/bookmarkdialog.cpp index d2f88f968..e3cd9ac60 100644 --- a/src/assistant/tools/assistant/bookmarkdialog.cpp +++ b/src/assistant/tools/assistant/bookmarkdialog.cpp @@ -46,7 +46,7 @@ #include "tracer.h" #include <QtGui/QKeyEvent> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/bookmarkfiltermodel.h b/src/assistant/tools/assistant/bookmarkfiltermodel.h index 65ed12f20..310e27512 100644 --- a/src/assistant/tools/assistant/bookmarkfiltermodel.h +++ b/src/assistant/tools/assistant/bookmarkfiltermodel.h @@ -43,8 +43,8 @@ #include <QtCore/QPersistentModelIndex> -#include <QtGui/QAbstractProxyModel> -#include <QtGui/QSortFilterProxyModel> +#include <QtWidgets/QAbstractProxyModel> +#include <QtWidgets/QSortFilterProxyModel> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/bookmarkmanager.cpp b/src/assistant/tools/assistant/bookmarkmanager.cpp index 87331463b..29d8567a7 100644 --- a/src/assistant/tools/assistant/bookmarkmanager.cpp +++ b/src/assistant/tools/assistant/bookmarkmanager.cpp @@ -49,11 +49,11 @@ #include "centralwidget.h" #include "helpenginewrapper.h" -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> #include <QtGui/QKeyEvent> -#include <QtGui/QMessageBox> -#include <QtGui/QSortFilterProxyModel> -#include <QtGui/QToolBar> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QSortFilterProxyModel> +#include <QtWidgets/QToolBar> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/bookmarkmanager.h b/src/assistant/tools/assistant/bookmarkmanager.h index f5823a7fa..0b6275af9 100644 --- a/src/assistant/tools/assistant/bookmarkmanager.h +++ b/src/assistant/tools/assistant/bookmarkmanager.h @@ -42,7 +42,7 @@ #define BOOKMARKMANAGER_H #include <QtCore/QMutex> -#include <QtGui/QTreeView> +#include <QtWidgets/QTreeView> #include "ui_bookmarkwidget.h" diff --git a/src/assistant/tools/assistant/bookmarkmanagerwidget.cpp b/src/assistant/tools/assistant/bookmarkmanagerwidget.cpp index dd410d3a2..87a1f65be 100644 --- a/src/assistant/tools/assistant/bookmarkmanagerwidget.cpp +++ b/src/assistant/tools/assistant/bookmarkmanagerwidget.cpp @@ -49,10 +49,10 @@ #include <QtCore/QUrl> #include <QtGui/QCloseEvent> -#include <QtGui/QFileDialog> +#include <QtWidgets/QFileDialog> #include <QtGui/QKeySequence> -#include <QtGui/QMessageBox> -#include <QtGui/QShortcut> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QShortcut> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/bookmarkmanagerwidget.h b/src/assistant/tools/assistant/bookmarkmanagerwidget.h index a0dec72a6..5c461b937 100644 --- a/src/assistant/tools/assistant/bookmarkmanagerwidget.h +++ b/src/assistant/tools/assistant/bookmarkmanagerwidget.h @@ -45,7 +45,7 @@ #include <QtCore/QPersistentModelIndex> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/bookmarkmodel.cpp b/src/assistant/tools/assistant/bookmarkmodel.cpp index 5a02aa03d..d27731642 100644 --- a/src/assistant/tools/assistant/bookmarkmodel.cpp +++ b/src/assistant/tools/assistant/bookmarkmodel.cpp @@ -44,9 +44,9 @@ #include <QtCore/QMimeData> #include <QtCore/QStack> -#include <QtGui/QApplication> -#include <QtGui/QStyle> -#include <QtGui/QTreeView> +#include <QtWidgets/QApplication> +#include <QtWidgets/QStyle> +#include <QtWidgets/QTreeView> const quint32 VERSION = 0xe53798; const QLatin1String MIMETYPE("application/bookmarks.assistant"); diff --git a/src/assistant/tools/assistant/bookmarkmodel.h b/src/assistant/tools/assistant/bookmarkmodel.h index 33c9e981d..e23e9c41a 100644 --- a/src/assistant/tools/assistant/bookmarkmodel.h +++ b/src/assistant/tools/assistant/bookmarkmodel.h @@ -43,7 +43,7 @@ #include <QtCore/QAbstractItemModel> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/centralwidget.cpp b/src/assistant/tools/assistant/centralwidget.cpp index c8c454f60..da27f033d 100644 --- a/src/assistant/tools/assistant/centralwidget.cpp +++ b/src/assistant/tools/assistant/centralwidget.cpp @@ -51,14 +51,14 @@ #include <QtCore/QTimer> #include <QtGui/QKeyEvent> -#include <QtGui/QMenu> -#include <QtGui/QPageSetupDialog> -#include <QtGui/QPrintDialog> -#include <QtGui/QPrintPreviewDialog> +#include <QtWidgets/QMenu> +#include <QtWidgets/QPageSetupDialog> +#include <QtWidgets/QPrintDialog> +#include <QtWidgets/QPrintPreviewDialog> #include <QtGui/QPrinter> -#include <QtGui/QStackedWidget> -#include <QtGui/QTextBrowser> -#include <QtGui/QVBoxLayout> +#include <QtWidgets/QStackedWidget> +#include <QtWidgets/QTextBrowser> +#include <QtWidgets/QVBoxLayout> #include <QtHelp/QHelpSearchEngine> diff --git a/src/assistant/tools/assistant/centralwidget.h b/src/assistant/tools/assistant/centralwidget.h index 2645fa8df..cdf132a1f 100644 --- a/src/assistant/tools/assistant/centralwidget.h +++ b/src/assistant/tools/assistant/centralwidget.h @@ -44,8 +44,8 @@ #include <QtCore/QUrl> -#include <QtGui/QTabBar> -#include <QtGui/QWidget> +#include <QtWidgets/QTabBar> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/cmdlineparser.cpp b/src/assistant/tools/assistant/cmdlineparser.cpp index 6a239d305..bc498a9d3 100644 --- a/src/assistant/tools/assistant/cmdlineparser.cpp +++ b/src/assistant/tools/assistant/cmdlineparser.cpp @@ -42,7 +42,7 @@ #include <QtCore/QFileInfo> #include <QtCore/QStringBuilder> -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> #include "cmdlineparser.h" diff --git a/src/assistant/tools/assistant/contentwindow.cpp b/src/assistant/tools/assistant/contentwindow.cpp index fbf70aa1f..3fb1555e0 100644 --- a/src/assistant/tools/assistant/contentwindow.cpp +++ b/src/assistant/tools/assistant/contentwindow.cpp @@ -47,9 +47,9 @@ #include "openpagesmanager.h" #include "tracer.h" -#include <QtGui/QLayout> +#include <QtWidgets/QLayout> #include <QtGui/QFocusEvent> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> #include <QtHelp/QHelpContentWidget> diff --git a/src/assistant/tools/assistant/contentwindow.h b/src/assistant/tools/assistant/contentwindow.h index b8bdc8fee..9c7f4c24f 100644 --- a/src/assistant/tools/assistant/contentwindow.h +++ b/src/assistant/tools/assistant/contentwindow.h @@ -44,7 +44,7 @@ #include <QtCore/QUrl> #include <QtCore/QModelIndex> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/filternamedialog.cpp b/src/assistant/tools/assistant/filternamedialog.cpp index 1d9563d2f..d1424ee2a 100644 --- a/src/assistant/tools/assistant/filternamedialog.cpp +++ b/src/assistant/tools/assistant/filternamedialog.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "tracer.h" -#include <QtGui/QPushButton> +#include <QtWidgets/QPushButton> #include "filternamedialog.h" diff --git a/src/assistant/tools/assistant/filternamedialog.h b/src/assistant/tools/assistant/filternamedialog.h index 35575421e..bf65a7e15 100644 --- a/src/assistant/tools/assistant/filternamedialog.h +++ b/src/assistant/tools/assistant/filternamedialog.h @@ -42,7 +42,7 @@ #ifndef FILTERNAMEDIALOG_H #define FILTERNAMEDIALOG_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include "ui_filternamedialog.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/findwidget.cpp b/src/assistant/tools/assistant/findwidget.cpp index d45ed30b0..296da0c8d 100644 --- a/src/assistant/tools/assistant/findwidget.cpp +++ b/src/assistant/tools/assistant/findwidget.cpp @@ -41,14 +41,14 @@ #include "tracer.h" #include "findwidget.h" -#include <QtGui/QApplication> -#include <QtGui/QCheckBox> +#include <QtWidgets/QApplication> +#include <QtWidgets/QCheckBox> #include <QtGui/QHideEvent> #include <QtGui/QKeyEvent> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QToolButton> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLayout> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QToolButton> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/findwidget.h b/src/assistant/tools/assistant/findwidget.h index d3be0f587..b24e88019 100644 --- a/src/assistant/tools/assistant/findwidget.h +++ b/src/assistant/tools/assistant/findwidget.h @@ -41,7 +41,7 @@ #ifndef FINDWIDGET_H #define FINDWIDGET_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/globalactions.cpp b/src/assistant/tools/assistant/globalactions.cpp index 7fc59ebcd..6b8b8ea29 100644 --- a/src/assistant/tools/assistant/globalactions.cpp +++ b/src/assistant/tools/assistant/globalactions.cpp @@ -45,8 +45,8 @@ #include "helpviewer.h" #include "tracer.h" -#include <QtGui/QAction> -#include <QtGui/QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QMenu> #if !defined(QT_NO_WEBKIT) #include <QtWebKit/QWebHistory> diff --git a/src/assistant/tools/assistant/helpviewer.h b/src/assistant/tools/assistant/helpviewer.h index bba01d0e6..a5f4de668 100644 --- a/src/assistant/tools/assistant/helpviewer.h +++ b/src/assistant/tools/assistant/helpviewer.h @@ -47,11 +47,11 @@ #include <QtCore/QUrl> #include <QtCore/QVariant> -#include <QtGui/QAction> +#include <QtWidgets/QAction> #include <QtGui/QFont> #if defined(QT_NO_WEBKIT) -#include <QtGui/QTextBrowser> +#include <QtWidgets/QTextBrowser> #else #include <QtWebKit/QWebView> #endif diff --git a/src/assistant/tools/assistant/helpviewer_p.h b/src/assistant/tools/assistant/helpviewer_p.h index 378871197..8beeb94b2 100644 --- a/src/assistant/tools/assistant/helpviewer_p.h +++ b/src/assistant/tools/assistant/helpviewer_p.h @@ -48,7 +48,7 @@ #include <QtCore/QObject> #ifdef QT_NO_WEBKIT -#include <QtGui/QTextBrowser> +#include <QtWidgets/QTextBrowser> #endif QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/helpviewer_qtb.cpp b/src/assistant/tools/assistant/helpviewer_qtb.cpp index 0a6325cb5..d3d128b74 100644 --- a/src/assistant/tools/assistant/helpviewer_qtb.cpp +++ b/src/assistant/tools/assistant/helpviewer_qtb.cpp @@ -50,9 +50,9 @@ #include <QtCore/QStringBuilder> #include <QtGui/QContextMenuEvent> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> #include <QtGui/QClipboard> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/helpviewer_qwv.cpp b/src/assistant/tools/assistant/helpviewer_qwv.cpp index efb9b5900..662177631 100644 --- a/src/assistant/tools/assistant/helpviewer_qwv.cpp +++ b/src/assistant/tools/assistant/helpviewer_qwv.cpp @@ -51,8 +51,8 @@ #include <QtCore/QString> #include <QtCore/QTimer> -#include <QtGui/QApplication> -#include <QtGui/QWheelEvent> +#include <QtWidgets/QApplication> +#include <QtWidgets/QWheelEvent> #include <QtHelp/QHelpEngineCore> diff --git a/src/assistant/tools/assistant/indexwindow.cpp b/src/assistant/tools/assistant/indexwindow.cpp index 38bc8b96a..069e821cd 100644 --- a/src/assistant/tools/assistant/indexwindow.cpp +++ b/src/assistant/tools/assistant/indexwindow.cpp @@ -48,13 +48,13 @@ #include "topicchooser.h" #include "tracer.h" -#include <QtGui/QLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> +#include <QtWidgets/QLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLineEdit> #include <QtGui/QKeyEvent> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> #include <QtGui/QContextMenuEvent> -#include <QtGui/QListWidgetItem> +#include <QtWidgets/QListWidgetItem> #include <QtHelp/QHelpIndexWidget> diff --git a/src/assistant/tools/assistant/indexwindow.h b/src/assistant/tools/assistant/indexwindow.h index 6c1c4e14e..1873cd6e4 100644 --- a/src/assistant/tools/assistant/indexwindow.h +++ b/src/assistant/tools/assistant/indexwindow.h @@ -43,8 +43,8 @@ #define INDEXWINDOW_H #include <QtCore/QUrl> -#include <QtGui/QWidget> -#include <QtGui/QLineEdit> +#include <QtWidgets/QWidget> +#include <QtWidgets/QLineEdit> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/installdialog.cpp b/src/assistant/tools/assistant/installdialog.cpp index 29473a2f9..82c0ccaa9 100644 --- a/src/assistant/tools/assistant/installdialog.cpp +++ b/src/assistant/tools/assistant/installdialog.cpp @@ -49,8 +49,8 @@ #include <QtCore/QFile> #include <QtCore/QCryptographicHash> -#include <QtGui/QMessageBox> -#include <QtGui/QFileDialog> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QFileDialog> #include <QtHelp/QHelpEngineCore> diff --git a/src/assistant/tools/assistant/installdialog.h b/src/assistant/tools/assistant/installdialog.h index 0fb45a130..0f57b9ef0 100644 --- a/src/assistant/tools/assistant/installdialog.h +++ b/src/assistant/tools/assistant/installdialog.h @@ -43,7 +43,7 @@ #define INSTALLDIALOG_H #include <QtCore/QQueue> -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include <QtNetwork/QHttpResponseHeader> #include "ui_installdialog.h" diff --git a/src/assistant/tools/assistant/main.cpp b/src/assistant/tools/assistant/main.cpp index 84972c546..d6e78d473 100644 --- a/src/assistant/tools/assistant/main.cpp +++ b/src/assistant/tools/assistant/main.cpp @@ -49,7 +49,7 @@ #include <QtCore/QTranslator> #include <QtCore/QUrl> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QDesktopServices> #include <QtHelp/QHelpEngine> diff --git a/src/assistant/tools/assistant/mainwindow.cpp b/src/assistant/tools/assistant/mainwindow.cpp index 342fc76da..18a215ecd 100644 --- a/src/assistant/tools/assistant/mainwindow.cpp +++ b/src/assistant/tools/assistant/mainwindow.cpp @@ -66,23 +66,23 @@ #include <QtCore/QTextStream> #include <QtCore/QTimer> -#include <QtGui/QAction> -#include <QtGui/QComboBox> +#include <QtWidgets/QAction> +#include <QtWidgets/QComboBox> #include <QtGui/QDesktopServices> -#include <QtGui/QDesktopWidget> -#include <QtGui/QDockWidget> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QDockWidget> #include <QtGui/QFontDatabase> -#include <QtGui/QFileDialog> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QMenuBar> -#include <QtGui/QMessageBox> -#include <QtGui/QProgressBar> -#include <QtGui/QShortcut> -#include <QtGui/QStatusBar> -#include <QtGui/QToolBar> -#include <QtGui/QToolButton> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLayout> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QProgressBar> +#include <QtWidgets/QShortcut> +#include <QtWidgets/QStatusBar> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QToolButton> #include <QtHelp/QHelpContentModel> #include <QtHelp/QHelpEngineCore> diff --git a/src/assistant/tools/assistant/mainwindow.h b/src/assistant/tools/assistant/mainwindow.h index 6fe10ec45..1ea0bbaf2 100644 --- a/src/assistant/tools/assistant/mainwindow.h +++ b/src/assistant/tools/assistant/mainwindow.h @@ -44,7 +44,7 @@ #include <QtCore/QList> #include <QtCore/QUrl> -#include <QtGui/QMainWindow> +#include <QtWidgets/QMainWindow> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/openpagesmanager.cpp b/src/assistant/tools/assistant/openpagesmanager.cpp index 272d9e242..7bafeeafc 100644 --- a/src/assistant/tools/assistant/openpagesmanager.cpp +++ b/src/assistant/tools/assistant/openpagesmanager.cpp @@ -50,8 +50,8 @@ #include "tracer.h" #include "../shared/collectionconfiguration.h" -#include <QtGui/QApplication> -#include <QtGui/QTreeView> +#include <QtWidgets/QApplication> +#include <QtWidgets/QTreeView> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/openpagesswitcher.cpp b/src/assistant/tools/assistant/openpagesswitcher.cpp index 8e7f29bf0..b1f70d784 100644 --- a/src/assistant/tools/assistant/openpagesswitcher.cpp +++ b/src/assistant/tools/assistant/openpagesswitcher.cpp @@ -49,7 +49,7 @@ #include <QtCore/QEvent> #include <QtGui/QKeyEvent> -#include <QtGui/QVBoxLayout> +#include <QtWidgets/QVBoxLayout> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/openpagesswitcher.h b/src/assistant/tools/assistant/openpagesswitcher.h index 80c7e965d..c3e3a33ce 100644 --- a/src/assistant/tools/assistant/openpagesswitcher.h +++ b/src/assistant/tools/assistant/openpagesswitcher.h @@ -42,7 +42,7 @@ #ifndef OPENPAGESSWITCHER_H #define OPENPAGESSWITCHER_H -#include <QtGui/QFrame> +#include <QtWidgets/QFrame> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/openpageswidget.cpp b/src/assistant/tools/assistant/openpageswidget.cpp index db037125b..6947c312c 100644 --- a/src/assistant/tools/assistant/openpageswidget.cpp +++ b/src/assistant/tools/assistant/openpageswidget.cpp @@ -45,11 +45,11 @@ #include "openpagesmodel.h" #include "tracer.h" -#include <QtGui/QApplication> -#include <QtGui/QHeaderView> +#include <QtWidgets/QApplication> +#include <QtWidgets/QHeaderView> #include <QtGui/QKeyEvent> #include <QtGui/QMouseEvent> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> #include <QtGui/QPainter> #ifdef Q_WS_MAC diff --git a/src/assistant/tools/assistant/openpageswidget.h b/src/assistant/tools/assistant/openpageswidget.h index 6041fe22d..e629e4ffe 100644 --- a/src/assistant/tools/assistant/openpageswidget.h +++ b/src/assistant/tools/assistant/openpageswidget.h @@ -42,8 +42,8 @@ #ifndef OPENPAGESWIDGET_H #define OPENPAGESWIDGET_H -#include <QtGui/QStyledItemDelegate> -#include <QtGui/QTreeView> +#include <QtWidgets/QStyledItemDelegate> +#include <QtWidgets/QTreeView> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/preferencesdialog.cpp b/src/assistant/tools/assistant/preferencesdialog.cpp index 9bfd35c00..64fc3c42d 100644 --- a/src/assistant/tools/assistant/preferencesdialog.cpp +++ b/src/assistant/tools/assistant/preferencesdialog.cpp @@ -51,12 +51,12 @@ #include <QtCore/QtAlgorithms> #include <QtCore/QFileSystemWatcher> -#include <QtGui/QDesktopWidget> -#include <QtGui/QFileDialog> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QFileDialog> #include <QtGui/QFontDatabase> -#include <QtGui/QHeaderView> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QMenu> +#include <QtWidgets/QMessageBox> #include <QtHelp/QHelpEngineCore> diff --git a/src/assistant/tools/assistant/preferencesdialog.h b/src/assistant/tools/assistant/preferencesdialog.h index f9b445e72..04bfcf8c3 100644 --- a/src/assistant/tools/assistant/preferencesdialog.h +++ b/src/assistant/tools/assistant/preferencesdialog.h @@ -42,7 +42,7 @@ #ifndef PREFERENCESDIALOG_H #define PREFERENCESDIALOG_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include "ui_preferencesdialog.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/remotecontrol.cpp b/src/assistant/tools/assistant/remotecontrol.cpp index 5d93fbc2e..0990a357f 100644 --- a/src/assistant/tools/assistant/remotecontrol.cpp +++ b/src/assistant/tools/assistant/remotecontrol.cpp @@ -53,8 +53,8 @@ #include <QtCore/QTextStream> #include <QtCore/QSocketNotifier> -#include <QtGui/QMessageBox> -#include <QtGui/QApplication> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QApplication> #include <QtHelp/QHelpEngine> #include <QtHelp/QHelpIndexWidget> diff --git a/src/assistant/tools/assistant/searchwidget.cpp b/src/assistant/tools/assistant/searchwidget.cpp index 627d9e745..31b8e739d 100644 --- a/src/assistant/tools/assistant/searchwidget.cpp +++ b/src/assistant/tools/assistant/searchwidget.cpp @@ -47,12 +47,12 @@ #include <QtCore/QString> #include <QtCore/QStringList> -#include <QtGui/QMenu> -#include <QtGui/QLayout> +#include <QtWidgets/QMenu> +#include <QtWidgets/QLayout> #include <QtGui/QKeyEvent> #include <QtGui/QClipboard> -#include <QtGui/QApplication> -#include <QtGui/QTextBrowser> +#include <QtWidgets/QApplication> +#include <QtWidgets/QTextBrowser> #include <QtHelp/QHelpSearchEngine> #include <QtHelp/QHelpSearchQueryWidget> diff --git a/src/assistant/tools/assistant/searchwidget.h b/src/assistant/tools/assistant/searchwidget.h index 077c78771..c53498c94 100644 --- a/src/assistant/tools/assistant/searchwidget.h +++ b/src/assistant/tools/assistant/searchwidget.h @@ -45,7 +45,7 @@ #include <QtCore/QUrl> #include <QtCore/QPoint> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/assistant/topicchooser.h b/src/assistant/tools/assistant/topicchooser.h index a80f1963d..6ac59f008 100644 --- a/src/assistant/tools/assistant/topicchooser.h +++ b/src/assistant/tools/assistant/topicchooser.h @@ -49,7 +49,7 @@ #include <QtCore/QString> #include <QtCore/QUrl> -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/conversionwizard.cpp b/src/assistant/tools/qhelpconverter/conversionwizard.cpp index 1df9facc5..0a80a0e71 100644 --- a/src/assistant/tools/qhelpconverter/conversionwizard.cpp +++ b/src/assistant/tools/qhelpconverter/conversionwizard.cpp @@ -43,7 +43,7 @@ #include <QtCore/QDir> #include <QtCore/QVariant> #include <QtCore/QTimer> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QMouseEvent> #include "conversionwizard.h" diff --git a/src/assistant/tools/qhelpconverter/conversionwizard.h b/src/assistant/tools/qhelpconverter/conversionwizard.h index eb9b3f556..ff66d271e 100644 --- a/src/assistant/tools/qhelpconverter/conversionwizard.h +++ b/src/assistant/tools/qhelpconverter/conversionwizard.h @@ -42,7 +42,7 @@ #ifndef CONVERSIONWIZARD_H #define CONVERSIONWIZARD_H -#include <QtGui/QWizard> +#include <QtWidgets/QWizard> #include "adpreader.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/filespage.h b/src/assistant/tools/qhelpconverter/filespage.h index 393c3d5e1..07022e898 100644 --- a/src/assistant/tools/qhelpconverter/filespage.h +++ b/src/assistant/tools/qhelpconverter/filespage.h @@ -42,7 +42,7 @@ #ifndef FILESPAGE_H #define FILESPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_filespage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/filterpage.cpp b/src/assistant/tools/qhelpconverter/filterpage.cpp index 3b22ca0d1..efe32c79e 100644 --- a/src/assistant/tools/qhelpconverter/filterpage.cpp +++ b/src/assistant/tools/qhelpconverter/filterpage.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> #include "filterpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/filterpage.h b/src/assistant/tools/qhelpconverter/filterpage.h index 0281a1ed3..336c650de 100644 --- a/src/assistant/tools/qhelpconverter/filterpage.h +++ b/src/assistant/tools/qhelpconverter/filterpage.h @@ -42,7 +42,7 @@ #ifndef FILTERPAGE_H #define FILTERPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_filterpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/finishpage.cpp b/src/assistant/tools/qhelpconverter/finishpage.cpp index a7fa89e2e..cdbd634e6 100644 --- a/src/assistant/tools/qhelpconverter/finishpage.cpp +++ b/src/assistant/tools/qhelpconverter/finishpage.cpp @@ -39,10 +39,10 @@ ** ****************************************************************************/ -#include <QtGui/QTextEdit> -#include <QtGui/QLayout> -#include <QtGui/QSpacerItem> -#include <QtGui/QApplication> +#include <QtWidgets/QTextEdit> +#include <QtWidgets/QLayout> +#include <QtWidgets/QSpacerItem> +#include <QtWidgets/QApplication> #include "finishpage.h" diff --git a/src/assistant/tools/qhelpconverter/finishpage.h b/src/assistant/tools/qhelpconverter/finishpage.h index 15b0c4a55..41dec54ca 100644 --- a/src/assistant/tools/qhelpconverter/finishpage.h +++ b/src/assistant/tools/qhelpconverter/finishpage.h @@ -42,7 +42,7 @@ #ifndef FINISHPAGE_H #define FINISHPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/generalpage.cpp b/src/assistant/tools/qhelpconverter/generalpage.cpp index 4b32cbbf9..ad0171270 100644 --- a/src/assistant/tools/qhelpconverter/generalpage.cpp +++ b/src/assistant/tools/qhelpconverter/generalpage.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> #include "generalpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/generalpage.h b/src/assistant/tools/qhelpconverter/generalpage.h index 413a798df..c9a8b2452 100644 --- a/src/assistant/tools/qhelpconverter/generalpage.h +++ b/src/assistant/tools/qhelpconverter/generalpage.h @@ -42,7 +42,7 @@ #ifndef GENERALPAGE_H #define GENERALPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_generalpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/helpwindow.cpp b/src/assistant/tools/qhelpconverter/helpwindow.cpp index 9fa33585e..5212092f7 100644 --- a/src/assistant/tools/qhelpconverter/helpwindow.cpp +++ b/src/assistant/tools/qhelpconverter/helpwindow.cpp @@ -41,9 +41,9 @@ #include <QtCore/QFile> #include <QtCore/QTextStream> -#include <QtGui/QVBoxLayout> -#include <QtGui/QLabel> -#include <QtGui/QTextEdit> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QTextEdit> #include "helpwindow.h" diff --git a/src/assistant/tools/qhelpconverter/helpwindow.h b/src/assistant/tools/qhelpconverter/helpwindow.h index ba176ed72..9a45f06e0 100644 --- a/src/assistant/tools/qhelpconverter/helpwindow.h +++ b/src/assistant/tools/qhelpconverter/helpwindow.h @@ -42,7 +42,7 @@ #ifndef HELPWINDOW_H #define HELPWINDOW_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/identifierpage.h b/src/assistant/tools/qhelpconverter/identifierpage.h index c05eb8f72..05de35ca9 100644 --- a/src/assistant/tools/qhelpconverter/identifierpage.h +++ b/src/assistant/tools/qhelpconverter/identifierpage.h @@ -42,7 +42,7 @@ #ifndef IDENTIFIERPAGE_H #define IDENTIFIERPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_identifierpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/inputpage.cpp b/src/assistant/tools/qhelpconverter/inputpage.cpp index aa180b90e..9abbbe74b 100644 --- a/src/assistant/tools/qhelpconverter/inputpage.cpp +++ b/src/assistant/tools/qhelpconverter/inputpage.cpp @@ -42,13 +42,13 @@ #include <QtCore/QFile> #include <QtCore/QVariant> -#include <QtGui/QLayout> -#include <QtGui/QLabel> -#include <QtGui/QLineEdit> -#include <QtGui/QToolButton> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> -#include <QtGui/QApplication> +#include <QtWidgets/QLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QApplication> #include "inputpage.h" #include "adpreader.h" diff --git a/src/assistant/tools/qhelpconverter/inputpage.h b/src/assistant/tools/qhelpconverter/inputpage.h index 4489dc781..185b7b2b2 100644 --- a/src/assistant/tools/qhelpconverter/inputpage.h +++ b/src/assistant/tools/qhelpconverter/inputpage.h @@ -42,7 +42,7 @@ #ifndef INPUTPAGE_H #define INPUTPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_inputpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/main.cpp b/src/assistant/tools/qhelpconverter/main.cpp index 38f6ffc4e..1c2d1bf12 100644 --- a/src/assistant/tools/qhelpconverter/main.cpp +++ b/src/assistant/tools/qhelpconverter/main.cpp @@ -43,7 +43,7 @@ #include <QtCore/QTranslator> #include <QtCore/QLocale> #include <QtCore/QLibraryInfo> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include "conversionwizard.h" diff --git a/src/assistant/tools/qhelpconverter/outputpage.cpp b/src/assistant/tools/qhelpconverter/outputpage.cpp index d8a6bd13f..434357b34 100644 --- a/src/assistant/tools/qhelpconverter/outputpage.cpp +++ b/src/assistant/tools/qhelpconverter/outputpage.cpp @@ -41,7 +41,7 @@ #include <QtCore/QFileInfo> #include <QtCore/QDir> -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> #include "outputpage.h" diff --git a/src/assistant/tools/qhelpconverter/outputpage.h b/src/assistant/tools/qhelpconverter/outputpage.h index 535729bf8..e45afae10 100644 --- a/src/assistant/tools/qhelpconverter/outputpage.h +++ b/src/assistant/tools/qhelpconverter/outputpage.h @@ -42,7 +42,7 @@ #ifndef OUTPUTPAGE_H #define OUTPUTPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_outputpage.h" QT_BEGIN_NAMESPACE diff --git a/src/assistant/tools/qhelpconverter/pathpage.cpp b/src/assistant/tools/qhelpconverter/pathpage.cpp index e5391eb80..a9ddf53a5 100644 --- a/src/assistant/tools/qhelpconverter/pathpage.cpp +++ b/src/assistant/tools/qhelpconverter/pathpage.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QFileDialog> +#include <QtWidgets/QFileDialog> #include "pathpage.h" diff --git a/src/assistant/tools/qhelpconverter/pathpage.h b/src/assistant/tools/qhelpconverter/pathpage.h index aad387976..90b24236c 100644 --- a/src/assistant/tools/qhelpconverter/pathpage.h +++ b/src/assistant/tools/qhelpconverter/pathpage.h @@ -42,7 +42,7 @@ #ifndef PATHPAGE_H #define PATHPAGE_H -#include <QtGui/QWizardPage> +#include <QtWidgets/QWizardPage> #include "ui_pathpage.h" QT_BEGIN_NAMESPACE 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 diff --git a/src/designer/src/designer/appfontdialog.cpp b/src/designer/src/designer/appfontdialog.cpp index 10ec254c4..9deff525a 100644 --- a/src/designer/src/designer/appfontdialog.cpp +++ b/src/designer/src/designer/appfontdialog.cpp @@ -45,16 +45,16 @@ #include <QtDesigner/QDesignerSettingsInterface> -#include <QtGui/QTreeView> -#include <QtGui/QToolButton> -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QSpacerItem> -#include <QtGui/QFileDialog> -#include <QtGui/QStandardItemModel> -#include <QtGui/QMessageBox> +#include <QtWidgets/QTreeView> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QSpacerItem> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QStandardItemModel> +#include <QtWidgets/QMessageBox> #include <QtGui/QFontDatabase> -#include <QtGui/QDialogButtonBox> +#include <QtWidgets/QDialogButtonBox> #include <QtCore/QSettings> #include <QtCore/QCoreApplication> diff --git a/src/designer/src/designer/appfontdialog.h b/src/designer/src/designer/appfontdialog.h index a373217ac..24776c110 100644 --- a/src/designer/src/designer/appfontdialog.h +++ b/src/designer/src/designer/appfontdialog.h @@ -42,8 +42,8 @@ #ifndef QDESIGNER_APPFONTWIDGET_H #define QDESIGNER_APPFONTWIDGET_H -#include <QtGui/QGroupBox> -#include <QtGui/QDialog> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro index 529b78db7..e922b688f 100644 --- a/src/designer/src/designer/designer.pro +++ b/src/designer/src/designer/designer.pro @@ -1,7 +1,7 @@ load(qt_module) DESTDIR = $$QT.designer.bins -QT += core-private xml network designer-private uilib-private +QT += core-private widgets xml network designer-private uilib-private CONFIG += module MODULE_PRI = ../../../../modules/qt_designer.pri diff --git a/src/designer/src/designer/mainwindow.cpp b/src/designer/src/designer/mainwindow.cpp index 67e1a4053..9fcc1b9f7 100644 --- a/src/designer/src/designer/mainwindow.cpp +++ b/src/designer/src/designer/mainwindow.cpp @@ -50,14 +50,14 @@ #include <QtDesigner/QDesignerFormWindowInterface> -#include <QtGui/QAction> +#include <QtWidgets/QAction> #include <QtGui/QCloseEvent> -#include <QtGui/QToolBar> -#include <QtGui/QMdiSubWindow> -#include <QtGui/QStatusBar> -#include <QtGui/QMenu> -#include <QtGui/QLayout> -#include <QtGui/QDockWidget> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QMdiSubWindow> +#include <QtWidgets/QStatusBar> +#include <QtWidgets/QMenu> +#include <QtWidgets/QLayout> +#include <QtWidgets/QDockWidget> #include <QtCore/QUrl> #include <QtCore/QDebug> diff --git a/src/designer/src/designer/mainwindow.h b/src/designer/src/designer/mainwindow.h index e39e57203..9e9781f38 100644 --- a/src/designer/src/designer/mainwindow.h +++ b/src/designer/src/designer/mainwindow.h @@ -42,9 +42,9 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QtGui/QMainWindow> +#include <QtWidgets/QMainWindow> #include <QtCore/QList> -#include <QtGui/QMdiArea> +#include <QtWidgets/QMdiArea> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/newform.cpp b/src/designer/src/designer/newform.cpp index 34461f52a..81ba3c21a 100644 --- a/src/designer/src/designer/newform.cpp +++ b/src/designer/src/designer/newform.cpp @@ -55,14 +55,14 @@ #include <QtCore/QDir> #include <QtCore/QTemporaryFile> -#include <QtGui/QApplication> -#include <QtGui/QVBoxLayout> -#include <QtGui/QPushButton> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QMenu> -#include <QtGui/QCheckBox> -#include <QtGui/QFrame> -#include <QtGui/QMessageBox> +#include <QtWidgets/QApplication> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QMenu> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QFrame> +#include <QtWidgets/QMessageBox> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/newform.h b/src/designer/src/designer/newform.h index ad51118b9..097048f38 100644 --- a/src/designer/src/designer/newform.h +++ b/src/designer/src/designer/newform.h @@ -42,7 +42,7 @@ #ifndef NEWFORM_H #define NEWFORM_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/preferencesdialog.cpp b/src/designer/src/designer/preferencesdialog.cpp index f847baea8..ca4d5024f 100644 --- a/src/designer/src/designer/preferencesdialog.cpp +++ b/src/designer/src/designer/preferencesdialog.cpp @@ -46,8 +46,8 @@ #include <QtDesigner/QDesignerOptionsPageInterface> #include <QtDesigner/QDesignerFormEditorInterface> -#include <QtGui/QFileDialog> -#include <QtGui/QPushButton> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QPushButton> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/preferencesdialog.h b/src/designer/src/designer/preferencesdialog.h index 5ffd7d365..f3e0f6ab2 100644 --- a/src/designer/src/designer/preferencesdialog.h +++ b/src/designer/src/designer/preferencesdialog.h @@ -42,7 +42,7 @@ #ifndef PREFERENCESDIALOG_H #define PREFERENCESDIALOG_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/qdesigner.cpp b/src/designer/src/designer/qdesigner.cpp index 1e838c197..685deb92e 100644 --- a/src/designer/src/designer/qdesigner.cpp +++ b/src/designer/src/designer/qdesigner.cpp @@ -51,9 +51,9 @@ #include <QtGui/QFileOpenEvent> #include <QtGui/QCloseEvent> -#include <QtGui/QMessageBox> -#include <QtGui/QIcon> -#include <QtGui/QErrorMessage> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QIcon> +#include <QtWidgets/QErrorMessage> #include <QtCore/QMetaObject> #include <QtCore/QFile> #include <QtCore/QLibraryInfo> diff --git a/src/designer/src/designer/qdesigner.h b/src/designer/src/designer/qdesigner.h index ff45edffd..5241b47d2 100644 --- a/src/designer/src/designer/qdesigner.h +++ b/src/designer/src/designer/qdesigner.h @@ -43,7 +43,7 @@ #define QDESIGNER_H #include <QtCore/QPointer> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp index 6eddeb99c..c19abefc4 100644 --- a/src/designer/src/designer/qdesigner_actions.cpp +++ b/src/designer/src/designer/qdesigner_actions.cpp @@ -73,19 +73,19 @@ #include <QtDesigner/private/shared_settings_p.h> #include <QtDesigner/private/formwindowbase_p.h> -#include <QtGui/QAction> -#include <QtGui/QActionGroup> -#include <QtGui/QStyleFactory> +#include <QtWidgets/QAction> +#include <QtWidgets/QActionGroup> +#include <QtWidgets/QStyleFactory> #include <QtGui/QCloseEvent> -#include <QtGui/QFileDialog> -#include <QtGui/QMenu> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QIcon> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QMenu> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QIcon> #include <QtGui/QImage> #include <QtGui/QPixmap> -#include <QtGui/QMdiSubWindow> -#include <QtGui/QPrintDialog> +#include <QtWidgets/QMdiSubWindow> +#include <QtWidgets/QPrintDialog> #include <QtGui/QPainter> #include <QtGui/QTransform> #include <QtGui/QCursor> @@ -98,8 +98,8 @@ #include <QtCore/QTimer> #include <QtCore/QMetaObject> #include <QtCore/QFileInfo> -#include <QtGui/QStatusBar> -#include <QtGui/QDesktopWidget> +#include <QtWidgets/QStatusBar> +#include <QtWidgets/QDesktopWidget> #include <QtXml/QDomDocument> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/qdesigner_appearanceoptions.h b/src/designer/src/designer/qdesigner_appearanceoptions.h index 2c7fda130..4dfd507fe 100644 --- a/src/designer/src/designer/qdesigner_appearanceoptions.h +++ b/src/designer/src/designer/qdesigner_appearanceoptions.h @@ -49,7 +49,7 @@ #include <QtCore/QObject> #include <QtCore/QPointer> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/qdesigner_formwindow.cpp b/src/designer/src/designer/qdesigner_formwindow.cpp index dfee657da..a7f6579e8 100644 --- a/src/designer/src/designer/qdesigner_formwindow.cpp +++ b/src/designer/src/designer/qdesigner_formwindow.cpp @@ -55,13 +55,13 @@ #include <QtCore/QEvent> #include <QtCore/QFile> -#include <QtGui/QAction> +#include <QtWidgets/QAction> #include <QtGui/QCloseEvent> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QVBoxLayout> -#include <QtGui/QUndoCommand> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QUndoCommand> #include <QtGui/QWindowStateChangeEvent> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/qdesigner_formwindow.h b/src/designer/src/designer/qdesigner_formwindow.h index 5ee4c40b4..58065baed 100644 --- a/src/designer/src/designer/qdesigner_formwindow.h +++ b/src/designer/src/designer/qdesigner_formwindow.h @@ -43,7 +43,7 @@ #define QDESIGNER_FORMWINDOW_H #include <QtCore/QPointer> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/qdesigner_pch.h b/src/designer/src/designer/qdesigner_pch.h index 12eb3f376..ea9d6d104 100644 --- a/src/designer/src/designer/qdesigner_pch.h +++ b/src/designer/src/designer/qdesigner_pch.h @@ -45,9 +45,9 @@ #include <QtCore/QSettings> #include <QtCore/qdebug.h> #include <QtGui/QCloseEvent> -#include <QtGui/QHeaderView> -#include <QtGui/QMessageBox> -#include <QtGui/QVBoxLayout> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QVBoxLayout> #include <QtDesigner/abstractformeditor.h> #include <QtDesigner/abstractformwindow.h> diff --git a/src/designer/src/designer/qdesigner_settings.cpp b/src/designer/src/designer/qdesigner_settings.cpp index b5a4e02f5..4201aaa27 100644 --- a/src/designer/src/designer/qdesigner_settings.cpp +++ b/src/designer/src/designer/qdesigner_settings.cpp @@ -53,9 +53,9 @@ #include <QtCore/QVariant> #include <QtCore/QDir> -#include <QtGui/QDesktopWidget> -#include <QtGui/QStyle> -#include <QtGui/QListView> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QStyle> +#include <QtWidgets/QListView> #include <QtCore/qdebug.h> diff --git a/src/designer/src/designer/qdesigner_toolwindow.cpp b/src/designer/src/designer/qdesigner_toolwindow.cpp index 376b0afae..413a4a239 100644 --- a/src/designer/src/designer/qdesigner_toolwindow.cpp +++ b/src/designer/src/designer/qdesigner_toolwindow.cpp @@ -53,7 +53,7 @@ #include <QtCore/QEvent> #include <QtCore/QDebug> -#include <QtGui/QAction> +#include <QtWidgets/QAction> #include <QtGui/QCloseEvent> enum { debugToolWindow = 0 }; diff --git a/src/designer/src/designer/qdesigner_toolwindow.h b/src/designer/src/designer/qdesigner_toolwindow.h index 1c7b876d1..f151e258e 100644 --- a/src/designer/src/designer/qdesigner_toolwindow.h +++ b/src/designer/src/designer/qdesigner_toolwindow.h @@ -46,7 +46,7 @@ #include <QtCore/QPointer> #include <QtGui/QFontDatabase> -#include <QtGui/QMainWindow> +#include <QtWidgets/QMainWindow> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/qdesigner_workbench.cpp b/src/designer/src/designer/qdesigner_workbench.cpp index 0d646060a..75769c808 100644 --- a/src/designer/src/designer/qdesigner_workbench.cpp +++ b/src/designer/src/designer/qdesigner_workbench.cpp @@ -68,18 +68,18 @@ #include <QtCore/QPluginLoader> #include <QtCore/qdebug.h> -#include <QtGui/QActionGroup> +#include <QtWidgets/QActionGroup> #include <QtGui/QCloseEvent> -#include <QtGui/QDesktopWidget> -#include <QtGui/QDockWidget> -#include <QtGui/QMenu> -#include <QtGui/QMenuBar> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QToolBar> -#include <QtGui/QMdiArea> -#include <QtGui/QMdiSubWindow> -#include <QtGui/QLayout> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QDockWidget> +#include <QtWidgets/QMenu> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QMdiArea> +#include <QtWidgets/QMdiSubWindow> +#include <QtWidgets/QLayout> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/saveformastemplate.cpp b/src/designer/src/designer/saveformastemplate.cpp index 49ac64ee5..c5015eb3b 100644 --- a/src/designer/src/designer/saveformastemplate.cpp +++ b/src/designer/src/designer/saveformastemplate.cpp @@ -43,9 +43,9 @@ #include "qdesigner_settings.h" #include <QtCore/QFile> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QPushButton> #include <QtDesigner/abstractformeditor.h> #include <QtDesigner/abstractformwindow.h> diff --git a/src/designer/src/designer/versiondialog.cpp b/src/designer/src/designer/versiondialog.cpp index 63a95e6d7..f7a7181e6 100644 --- a/src/designer/src/designer/versiondialog.cpp +++ b/src/designer/src/designer/versiondialog.cpp @@ -41,13 +41,13 @@ #include <QtCore/QVector> #include <QtGui/QMouseEvent> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> -#include <QtGui/QPushButton> -#include <QtGui/QDialogButtonBox> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QDialogButtonBox> #include <QtGui/QPainter> #include <QtGui/QPainterPath> -#include <QtGui/QStyleOption> +#include <QtWidgets/QStyleOption> #include "versiondialog.h" QT_BEGIN_NAMESPACE diff --git a/src/designer/src/designer/versiondialog.h b/src/designer/src/designer/versiondialog.h index 0e6760092..acea1b0c4 100644 --- a/src/designer/src/designer/versiondialog.h +++ b/src/designer/src/designer/versiondialog.h @@ -42,7 +42,7 @@ #ifndef VERSIONDIALOG_H #define VERSIONDIALOG_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro index b74cf02f3..55522d42b 100644 --- a/src/designer/src/lib/lib.pro +++ b/src/designer/src/lib/lib.pro @@ -2,7 +2,7 @@ load(qt_module) TEMPLATE=lib TARGET=QtDesigner -QT += core-private gui-private xml uilib-private +QT += core-private gui-private widgets widgets-private xml uilib-private contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols CONFIG += qt win32|mac: CONFIG += debug_and_release diff --git a/src/designer/src/lib/lib_pch.h b/src/designer/src/lib/lib_pch.h index 17c3d8cd6..b0e9fa097 100644 --- a/src/designer/src/lib/lib_pch.h +++ b/src/designer/src/lib/lib_pch.h @@ -48,17 +48,17 @@ #include <QtDesigner/qextensionmanager.h> #include <QtDesigner/abstractformwindow.h> #include <QtCore/QMap> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtDesigner/propertysheet.h> #include <QtDesigner/extension.h> #include <QtDesigner/abstractmetadatabase.h> #include <QtCore/QList> #include <QtDesigner/abstractwidgetfactory.h> #include <QtDesigner/abstractwidgetdatabase.h> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include "qdesigner_widget_p.h" #include <QtGui/QPainter> -#include <QtGui/QMainWindow> +#include <QtWidgets/QMainWindow> #include <QtCore/qglobal.h> #include <QtCore/QPointer> #include "layout_p.h" diff --git a/src/designer/src/lib/sdk/abstractactioneditor.h b/src/designer/src/lib/sdk/abstractactioneditor.h index 2d4241c23..4d95f0192 100644 --- a/src/designer/src/lib/sdk/abstractactioneditor.h +++ b/src/designer/src/lib/sdk/abstractactioneditor.h @@ -44,7 +44,7 @@ #include <QtDesigner/sdk_global.h> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER diff --git a/src/designer/src/lib/sdk/abstractdialoggui_p.h b/src/designer/src/lib/sdk/abstractdialoggui_p.h index af3843850..fef17b7e7 100644 --- a/src/designer/src/lib/sdk/abstractdialoggui_p.h +++ b/src/designer/src/lib/sdk/abstractdialoggui_p.h @@ -54,8 +54,8 @@ #define ABSTRACTDIALOGGUI_H #include <QtDesigner/sdk_global.h> -#include <QtGui/QMessageBox> -#include <QtGui/QFileDialog> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QFileDialog> QT_BEGIN_HEADER diff --git a/src/designer/src/lib/sdk/abstractformeditor.cpp b/src/designer/src/lib/sdk/abstractformeditor.cpp index 6110a93e3..f2af58d29 100644 --- a/src/designer/src/lib/sdk/abstractformeditor.cpp +++ b/src/designer/src/lib/sdk/abstractformeditor.cpp @@ -66,7 +66,7 @@ #include <iconloader_p.h> #include <QtDesigner/QDesignerPromotionInterface> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> // Must be done outside of the Qt namespace static void initResources() diff --git a/src/designer/src/lib/sdk/abstractformwindow.cpp b/src/designer/src/lib/sdk/abstractformwindow.cpp index bba78bf45..37ddfea0c 100644 --- a/src/designer/src/lib/sdk/abstractformwindow.cpp +++ b/src/designer/src/lib/sdk/abstractformwindow.cpp @@ -44,14 +44,14 @@ #include <widgetfactory_p.h> -#include <QtGui/QTabBar> -#include <QtGui/QSizeGrip> -#include <QtGui/QAbstractButton> -#include <QtGui/QToolBox> -#include <QtGui/QMenuBar> -#include <QtGui/QMainWindow> -#include <QtGui/QDockWidget> -#include <QtGui/QToolBar> +#include <QtWidgets/QTabBar> +#include <QtWidgets/QSizeGrip> +#include <QtWidgets/QAbstractButton> +#include <QtWidgets/QToolBox> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QDockWidget> +#include <QtWidgets/QToolBar> #include <QtCore/qdebug.h> diff --git a/src/designer/src/lib/sdk/abstractformwindow.h b/src/designer/src/lib/sdk/abstractformwindow.h index ab0f241ce..a6e81e518 100644 --- a/src/designer/src/lib/sdk/abstractformwindow.h +++ b/src/designer/src/lib/sdk/abstractformwindow.h @@ -44,7 +44,7 @@ #include <QtDesigner/sdk_global.h> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER diff --git a/src/designer/src/lib/sdk/abstractnewformwidget.h b/src/designer/src/lib/sdk/abstractnewformwidget.h index dc45acb93..5f77c87be 100644 --- a/src/designer/src/lib/sdk/abstractnewformwidget.h +++ b/src/designer/src/lib/sdk/abstractnewformwidget.h @@ -44,7 +44,7 @@ #include <QtDesigner/sdk_global.h> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER diff --git a/src/designer/src/lib/sdk/abstractobjectinspector.h b/src/designer/src/lib/sdk/abstractobjectinspector.h index 74c6e385a..58054f0d5 100644 --- a/src/designer/src/lib/sdk/abstractobjectinspector.h +++ b/src/designer/src/lib/sdk/abstractobjectinspector.h @@ -44,7 +44,7 @@ #include <QtDesigner/sdk_global.h> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER diff --git a/src/designer/src/lib/sdk/abstractpropertyeditor.h b/src/designer/src/lib/sdk/abstractpropertyeditor.h index a8d731631..e42fcab4a 100644 --- a/src/designer/src/lib/sdk/abstractpropertyeditor.h +++ b/src/designer/src/lib/sdk/abstractpropertyeditor.h @@ -44,7 +44,7 @@ #include <QtDesigner/sdk_global.h> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER diff --git a/src/designer/src/lib/sdk/abstractresourcebrowser.h b/src/designer/src/lib/sdk/abstractresourcebrowser.h index 836912d9a..5e7d4b2c3 100644 --- a/src/designer/src/lib/sdk/abstractresourcebrowser.h +++ b/src/designer/src/lib/sdk/abstractresourcebrowser.h @@ -44,7 +44,7 @@ #include <QtDesigner/sdk_global.h> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_HEADER diff --git a/src/designer/src/lib/sdk/abstractwidgetbox.h b/src/designer/src/lib/sdk/abstractwidgetbox.h index efbffd97c..6962cd76d 100644 --- a/src/designer/src/lib/sdk/abstractwidgetbox.h +++ b/src/designer/src/lib/sdk/abstractwidgetbox.h @@ -46,8 +46,8 @@ #include <QtCore/QSharedDataPointer> #include <QtCore/QMetaType> -#include <QtGui/QWidget> -#include <QtGui/QIcon> +#include <QtWidgets/QWidget> +#include <QtWidgets/QIcon> QT_BEGIN_HEADER diff --git a/src/designer/src/lib/shared/actioneditor.cpp b/src/designer/src/lib/shared/actioneditor.cpp index 9db7ad741..9aa9ce3a1 100644 --- a/src/designer/src/lib/shared/actioneditor.cpp +++ b/src/designer/src/lib/shared/actioneditor.cpp @@ -60,21 +60,21 @@ #include <QtDesigner/QDesignerMetaDataBaseInterface> #include <QtDesigner/QDesignerSettingsInterface> -#include <QtGui/QMenu> -#include <QtGui/QToolBar> -#include <QtGui/QSplitter> -#include <QtGui/QAction> -#include <QtGui/QApplication> +#include <QtWidgets/QMenu> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QSplitter> +#include <QtWidgets/QAction> +#include <QtWidgets/QApplication> #include <QtGui/QClipboard> -#include <QtGui/QItemDelegate> +#include <QtWidgets/QItemDelegate> #include <QtGui/QPainter> -#include <QtGui/QVBoxLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QLabel> -#include <QtGui/QPushButton> -#include <QtGui/QToolButton> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QLabel> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QToolButton> #include <QtGui/QContextMenuEvent> -#include <QtGui/QItemSelection> +#include <QtWidgets/QItemSelection> #include <QtCore/QRegExp> #include <QtCore/QDebug> diff --git a/src/designer/src/lib/shared/actionprovider_p.h b/src/designer/src/lib/shared/actionprovider_p.h index ce8a1795e..8b49ee53f 100644 --- a/src/designer/src/lib/shared/actionprovider_p.h +++ b/src/designer/src/lib/shared/actionprovider_p.h @@ -56,7 +56,7 @@ #include <QtDesigner/extension.h> #include <QtCore/QPoint> #include <QtCore/QRect> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/actionrepository.cpp b/src/designer/src/lib/shared/actionrepository.cpp index d7701cb9c..43239b6b7 100644 --- a/src/designer/src/lib/shared/actionrepository.cpp +++ b/src/designer/src/lib/shared/actionrepository.cpp @@ -50,13 +50,13 @@ #include <QtGui/QDrag> #include <QtGui/QContextMenuEvent> -#include <QtGui/QStandardItemModel> -#include <QtGui/QToolButton> +#include <QtWidgets/QStandardItemModel> +#include <QtWidgets/QToolButton> #include <QtGui/QPixmap> -#include <QtGui/QAction> -#include <QtGui/QHeaderView> -#include <QtGui/QToolBar> -#include <QtGui/QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QMenu> #include <QtGui/qevent.h> #include <QtCore/QSet> #include <QtCore/QDebug> diff --git a/src/designer/src/lib/shared/actionrepository_p.h b/src/designer/src/lib/shared/actionrepository_p.h index c2393cb0b..cebff479a 100644 --- a/src/designer/src/lib/shared/actionrepository_p.h +++ b/src/designer/src/lib/shared/actionrepository_p.h @@ -55,11 +55,11 @@ #include "shared_global_p.h" #include <QtCore/QMimeData> -#include <QtGui/QStandardItemModel> -#include <QtGui/QTreeView> -#include <QtGui/QListView> -#include <QtGui/QStackedWidget> -#include <QtGui/QIcon> +#include <QtWidgets/QStandardItemModel> +#include <QtWidgets/QTreeView> +#include <QtWidgets/QListView> +#include <QtWidgets/QStackedWidget> +#include <QtWidgets/QIcon> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/codedialog.cpp b/src/designer/src/lib/shared/codedialog.cpp index f6ea29048..4f8da54b6 100644 --- a/src/designer/src/lib/shared/codedialog.cpp +++ b/src/designer/src/lib/shared/codedialog.cpp @@ -45,18 +45,18 @@ #include <texteditfindwidget.h> -#include <QtGui/QAction> -#include <QtGui/QApplication> +#include <QtWidgets/QAction> +#include <QtWidgets/QApplication> #include <QtGui/QClipboard> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QFileDialog> -#include <QtGui/QIcon> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QIcon> #include <QtGui/QKeyEvent> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QTextEdit> -#include <QtGui/QToolBar> -#include <QtGui/QVBoxLayout> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QTextEdit> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QVBoxLayout> #include <QtCore/QDebug> #include <QtCore/QDir> diff --git a/src/designer/src/lib/shared/codedialog_p.h b/src/designer/src/lib/shared/codedialog_p.h index bed7e224f..18c92a3b7 100644 --- a/src/designer/src/lib/shared/codedialog_p.h +++ b/src/designer/src/lib/shared/codedialog_p.h @@ -54,7 +54,7 @@ #define CODEPREVIEWDIALOG_H #include "shared_global_p.h" -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/connectionedit.cpp b/src/designer/src/lib/shared/connectionedit.cpp index 5f5085c17..548a30002 100644 --- a/src/designer/src/lib/shared/connectionedit.cpp +++ b/src/designer/src/lib/shared/connectionedit.cpp @@ -49,10 +49,10 @@ #include <QtGui/QFontMetrics> #include <QtGui/QPixmap> #include <QtGui/QMatrix> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QContextMenuEvent> -#include <QtGui/QMenu> -#include <QtGui/QAction> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> #include <QtCore/QMultiMap> diff --git a/src/designer/src/lib/shared/connectionedit_p.h b/src/designer/src/lib/shared/connectionedit_p.h index 553fbe188..c7f69e93f 100644 --- a/src/designer/src/lib/shared/connectionedit_p.h +++ b/src/designer/src/lib/shared/connectionedit_p.h @@ -60,11 +60,11 @@ #include <QtCore/QList> #include <QtCore/QPointer> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtGui/QPixmap> #include <QtGui/QPolygonF> -#include <QtGui/QUndoCommand> +#include <QtWidgets/QUndoCommand> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/deviceprofile.cpp b/src/designer/src/lib/shared/deviceprofile.cpp index 3228cab5f..505cfecfa 100644 --- a/src/designer/src/lib/shared/deviceprofile.cpp +++ b/src/designer/src/lib/shared/deviceprofile.cpp @@ -45,12 +45,12 @@ #include <widgetfactory_p.h> #include <qdesigner_utils_p.h> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QFont> -#include <QtGui/QDesktopWidget> -#include <QtGui/QStyle> -#include <QtGui/QStyleFactory> -#include <QtGui/QApplication> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QStyle> +#include <QtWidgets/QStyleFactory> +#include <QtWidgets/QApplication> #include <QtCore/QSharedData> #include <QtCore/QTextStream> diff --git a/src/designer/src/lib/shared/dialoggui.cpp b/src/designer/src/lib/shared/dialoggui.cpp index 3aa4c796d..f68106974 100644 --- a/src/designer/src/lib/shared/dialoggui.cpp +++ b/src/designer/src/lib/shared/dialoggui.cpp @@ -41,8 +41,8 @@ #include "dialoggui_p.h" -#include <QtGui/QFileIconProvider> -#include <QtGui/QIcon> +#include <QtWidgets/QFileIconProvider> +#include <QtWidgets/QIcon> #include <QtGui/QImage> #include <QtGui/QImageReader> #include <QtGui/QPixmap> diff --git a/src/designer/src/lib/shared/filterwidget.cpp b/src/designer/src/lib/shared/filterwidget.cpp index e6c826cf8..6a6c4e76e 100644 --- a/src/designer/src/lib/shared/filterwidget.cpp +++ b/src/designer/src/lib/shared/filterwidget.cpp @@ -42,16 +42,16 @@ #include "filterwidget_p.h" #include "iconloader_p.h" -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QLineEdit> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QLineEdit> #include <QtGui/QFocusEvent> #include <QtGui/QPalette> #include <QtGui/QCursor> -#include <QtGui/QToolButton> +#include <QtWidgets/QToolButton> #include <QtGui/QPainter> -#include <QtGui/QStyle> -#include <QtGui/QStyleOption> +#include <QtWidgets/QStyle> +#include <QtWidgets/QStyleOption> #include <QtCore/QDebug> #include <QtCore/QPropertyAnimation> diff --git a/src/designer/src/lib/shared/filterwidget_p.h b/src/designer/src/lib/shared/filterwidget_p.h index 5b5edcd7c..18aca67cb 100644 --- a/src/designer/src/lib/shared/filterwidget_p.h +++ b/src/designer/src/lib/shared/filterwidget_p.h @@ -55,10 +55,10 @@ #include "shared_global_p.h" -#include <QtGui/QWidget> -#include <QtGui/QLineEdit> +#include <QtWidgets/QWidget> +#include <QtWidgets/QLineEdit> #include <QtGui/QColor> -#include <QtGui/QToolButton> +#include <QtWidgets/QToolButton> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/formlayoutmenu.cpp b/src/designer/src/lib/shared/formlayoutmenu.cpp index d52bb53f5..07ec5676f 100644 --- a/src/designer/src/lib/shared/formlayoutmenu.cpp +++ b/src/designer/src/lib/shared/formlayoutmenu.cpp @@ -54,12 +54,12 @@ #include <QtDesigner/QDesignerWidgetDataBaseInterface> #include <QtDesigner/QDesignerLanguageExtension> -#include <QtGui/QAction> -#include <QtGui/QWidget> -#include <QtGui/QFormLayout> -#include <QtGui/QUndoStack> -#include <QtGui/QDialog> -#include <QtGui/QPushButton> +#include <QtWidgets/QAction> +#include <QtWidgets/QWidget> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QUndoStack> +#include <QtWidgets/QDialog> +#include <QtWidgets/QPushButton> #include <QtGui/QRegExpValidator> #include <QtCore/QPair> diff --git a/src/designer/src/lib/shared/formwindowbase.cpp b/src/designer/src/lib/shared/formwindowbase.cpp index 5875ae953..79b0804d3 100644 --- a/src/designer/src/lib/shared/formwindowbase.cpp +++ b/src/designer/src/lib/shared/formwindowbase.cpp @@ -61,18 +61,18 @@ #include <QtCore/qdebug.h> #include <QtCore/QList> #include <QtCore/QTimer> -#include <QtGui/QMenu> -#include <QtGui/QListWidget> -#include <QtGui/QTreeWidget> -#include <QtGui/QTableWidget> -#include <QtGui/QComboBox> -#include <QtGui/QTabWidget> -#include <QtGui/QToolBox> -#include <QtGui/QToolBar> -#include <QtGui/QStatusBar> -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtGui/QLabel> +#include <QtWidgets/QMenu> +#include <QtWidgets/QListWidget> +#include <QtWidgets/QTreeWidget> +#include <QtWidgets/QTableWidget> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QTabWidget> +#include <QtWidgets/QToolBox> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QStatusBar> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QLabel> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/grid.cpp b/src/designer/src/lib/shared/grid.cpp index ba991c782..f40b95739 100644 --- a/src/designer/src/lib/shared/grid.cpp +++ b/src/designer/src/lib/shared/grid.cpp @@ -44,7 +44,7 @@ #include <QtCore/QString> #include <QtCore/QVector> #include <QtGui/QPainter> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtGui/qevent.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/gridpanel_p.h b/src/designer/src/lib/shared/gridpanel_p.h index adcfa3850..30aba0059 100644 --- a/src/designer/src/lib/shared/gridpanel_p.h +++ b/src/designer/src/lib/shared/gridpanel_p.h @@ -55,7 +55,7 @@ #include "shared_global_p.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/htmlhighlighter.cpp b/src/designer/src/lib/shared/htmlhighlighter.cpp index d16ce62aa..e423f7fd9 100644 --- a/src/designer/src/lib/shared/htmlhighlighter.cpp +++ b/src/designer/src/lib/shared/htmlhighlighter.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include <QtCore/QTextStream> +#include <QtWidgets/QTextEdit> #include "htmlhighlighter_p.h" @@ -48,7 +49,7 @@ QT_BEGIN_NAMESPACE namespace qdesigner_internal { HtmlHighlighter::HtmlHighlighter(QTextEdit *textEdit) - : QSyntaxHighlighter(textEdit) + : QSyntaxHighlighter(textEdit->document()) { QTextCharFormat entityFormat; entityFormat.setForeground(Qt::red); diff --git a/src/designer/src/lib/shared/htmlhighlighter_p.h b/src/designer/src/lib/shared/htmlhighlighter_p.h index 3c9bfc34b..9141e4ba8 100644 --- a/src/designer/src/lib/shared/htmlhighlighter_p.h +++ b/src/designer/src/lib/shared/htmlhighlighter_p.h @@ -57,6 +57,8 @@ QT_BEGIN_NAMESPACE +class QTextEdit; + namespace qdesigner_internal { /* HTML syntax highlighter based on Qt Quarterly example */ diff --git a/src/designer/src/lib/shared/iconloader.cpp b/src/designer/src/lib/shared/iconloader.cpp index b7f74b224..5b84040a0 100644 --- a/src/designer/src/lib/shared/iconloader.cpp +++ b/src/designer/src/lib/shared/iconloader.cpp @@ -42,7 +42,7 @@ #include "iconloader_p.h" #include <QtCore/QFile> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <QtGui/QPixmap> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/iconselector.cpp b/src/designer/src/lib/shared/iconselector.cpp index 10b5c9714..f485b9b66 100644 --- a/src/designer/src/lib/shared/iconselector.cpp +++ b/src/designer/src/lib/shared/iconselector.cpp @@ -53,21 +53,21 @@ #include <QtDesigner/QDesignerIntegrationInterface> #include <QtDesigner/QExtensionManager> -#include <QtGui/QToolButton> +#include <QtWidgets/QToolButton> #include <QtCore/QSignalMapper> -#include <QtGui/QComboBox> -#include <QtGui/QAction> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QPushButton> -#include <QtGui/QDialog> -#include <QtGui/QMenu> -#include <QtGui/QApplication> -#include <QtGui/QVBoxLayout> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QAction> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QDialog> +#include <QtWidgets/QMenu> +#include <QtWidgets/QApplication> +#include <QtWidgets/QVBoxLayout> #include <QtGui/QImageReader> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QVBoxLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QLabel> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QLabel> #include <QtGui/QValidator> #include <QtCore/QDebug> diff --git a/src/designer/src/lib/shared/iconselector_p.h b/src/designer/src/lib/shared/iconselector_p.h index 4f68b730f..0e076558b 100644 --- a/src/designer/src/lib/shared/iconselector_p.h +++ b/src/designer/src/lib/shared/iconselector_p.h @@ -56,8 +56,8 @@ #include "shared_global_p.h" -#include <QtGui/QWidget> -#include <QtGui/QDialog> +#include <QtWidgets/QWidget> +#include <QtWidgets/QDialog> #include <QtCore/QScopedPointer> diff --git a/src/designer/src/lib/shared/invisible_widget_p.h b/src/designer/src/lib/shared/invisible_widget_p.h index 04ca72458..baf861bcb 100644 --- a/src/designer/src/lib/shared/invisible_widget_p.h +++ b/src/designer/src/lib/shared/invisible_widget_p.h @@ -55,7 +55,7 @@ #include "shared_global_p.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/layout.cpp b/src/designer/src/lib/shared/layout.cpp index 9fe438b08..2799a8ad7 100644 --- a/src/designer/src/lib/shared/layout.cpp +++ b/src/designer/src/lib/shared/layout.cpp @@ -58,18 +58,18 @@ #include <QtCore/qdebug.h> #include <QtCore/QVector> -#include <QtGui/qevent.h> -#include <QtGui/QGridLayout> +#include <QtGui/QKeyEvent> +#include <QtWidgets/QGridLayout> #include <QtGui/QPainter> #include <QtGui/QBitmap> -#include <QtGui/QSplitter> -#include <QtGui/QMainWindow> -#include <QtGui/QApplication> -#include <QtGui/QScrollArea> -#include <QtGui/QFormLayout> -#include <QtGui/QLabel> -#include <QtGui/QWizardPage> -#include <QtGui/QWizard> +#include <QtWidgets/QSplitter> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QApplication> +#include <QtWidgets/QScrollArea> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QWizardPage> +#include <QtWidgets/QWizard> #include <QtCore/QDebug> #include <QtCore/QSet> diff --git a/src/designer/src/lib/shared/layout_p.h b/src/designer/src/lib/shared/layout_p.h index f901b63b9..286b71f0c 100644 --- a/src/designer/src/lib/shared/layout_p.h +++ b/src/designer/src/lib/shared/layout_p.h @@ -61,9 +61,9 @@ #include <QtCore/QMap> #include <QtCore/QHash> -#include <QtGui/QLayout> -#include <QtGui/QGridLayout> -#include <QtGui/QWidget> +#include <QtWidgets/QLayout> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/layoutinfo.cpp b/src/designer/src/lib/shared/layoutinfo.cpp index 3d0e64250..7a25912bf 100644 --- a/src/designer/src/lib/shared/layoutinfo.cpp +++ b/src/designer/src/lib/shared/layoutinfo.cpp @@ -46,9 +46,9 @@ #include <QtDesigner/QDesignerMetaDataBaseInterface> #include <QtDesigner/QExtensionManager> -#include <QtGui/QHBoxLayout> -#include <QtGui/QFormLayout> -#include <QtGui/QSplitter> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QSplitter> #include <QtCore/QDebug> #include <QtCore/QHash> #include <QtCore/QRect> diff --git a/src/designer/src/lib/shared/metadatabase.cpp b/src/designer/src/lib/shared/metadatabase.cpp index 3cde7da13..6666a8306 100644 --- a/src/designer/src/lib/shared/metadatabase.cpp +++ b/src/designer/src/lib/shared/metadatabase.cpp @@ -46,7 +46,7 @@ #include <QtDesigner/QDesignerFormEditorInterface> // Qt -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtCore/qalgorithms.h> #include <QtCore/qdebug.h> diff --git a/src/designer/src/lib/shared/morphmenu.cpp b/src/designer/src/lib/shared/morphmenu.cpp index 67121e597..4c18b2c36 100644 --- a/src/designer/src/lib/shared/morphmenu.cpp +++ b/src/designer/src/lib/shared/morphmenu.cpp @@ -56,24 +56,24 @@ #include <QtDesigner/QDesignerMetaDataBaseInterface> #include <QtDesigner/QDesignerPropertySheetExtension> -#include <QtGui/QWidget> -#include <QtGui/QAction> -#include <QtGui/QMenu> -#include <QtGui/QApplication> -#include <QtGui/QLayout> -#include <QtGui/QUndoStack> - -#include <QtGui/QFrame> -#include <QtGui/QGroupBox> -#include <QtGui/QTabWidget> -#include <QtGui/QStackedWidget> -#include <QtGui/QToolBox> -#include <QtGui/QAbstractItemView> -#include <QtGui/QAbstractButton> -#include <QtGui/QAbstractSpinBox> -#include <QtGui/QTextEdit> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QLabel> +#include <QtWidgets/QWidget> +#include <QtWidgets/QAction> +#include <QtWidgets/QMenu> +#include <QtWidgets/QApplication> +#include <QtWidgets/QLayout> +#include <QtWidgets/QUndoStack> + +#include <QtWidgets/QFrame> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QTabWidget> +#include <QtWidgets/QStackedWidget> +#include <QtWidgets/QToolBox> +#include <QtWidgets/QAbstractItemView> +#include <QtWidgets/QAbstractButton> +#include <QtWidgets/QAbstractSpinBox> +#include <QtWidgets/QTextEdit> +#include <QtWidgets/QPlainTextEdit> +#include <QtWidgets/QLabel> #include <QtCore/QStringList> #include <QtCore/QMap> diff --git a/src/designer/src/lib/shared/newactiondialog.cpp b/src/designer/src/lib/shared/newactiondialog.cpp index 9aaa347c7..92938a8e3 100644 --- a/src/designer/src/lib/shared/newactiondialog.cpp +++ b/src/designer/src/lib/shared/newactiondialog.cpp @@ -50,7 +50,7 @@ #include <QtDesigner/abstractformwindow.h> #include <QtDesigner/abstractformeditor.h> -#include <QtGui/QPushButton> +#include <QtWidgets/QPushButton> #include <QtCore/QRegExp> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/newactiondialog_p.h b/src/designer/src/lib/shared/newactiondialog_p.h index b06d1f9a5..2772b6c28 100644 --- a/src/designer/src/lib/shared/newactiondialog_p.h +++ b/src/designer/src/lib/shared/newactiondialog_p.h @@ -55,7 +55,7 @@ #include "qdesigner_utils_p.h" // PropertySheetIconValue -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include <QtGui/QKeySequence> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp index 150d97104..330bbeccc 100644 --- a/src/designer/src/lib/shared/newformwidget.cpp +++ b/src/designer/src/lib/shared/newformwidget.cpp @@ -61,10 +61,10 @@ #include <QtCore/QDir> #include <QtCore/QTextStream> -#include <QtGui/QHeaderView> -#include <QtGui/QTreeWidgetItem> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QTreeWidgetItem> #include <QtGui/QPainter> -#include <QtGui/QPushButton> +#include <QtWidgets/QPushButton> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/newformwidget_p.h b/src/designer/src/lib/shared/newformwidget_p.h index a840c9ad8..6eaa3c46b 100644 --- a/src/designer/src/lib/shared/newformwidget_p.h +++ b/src/designer/src/lib/shared/newformwidget_p.h @@ -58,7 +58,7 @@ #include <QtDesigner/QDesignerNewFormWidgetInterface> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtGui/QPixmap> #include <QtCore/QStringList> diff --git a/src/designer/src/lib/shared/orderdialog.cpp b/src/designer/src/lib/shared/orderdialog.cpp index e992fdd34..c853c24e5 100644 --- a/src/designer/src/lib/shared/orderdialog.cpp +++ b/src/designer/src/lib/shared/orderdialog.cpp @@ -48,7 +48,7 @@ #include <QtDesigner/QDesignerContainerExtension> #include <QtCore/QAbstractItemModel> #include <QtCore/QModelIndex> -#include <QtGui/QPushButton> +#include <QtWidgets/QPushButton> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/orderdialog_p.h b/src/designer/src/lib/shared/orderdialog_p.h index 00d76fb15..33ef469a6 100644 --- a/src/designer/src/lib/shared/orderdialog_p.h +++ b/src/designer/src/lib/shared/orderdialog_p.h @@ -55,7 +55,7 @@ #include "shared_global_p.h" -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include <QtCore/QMap> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/plaintexteditor.cpp b/src/designer/src/lib/shared/plaintexteditor.cpp index 88b0b57aa..f1ffb5cde 100644 --- a/src/designer/src/lib/shared/plaintexteditor.cpp +++ b/src/designer/src/lib/shared/plaintexteditor.cpp @@ -44,10 +44,10 @@ #include <QtDesigner/QDesignerSettingsInterface> #include <QtDesigner/QDesignerFormEditorInterface> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QVBoxLayout> -#include <QtGui/QPushButton> +#include <QtWidgets/QPlainTextEdit> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QPushButton> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/plaintexteditor_p.h b/src/designer/src/lib/shared/plaintexteditor_p.h index 830207bbd..78a624110 100644 --- a/src/designer/src/lib/shared/plaintexteditor_p.h +++ b/src/designer/src/lib/shared/plaintexteditor_p.h @@ -53,7 +53,7 @@ #ifndef PLAINTEXTEDITOR_H #define PLAINTEXTEDITOR_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> #include "shared_global_p.h" QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/plugindialog.cpp b/src/designer/src/lib/shared/plugindialog.cpp index c4cdccf77..686d5f49a 100644 --- a/src/designer/src/lib/shared/plugindialog.cpp +++ b/src/designer/src/lib/shared/plugindialog.cpp @@ -48,9 +48,9 @@ #include <QtDesigner/QDesignerCustomWidgetCollectionInterface> #include <QtDesigner/QDesignerWidgetDataBaseInterface> -#include <QtGui/QStyle> -#include <QtGui/QHeaderView> -#include <QtGui/QPushButton> +#include <QtWidgets/QStyle> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QPushButton> #include <QtCore/QFileInfo> #include <QtCore/QPluginLoader> diff --git a/src/designer/src/lib/shared/previewconfigurationwidget.cpp b/src/designer/src/lib/shared/previewconfigurationwidget.cpp index a65c3af9d..25253233d 100644 --- a/src/designer/src/lib/shared/previewconfigurationwidget.cpp +++ b/src/designer/src/lib/shared/previewconfigurationwidget.cpp @@ -51,10 +51,10 @@ #include <QtDesigner/QDesignerSettingsInterface> -#include <QtGui/QFileDialog> -#include <QtGui/QStyleFactory> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QStyleFactory> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QMessageBox> #include <QtCore/QPair> #include <QtCore/QList> #include <QtCore/QDebug> diff --git a/src/designer/src/lib/shared/previewconfigurationwidget_p.h b/src/designer/src/lib/shared/previewconfigurationwidget_p.h index 21ea1f197..9f475adf9 100644 --- a/src/designer/src/lib/shared/previewconfigurationwidget_p.h +++ b/src/designer/src/lib/shared/previewconfigurationwidget_p.h @@ -55,7 +55,7 @@ #include "shared_global_p.h" -#include <QtGui/QGroupBox> +#include <QtWidgets/QGroupBox> #include <QtCore/QSharedDataPointer> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/previewmanager.cpp b/src/designer/src/lib/shared/previewmanager.cpp index 47a732a32..1bdfed7ec 100644 --- a/src/designer/src/lib/shared/previewmanager.cpp +++ b/src/designer/src/lib/shared/previewmanager.cpp @@ -54,18 +54,18 @@ #include <QtDesigner/QDesignerFormWindowManagerInterface> #include <QtDesigner/QDesignerSettingsInterface> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtGui/qevent.h> -#include <QtGui/QDesktopWidget> -#include <QtGui/QMainWindow> -#include <QtGui/QDockWidget> -#include <QtGui/QApplication> +#include <QtWidgets/QDesktopWidget> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QDockWidget> +#include <QtWidgets/QApplication> #include <QtGui/QPixmap> -#include <QtGui/QVBoxLayout> -#include <QtGui/QDialog> -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtGui/QActionGroup> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QDialog> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QActionGroup> #include <QtGui/QCursor> #include <QtGui/QMatrix> diff --git a/src/designer/src/lib/shared/promotionmodel.cpp b/src/designer/src/lib/shared/promotionmodel.cpp index deab66fa1..d9485db5e 100644 --- a/src/designer/src/lib/shared/promotionmodel.cpp +++ b/src/designer/src/lib/shared/promotionmodel.cpp @@ -46,7 +46,7 @@ #include <QtDesigner/QDesignerPromotionInterface> #include <QtDesigner/QDesignerFormEditorInterface> -#include <QtGui/QStandardItem> +#include <QtWidgets/QStandardItem> #include <QtCore/QCoreApplication> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/promotionmodel_p.h b/src/designer/src/lib/shared/promotionmodel_p.h index 214efb135..80664c930 100644 --- a/src/designer/src/lib/shared/promotionmodel_p.h +++ b/src/designer/src/lib/shared/promotionmodel_p.h @@ -53,7 +53,7 @@ #ifndef PROMOTIONMODEL_H #define PROMOTIONMODEL_H -#include <QtGui/QStandardItemModel> +#include <QtWidgets/QStandardItemModel> #include <QtCore/QSet> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/promotiontaskmenu.cpp b/src/designer/src/lib/shared/promotiontaskmenu.cpp index dc76ef6cf..540316b26 100644 --- a/src/designer/src/lib/shared/promotiontaskmenu.cpp +++ b/src/designer/src/lib/shared/promotiontaskmenu.cpp @@ -55,9 +55,9 @@ #include <QtDesigner/QDesignerFormEditorInterface> #include <QtDesigner/QExtensionManager> -#include <QtGui/QAction> -#include <QtGui/QWidget> -#include <QtGui/QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QWidget> +#include <QtWidgets/QMenu> #include <QtCore/QSignalMapper> #include <QtCore/qdebug.h> diff --git a/src/designer/src/lib/shared/propertylineedit.cpp b/src/designer/src/lib/shared/propertylineedit.cpp index 29dff63ab..17daef514 100644 --- a/src/designer/src/lib/shared/propertylineedit.cpp +++ b/src/designer/src/lib/shared/propertylineedit.cpp @@ -43,7 +43,7 @@ #include <QtGui/QContextMenuEvent> #include <QtGui/QKeyEvent> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/propertylineedit_p.h b/src/designer/src/lib/shared/propertylineedit_p.h index b968b18bf..2a5930d5f 100644 --- a/src/designer/src/lib/shared/propertylineedit_p.h +++ b/src/designer/src/lib/shared/propertylineedit_p.h @@ -55,7 +55,7 @@ #include "shared_global_p.h" -#include <QtGui/QLineEdit> +#include <QtWidgets/QLineEdit> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_command.cpp b/src/designer/src/lib/shared/qdesigner_command.cpp index f4e250d89..6f9d45dc5 100644 --- a/src/designer/src/lib/shared/qdesigner_command.cpp +++ b/src/designer/src/lib/shared/qdesigner_command.cpp @@ -67,22 +67,22 @@ #include <QtCore/QTextStream> #include <QtCore/QQueue> -#include <QtGui/QMenuBar> -#include <QtGui/QStatusBar> -#include <QtGui/QToolBar> -#include <QtGui/QToolBox> -#include <QtGui/QStackedWidget> -#include <QtGui/QTabWidget> -#include <QtGui/QTableWidget> -#include <QtGui/QTreeWidget> -#include <QtGui/QListWidget> -#include <QtGui/QComboBox> -#include <QtGui/QSplitter> -#include <QtGui/QDockWidget> -#include <QtGui/QMainWindow> -#include <QtGui/QWizardPage> -#include <QtGui/QApplication> -#include <QtGui/QFormLayout> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QStatusBar> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QToolBox> +#include <QtWidgets/QStackedWidget> +#include <QtWidgets/QTabWidget> +#include <QtWidgets/QTableWidget> +#include <QtWidgets/QTreeWidget> +#include <QtWidgets/QListWidget> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QSplitter> +#include <QtWidgets/QDockWidget> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QWizardPage> +#include <QtWidgets/QApplication> +#include <QtWidgets/QFormLayout> Q_DECLARE_METATYPE(QWidgetList) diff --git a/src/designer/src/lib/shared/qdesigner_command2.cpp b/src/designer/src/lib/shared/qdesigner_command2.cpp index 2b0a5a21a..e69edb710 100644 --- a/src/designer/src/lib/shared/qdesigner_command2.cpp +++ b/src/designer/src/lib/shared/qdesigner_command2.cpp @@ -49,8 +49,8 @@ #include <QtDesigner/QDesignerFormEditorInterface> #include <QtDesigner/QDesignerMetaDataBaseInterface> -#include <QtGui/QApplication> -#include <QtGui/QLayout> +#include <QtWidgets/QApplication> +#include <QtWidgets/QLayout> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_command2_p.h b/src/designer/src/lib/shared/qdesigner_command2_p.h index 0a6cce88e..d83a7f88c 100644 --- a/src/designer/src/lib/shared/qdesigner_command2_p.h +++ b/src/designer/src/lib/shared/qdesigner_command2_p.h @@ -56,7 +56,7 @@ #include "shared_global_p.h" #include "qdesigner_formwindowcommand_p.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_command_p.h b/src/designer/src/lib/shared/qdesigner_command_p.h index 323cec5e5..3b40a3b3b 100644 --- a/src/designer/src/lib/shared/qdesigner_command_p.h +++ b/src/designer/src/lib/shared/qdesigner_command_p.h @@ -62,7 +62,7 @@ #include <QtDesigner/layoutdecoration.h> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <QtCore/QObject> #include <QtCore/QPair> #include <QtCore/QMap> diff --git a/src/designer/src/lib/shared/qdesigner_dnditem.cpp b/src/designer/src/lib/shared/qdesigner_dnditem.cpp index 83218026a..2b726c427 100644 --- a/src/designer/src/lib/shared/qdesigner_dnditem.cpp +++ b/src/designer/src/lib/shared/qdesigner_dnditem.cpp @@ -47,7 +47,7 @@ #include <QtGui/QBitmap> #include <QtGui/QPixmap> #include <QtGui/QImage> -#include <QtGui/QLabel> +#include <QtWidgets/QLabel> #include <QtGui/QDrag> #include <QtGui/QCursor> #include <QtGui/QDropEvent> diff --git a/src/designer/src/lib/shared/qdesigner_dockwidget.cpp b/src/designer/src/lib/shared/qdesigner_dockwidget.cpp index 8aad4579c..f3e98b059 100644 --- a/src/designer/src/lib/shared/qdesigner_dockwidget.cpp +++ b/src/designer/src/lib/shared/qdesigner_dockwidget.cpp @@ -48,8 +48,8 @@ #include <QtDesigner/QExtensionManager> #include <QtDesigner/QDesignerFormWindowCursorInterface> -#include <QtGui/QMainWindow> -#include <QtGui/QLayout> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QLayout> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_dockwidget_p.h b/src/designer/src/lib/shared/qdesigner_dockwidget_p.h index 106ed1fb6..4587b5f54 100644 --- a/src/designer/src/lib/shared/qdesigner_dockwidget_p.h +++ b/src/designer/src/lib/shared/qdesigner_dockwidget_p.h @@ -54,7 +54,7 @@ #define QDESIGNER_DOCKWIDGET_H #include "shared_global_p.h" -#include <QtGui/QDockWidget> +#include <QtWidgets/QDockWidget> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp index a11514734..8c63ac990 100644 --- a/src/designer/src/lib/shared/qdesigner_formbuilder.cpp +++ b/src/designer/src/lib/shared/qdesigner_formbuilder.cpp @@ -65,16 +65,16 @@ #include <qtresourcemodel_p.h> #include <scripterrordialog_p.h> -#include <QtGui/QWidget> -#include <QtGui/QMenu> -#include <QtGui/QToolBar> -#include <QtGui/QMenuBar> -#include <QtGui/QMainWindow> -#include <QtGui/QStyleFactory> -#include <QtGui/QStyle> -#include <QtGui/QApplication> -#include <QtGui/QAbstractScrollArea> -#include <QtGui/QMessageBox> +#include <QtWidgets/QWidget> +#include <QtWidgets/QMenu> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QStyleFactory> +#include <QtWidgets/QStyle> +#include <QtWidgets/QApplication> +#include <QtWidgets/QAbstractScrollArea> +#include <QtWidgets/QMessageBox> #include <QtGui/QPixmap> #include <QtCore/QBuffer> diff --git a/src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h b/src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h index 7b88be9e6..54ff39fa9 100644 --- a/src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h +++ b/src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h @@ -55,7 +55,7 @@ #include "shared_global_p.h" #include <QtCore/QPointer> -#include <QtGui/QUndoCommand> +#include <QtWidgets/QUndoCommand> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_formwindowcommand.cpp b/src/designer/src/lib/shared/qdesigner_formwindowcommand.cpp index 3efc82994..0c9e58188 100644 --- a/src/designer/src/lib/shared/qdesigner_formwindowcommand.cpp +++ b/src/designer/src/lib/shared/qdesigner_formwindowcommand.cpp @@ -54,8 +54,8 @@ #include <QtDesigner/QExtensionManager> #include <QtCore/QVariant> -#include <QtGui/QWidget> -#include <QtGui/QLabel> +#include <QtWidgets/QWidget> +#include <QtWidgets/QLabel> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h b/src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h index 7c98559e3..ed34d2b00 100644 --- a/src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h +++ b/src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h @@ -56,7 +56,7 @@ #include "shared_global_p.h" #include <QtCore/QPointer> -#include <QtGui/QUndoCommand> +#include <QtWidgets/QUndoCommand> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_membersheet.cpp b/src/designer/src/lib/shared/qdesigner_membersheet.cpp index f70fc389b..688c999a9 100644 --- a/src/designer/src/lib/shared/qdesigner_membersheet.cpp +++ b/src/designer/src/lib/shared/qdesigner_membersheet.cpp @@ -44,7 +44,7 @@ #include <QtDesigner/QDesignerFormEditorInterface> #include <abstractintrospection_p.h> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> namespace { diff --git a/src/designer/src/lib/shared/qdesigner_menu.cpp b/src/designer/src/lib/shared/qdesigner_menu.cpp index e9abf30cd..4abe68718 100644 --- a/src/designer/src/lib/shared/qdesigner_menu.cpp +++ b/src/designer/src/lib/shared/qdesigner_menu.cpp @@ -58,13 +58,14 @@ #include <QtDesigner/QDesignerMetaDataBaseInterface> #include <QtDesigner/QExtensionManager> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QLineEdit> +#include <QtWidgets/QAction> +#include <QtWidgets/QApplication> +#include <QtWidgets/QLineEdit> #include <QtGui/QPainter> -#include <QtGui/QRubberBand> -#include <QtGui/QToolTip> -#include <QtGui/QToolBar> +#include <QtGui/QDrag> +#include <QtWidgets/QRubberBand> +#include <QtWidgets/QToolTip> +#include <QtWidgets/QToolBar> #include <QtGui/qevent.h> Q_DECLARE_METATYPE(QAction*) diff --git a/src/designer/src/lib/shared/qdesigner_menu_p.h b/src/designer/src/lib/shared/qdesigner_menu_p.h index b88af7aac..03c6f0ff3 100644 --- a/src/designer/src/lib/shared/qdesigner_menu_p.h +++ b/src/designer/src/lib/shared/qdesigner_menu_p.h @@ -55,8 +55,8 @@ #include "shared_global_p.h" -#include <QtGui/QAction> -#include <QtGui/QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QMenu> #include <QtGui/QPixmap> #include <QtCore/QHash> diff --git a/src/designer/src/lib/shared/qdesigner_menubar.cpp b/src/designer/src/lib/shared/qdesigner_menubar.cpp index 534cf0cda..4c850012a 100644 --- a/src/designer/src/lib/shared/qdesigner_menubar.cpp +++ b/src/designer/src/lib/shared/qdesigner_menubar.cpp @@ -59,9 +59,9 @@ #include <QtCore/qdebug.h> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QDrag> -#include <QtGui/QLineEdit> +#include <QtWidgets/QLineEdit> #include <QtGui/QPainter> #include <QtGui/qevent.h> diff --git a/src/designer/src/lib/shared/qdesigner_menubar_p.h b/src/designer/src/lib/shared/qdesigner_menubar_p.h index 8ca538559..3c65a24bf 100644 --- a/src/designer/src/lib/shared/qdesigner_menubar_p.h +++ b/src/designer/src/lib/shared/qdesigner_menubar_p.h @@ -55,8 +55,8 @@ #include "shared_global_p.h" -#include <QtGui/QAction> -#include <QtGui/QMenuBar> +#include <QtWidgets/QAction> +#include <QtWidgets/QMenuBar> #include <QtCore/QPointer> #include <QtCore/QMimeData> diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp index 6463016b1..730c8cc2f 100644 --- a/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp +++ b/src/designer/src/lib/shared/qdesigner_promotiondialog.cpp @@ -53,23 +53,23 @@ #include <abstractdialoggui_p.h> #include <QtCore/QTimer> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QFormLayout> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QTreeView> -#include <QtGui/QHeaderView> -#include <QtGui/QPushButton> -#include <QtGui/QItemSelectionModel> -#include <QtGui/QItemSelection> -#include <QtGui/QComboBox> -#include <QtGui/QLineEdit> -#include <QtGui/QCheckBox> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QTreeView> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QItemSelectionModel> +#include <QtWidgets/QItemSelection> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QCheckBox> #include <QtGui/QRegExpValidator> -#include <QtGui/QLabel> -#include <QtGui/QSpacerItem> -#include <QtGui/QMenu> -#include <QtGui/QAction> +#include <QtWidgets/QLabel> +#include <QtWidgets/QSpacerItem> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_promotiondialog_p.h b/src/designer/src/lib/shared/qdesigner_promotiondialog_p.h index 73cf7ad50..65d3dc1b1 100644 --- a/src/designer/src/lib/shared/qdesigner_promotiondialog_p.h +++ b/src/designer/src/lib/shared/qdesigner_promotiondialog_p.h @@ -53,8 +53,8 @@ #ifndef PROMOTIONEDITORDIALOG_H #define PROMOTIONEDITORDIALOG_H -#include <QtGui/QDialog> -#include <QtGui/QGroupBox> +#include <QtWidgets/QDialog> +#include <QtWidgets/QGroupBox> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp index c145f0d2d..56f93a1d1 100644 --- a/src/designer/src/lib/shared/qdesigner_propertycommand.cpp +++ b/src/designer/src/lib/shared/qdesigner_propertycommand.cpp @@ -60,12 +60,12 @@ #include <QtCore/QSize> #include <QtCore/QTextStream> -#include <QtGui/QWidget> -#include <QtGui/QApplication> -#include <QtGui/QAction> -#include <QtGui/QDialog> -#include <QtGui/QPushButton> -#include <QtGui/QLayout> +#include <QtWidgets/QWidget> +#include <QtWidgets/QApplication> +#include <QtWidgets/QAction> +#include <QtWidgets/QDialog> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QLayout> #include <qdebug.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp b/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp index e3a92e289..c1c7c4b95 100644 --- a/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp +++ b/src/designer/src/lib/shared/qdesigner_propertyeditor.cpp @@ -44,9 +44,9 @@ #include <QtDesigner/QDesignerFormEditorInterface> #include <widgetfactory_p.h> -#include <QtGui/QAction> -#include <QtGui/QLineEdit> -#include <QtGui/QAbstractButton> +#include <QtWidgets/QAction> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QAbstractButton> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp index 4d9c65a29..771306e9f 100644 --- a/src/designer/src/lib/shared/qdesigner_propertysheet.cpp +++ b/src/designer/src/lib/shared/qdesigner_propertysheet.cpp @@ -54,16 +54,16 @@ #include <QtCore/QDebug> -#include <QtGui/QLayout> -#include <QtGui/QDockWidget> -#include <QtGui/QDialog> -#include <QtGui/QLabel> -#include <QtGui/QGroupBox> -#include <QtGui/QStyle> -#include <QtGui/QApplication> -#include <QtGui/QToolBar> -#include <QtGui/QMainWindow> -#include <QtGui/QMenuBar> +#include <QtWidgets/QLayout> +#include <QtWidgets/QDockWidget> +#include <QtWidgets/QDialog> +#include <QtWidgets/QLabel> +#include <QtWidgets/QGroupBox> +#include <QtWidgets/QStyle> +#include <QtWidgets/QApplication> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QMenuBar> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_stackedbox.cpp b/src/designer/src/lib/shared/qdesigner_stackedbox.cpp index 0206e9709..9c65a605f 100644 --- a/src/designer/src/lib/shared/qdesigner_stackedbox.cpp +++ b/src/designer/src/lib/shared/qdesigner_stackedbox.cpp @@ -48,11 +48,11 @@ #include <QtDesigner/QDesignerFormWindowInterface> -#include <QtGui/QToolButton> -#include <QtGui/QAction> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QAction> #include <QtGui/qevent.h> -#include <QtGui/QMenu> -#include <QtGui/QStackedWidget> +#include <QtWidgets/QMenu> +#include <QtWidgets/QStackedWidget> #include <QtCore/QDebug> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp index 6110deaba..393a18e7a 100644 --- a/src/designer/src/lib/shared/qdesigner_tabwidget.cpp +++ b/src/designer/src/lib/shared/qdesigner_tabwidget.cpp @@ -47,13 +47,14 @@ #include <QtDesigner/QDesignerFormWindowInterface> -#include <QtGui/QApplication> -#include <QtGui/QTabBar> -#include <QtGui/QAction> +#include <QtWidgets/QApplication> +#include <QtWidgets/QTabBar> +#include <QtWidgets/QAction> #include <QtGui/QMouseEvent> -#include <QtGui/QMenu> -#include <QtGui/QLabel> -#include <QtGui/QTabWidget> +#include <QtGui/QDrag> +#include <QtWidgets/QMenu> +#include <QtWidgets/QLabel> +#include <QtWidgets/QTabWidget> #include <QtCore/qdebug.h> diff --git a/src/designer/src/lib/shared/qdesigner_tabwidget_p.h b/src/designer/src/lib/shared/qdesigner_tabwidget_p.h index 23140a600..6fd503128 100644 --- a/src/designer/src/lib/shared/qdesigner_tabwidget_p.h +++ b/src/designer/src/lib/shared/qdesigner_tabwidget_p.h @@ -58,7 +58,7 @@ #include "qdesigner_utils_p.h" #include <QtCore/QPointer> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp index d6aef71ef..717217294 100644 --- a/src/designer/src/lib/shared/qdesigner_taskmenu.cpp +++ b/src/designer/src/lib/shared/qdesigner_taskmenu.cpp @@ -75,16 +75,16 @@ #include <QtDesigner/QDesignerIntegrationInterface> #include <QtDesigner/QExtensionManager> -#include <QtGui/QAction> -#include <QtGui/QActionGroup> -#include <QtGui/QWidget> -#include <QtGui/QMenuBar> -#include <QtGui/QMainWindow> -#include <QtGui/QStatusBar> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QVBoxLayout> -#include <QtGui/QPushButton> -#include <QtGui/QUndoStack> +#include <QtWidgets/QAction> +#include <QtWidgets/QActionGroup> +#include <QtWidgets/QWidget> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QStatusBar> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QUndoStack> #include <QtCore/QDebug> #include <QtCore/QSignalMapper> #include <QtCore/QCoreApplication> diff --git a/src/designer/src/lib/shared/qdesigner_toolbar.cpp b/src/designer/src/lib/shared/qdesigner_toolbar.cpp index 0fe730384..73da5a677 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbar.cpp +++ b/src/designer/src/lib/shared/qdesigner_toolbar.cpp @@ -54,13 +54,14 @@ #include <QtDesigner/QExtensionManager> #include <QtDesigner/QDesignerWidgetFactoryInterface> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QToolButton> -#include <QtGui/QToolBar> -#include <QtGui/QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QApplication> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QMenu> #include <QtGui/qevent.h> -#include <QtGui/QApplication> +#include <QtGui/QDrag> +#include <QtWidgets/QApplication> #include <QtCore/QDebug> Q_DECLARE_METATYPE(QAction*) diff --git a/src/designer/src/lib/shared/qdesigner_toolbar_p.h b/src/designer/src/lib/shared/qdesigner_toolbar_p.h index 7a38ec773..f16647f14 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbar_p.h +++ b/src/designer/src/lib/shared/qdesigner_toolbar_p.h @@ -55,8 +55,8 @@ #include "shared_global_p.h" -#include <QtGui/QAction> -#include <QtGui/QToolButton> +#include <QtWidgets/QAction> +#include <QtWidgets/QToolButton> #include <QtCore/QList> #include <QtCore/QPoint> diff --git a/src/designer/src/lib/shared/qdesigner_toolbox.cpp b/src/designer/src/lib/shared/qdesigner_toolbox.cpp index 675e98c36..1143a57a8 100644 --- a/src/designer/src/lib/shared/qdesigner_toolbox.cpp +++ b/src/designer/src/lib/shared/qdesigner_toolbox.cpp @@ -48,11 +48,11 @@ #include <QtDesigner/QDesignerFormWindowInterface> #include <QtCore/QEvent> -#include <QtGui/QAction> -#include <QtGui/QToolBox> -#include <QtGui/QMenu> -#include <QtGui/QLayout> -#include <QtGui/QApplication> +#include <QtWidgets/QAction> +#include <QtWidgets/QToolBox> +#include <QtWidgets/QMenu> +#include <QtWidgets/QLayout> +#include <QtWidgets/QApplication> #include <QtGui/QContextMenuEvent> #include <QtCore/QHash> diff --git a/src/designer/src/lib/shared/qdesigner_utils.cpp b/src/designer/src/lib/shared/qdesigner_utils.cpp index a7c11bd82..f54c6b515 100644 --- a/src/designer/src/lib/shared/qdesigner_utils.cpp +++ b/src/designer/src/lib/shared/qdesigner_utils.cpp @@ -58,13 +58,13 @@ #include <QtCore/QQueue> #include <QtCore/QSharedData> -#include <QtGui/QApplication> -#include <QtGui/QIcon> +#include <QtWidgets/QApplication> +#include <QtWidgets/QIcon> #include <QtGui/QPixmap> -#include <QtGui/QListWidget> -#include <QtGui/QTreeWidget> -#include <QtGui/QTableWidget> -#include <QtGui/QComboBox> +#include <QtWidgets/QListWidget> +#include <QtWidgets/QTreeWidget> +#include <QtWidgets/QTableWidget> +#include <QtWidgets/QComboBox> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_utils_p.h b/src/designer/src/lib/shared/qdesigner_utils_p.h index 1c915e036..5506765c6 100644 --- a/src/designer/src/lib/shared/qdesigner_utils_p.h +++ b/src/designer/src/lib/shared/qdesigner_utils_p.h @@ -60,8 +60,8 @@ #include <QtCore/QVariant> #include <QtCore/QSharedDataPointer> #include <QtCore/QMap> -#include <QtGui/QMainWindow> -#include <QtGui/QIcon> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QIcon> #include <QtGui/QPixmap> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_widget.cpp b/src/designer/src/lib/shared/qdesigner_widget.cpp index 0368d5337..8392744ba 100644 --- a/src/designer/src/lib/shared/qdesigner_widget.cpp +++ b/src/designer/src/lib/shared/qdesigner_widget.cpp @@ -45,8 +45,8 @@ #include <QtDesigner/QDesignerFormWindowInterface> #include <QtGui/QPainter> -#include <QtGui/QStyle> -#include <QtGui/QStyleOption> +#include <QtWidgets/QStyle> +#include <QtWidgets/QStyleOption> #include <QtGui/qevent.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_widget_p.h b/src/designer/src/lib/shared/qdesigner_widget_p.h index bb511ae4b..f27056ce7 100644 --- a/src/designer/src/lib/shared/qdesigner_widget_p.h +++ b/src/designer/src/lib/shared/qdesigner_widget_p.h @@ -54,8 +54,8 @@ #define QDESIGNER_WIDGET_H #include "shared_global_p.h" -#include <QtGui/QDialog> -#include <QtGui/QLabel> +#include <QtWidgets/QDialog> +#include <QtWidgets/QLabel> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qdesigner_widgetitem.cpp b/src/designer/src/lib/shared/qdesigner_widgetitem.cpp index c58822957..a0d8e6489 100644 --- a/src/designer/src/lib/shared/qdesigner_widgetitem.cpp +++ b/src/designer/src/lib/shared/qdesigner_widgetitem.cpp @@ -49,11 +49,11 @@ #include <QtDesigner/QDesignerContainerExtension> #include <QtDesigner/QDesignerWidgetDataBaseInterface> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QGridLayout> -#include <QtGui/QFormLayout> -#include <QtGui/QApplication> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QApplication> #include <QtCore/QTextStream> #include <QtCore/QDebug> diff --git a/src/designer/src/lib/shared/qdesigner_widgetitem_p.h b/src/designer/src/lib/shared/qdesigner_widgetitem_p.h index f79dbc5a1..5eb8297ab 100644 --- a/src/designer/src/lib/shared/qdesigner_widgetitem_p.h +++ b/src/designer/src/lib/shared/qdesigner_widgetitem_p.h @@ -55,7 +55,7 @@ #include "shared_global_p.h" -#include <QtGui/QLayoutItem> +#include <QtWidgets/QLayoutItem> #include <QtCore/QObject> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qlayout_widget.cpp b/src/designer/src/lib/shared/qlayout_widget.cpp index 66e7a795b..d1a3b55ae 100644 --- a/src/designer/src/lib/shared/qlayout_widget.cpp +++ b/src/designer/src/lib/shared/qlayout_widget.cpp @@ -53,10 +53,10 @@ #include <QtDesigner/QDesignerWidgetFactoryInterface> #include <QtGui/QPainter> -#include <QtGui/QHBoxLayout> -#include <QtGui/QVBoxLayout> -#include <QtGui/QGridLayout> -#include <QtGui/QFormLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QFormLayout> #include <QtGui/qevent.h> #include <QtCore/qdebug.h> diff --git a/src/designer/src/lib/shared/qlayout_widget_p.h b/src/designer/src/lib/shared/qlayout_widget_p.h index a87679e75..24f883521 100644 --- a/src/designer/src/lib/shared/qlayout_widget_p.h +++ b/src/designer/src/lib/shared/qlayout_widget_p.h @@ -59,8 +59,8 @@ #include <QtCore/QPointer> #include <QtCore/QVariant> -#include <QtGui/QWidget> -#include <QtGui/QLayout> +#include <QtWidgets/QWidget> +#include <QtWidgets/QLayout> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qsimpleresource.cpp b/src/designer/src/lib/shared/qsimpleresource.cpp index cced5954e..9fc513e4b 100644 --- a/src/designer/src/lib/shared/qsimpleresource.cpp +++ b/src/designer/src/lib/shared/qsimpleresource.cpp @@ -54,9 +54,9 @@ #include <QtDesigner/QDesignerCustomWidgetInterface> #include <QtDesigner/extrainfo.h> -#include <QtGui/QIcon> -#include <QtGui/QWidget> -#include <QtGui/QAction> +#include <QtWidgets/QIcon> +#include <QtWidgets/QWidget> +#include <QtWidgets/QAction> #include <QtCore/QDebug> #include <QtCore/QCoreApplication> diff --git a/src/designer/src/lib/shared/qtresourceeditordialog.cpp b/src/designer/src/lib/shared/qtresourceeditordialog.cpp index 1f6838eb0..3aa49a260 100644 --- a/src/designer/src/lib/shared/qtresourceeditordialog.cpp +++ b/src/designer/src/lib/shared/qtresourceeditordialog.cpp @@ -53,12 +53,12 @@ #include <QtCore/QDir> #include <QtCore/QCoreApplication> #include <QtXml/QDomDocument> -#include <QtGui/QMenu> -#include <QtGui/QHeaderView> -#include <QtGui/QInputDialog> -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> -#include <QtGui/QStandardItemModel> +#include <QtWidgets/QMenu> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QInputDialog> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QStandardItemModel> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qtresourceeditordialog_p.h b/src/designer/src/lib/shared/qtresourceeditordialog_p.h index eef3bf540..030d45e6e 100644 --- a/src/designer/src/lib/shared/qtresourceeditordialog_p.h +++ b/src/designer/src/lib/shared/qtresourceeditordialog_p.h @@ -54,7 +54,7 @@ #define QTRESOURCEEDITOR_H #include <QtCore/QScopedPointer> -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/qtresourceview.cpp b/src/designer/src/lib/shared/qtresourceview.cpp index c6addf09f..34bf1bd3e 100644 --- a/src/designer/src/lib/shared/qtresourceview.cpp +++ b/src/designer/src/lib/shared/qtresourceview.cpp @@ -48,24 +48,24 @@ #include <QtDesigner/QDesignerFormEditorInterface> #include <QtDesigner/QDesignerSettingsInterface> -#include <QtGui/QToolBar> -#include <QtGui/QAction> -#include <QtGui/QSplitter> -#include <QtGui/QTreeWidget> -#include <QtGui/QListWidget> -#include <QtGui/QHeaderView> -#include <QtGui/QVBoxLayout> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QAction> +#include <QtWidgets/QSplitter> +#include <QtWidgets/QTreeWidget> +#include <QtWidgets/QListWidget> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QVBoxLayout> #include <QtGui/QPainter> #include <QtCore/QFileInfo> #include <QtCore/QDir> #include <QtCore/QQueue> #include <QtGui/QPainter> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QPushButton> -#include <QtGui/QMessageBox> -#include <QtGui/QApplication> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QApplication> #include <QtGui/QClipboard> -#include <QtGui/QMenu> +#include <QtWidgets/QMenu> #include <QtGui/QDrag> #include <QtCore/QMimeData> #include <QtXml/QDomDocument> diff --git a/src/designer/src/lib/shared/qtresourceview_p.h b/src/designer/src/lib/shared/qtresourceview_p.h index 947df64e4..82fa438d9 100644 --- a/src/designer/src/lib/shared/qtresourceview_p.h +++ b/src/designer/src/lib/shared/qtresourceview_p.h @@ -54,8 +54,8 @@ #define QTRESOURCEVIEW_H #include "shared_global_p.h" -#include <QtGui/QWidget> -#include <QtGui/QDialog> +#include <QtWidgets/QWidget> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/richtexteditor.cpp b/src/designer/src/lib/shared/richtexteditor.cpp index fa23baf8d..70b3fd30d 100644 --- a/src/designer/src/lib/shared/richtexteditor.cpp +++ b/src/designer/src/lib/shared/richtexteditor.cpp @@ -56,24 +56,24 @@ #include <QtCore/QXmlStreamWriter> #include <QtCore/QXmlStreamAttributes> -#include <QtGui/QAction> -#include <QtGui/QColorDialog> -#include <QtGui/QComboBox> +#include <QtWidgets/QAction> +#include <QtWidgets/QColorDialog> +#include <QtWidgets/QComboBox> #include <QtGui/QFontDatabase> #include <QtGui/QTextCursor> #include <QtGui/QPainter> -#include <QtGui/QIcon> -#include <QtGui/QMenu> +#include <QtWidgets/QIcon> +#include <QtWidgets/QMenu> #include <QtGui/QMoveEvent> -#include <QtGui/QTabWidget> +#include <QtWidgets/QTabWidget> #include <QtGui/QTextDocument> #include <QtGui/QTextBlock> -#include <QtGui/QToolBar> -#include <QtGui/QToolButton> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QPushButton> -#include <QtGui/QDialogButtonBox> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QPushButton> +#include <QtWidgets/QDialogButtonBox> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/richtexteditor_p.h b/src/designer/src/lib/shared/richtexteditor_p.h index 086c5d518..e88f21381 100644 --- a/src/designer/src/lib/shared/richtexteditor_p.h +++ b/src/designer/src/lib/shared/richtexteditor_p.h @@ -53,8 +53,8 @@ #ifndef RICHTEXTEDITOR_H #define RICHTEXTEDITOR_H -#include <QtGui/QTextEdit> -#include <QtGui/QDialog> +#include <QtWidgets/QTextEdit> +#include <QtWidgets/QDialog> #include "shared_global_p.h" QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/scriptdialog.cpp b/src/designer/src/lib/shared/scriptdialog.cpp index e2c1c7460..82aea7355 100644 --- a/src/designer/src/lib/shared/scriptdialog.cpp +++ b/src/designer/src/lib/shared/scriptdialog.cpp @@ -44,11 +44,11 @@ #include <abstractdialoggui_p.h> -#include <QtGui/QTextEdit> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QMessageBox> +#include <QtWidgets/QTextEdit> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QMessageBox> #ifdef QT_SCRIPT_LIB #include <QtScript/QScriptEngine> #endif diff --git a/src/designer/src/lib/shared/scriptdialog_p.h b/src/designer/src/lib/shared/scriptdialog_p.h index bb1881d00..f0b3baaea 100644 --- a/src/designer/src/lib/shared/scriptdialog_p.h +++ b/src/designer/src/lib/shared/scriptdialog_p.h @@ -55,7 +55,7 @@ #include "shared_global_p.h" -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/scripterrordialog.cpp b/src/designer/src/lib/shared/scripterrordialog.cpp index 30d57342b..2cce8bfb2 100644 --- a/src/designer/src/lib/shared/scripterrordialog.cpp +++ b/src/designer/src/lib/shared/scripterrordialog.cpp @@ -41,11 +41,11 @@ #include "scripterrordialog_p.h" -#include <QtGui/QTextEdit> +#include <QtWidgets/QTextEdit> #include <QtGui/QTextCursor> -#include <QtGui/QVBoxLayout> -#include <QtGui/QHBoxLayout> -#include <QtGui/QDialogButtonBox> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QDialogButtonBox> #include <QtGui/QPen> #include <QtCore/QCoreApplication> diff --git a/src/designer/src/lib/shared/scripterrordialog_p.h b/src/designer/src/lib/shared/scripterrordialog_p.h index 24ead6f4b..0e5638732 100644 --- a/src/designer/src/lib/shared/scripterrordialog_p.h +++ b/src/designer/src/lib/shared/scripterrordialog_p.h @@ -56,7 +56,7 @@ #include "shared_global_p.h" #include "formscriptrunner_p.h" -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/sheet_delegate.cpp b/src/designer/src/lib/shared/sheet_delegate.cpp index 896ed5b83..1dcf6b2e6 100644 --- a/src/designer/src/lib/shared/sheet_delegate.cpp +++ b/src/designer/src/lib/shared/sheet_delegate.cpp @@ -42,8 +42,8 @@ #include "sheet_delegate_p.h" #include <QtCore/QAbstractItemModel> -#include <QtGui/QTreeView> -#include <QtGui/QStyle> +#include <QtWidgets/QTreeView> +#include <QtWidgets/QStyle> #include <QtGui/QPainter> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/sheet_delegate_p.h b/src/designer/src/lib/shared/sheet_delegate_p.h index 887cc6619..835eada2b 100644 --- a/src/designer/src/lib/shared/sheet_delegate_p.h +++ b/src/designer/src/lib/shared/sheet_delegate_p.h @@ -56,8 +56,8 @@ #include "shared_global_p.h" -#include <QtGui/QItemDelegate> -#include <QtGui/QTreeView> +#include <QtWidgets/QItemDelegate> +#include <QtWidgets/QTreeView> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/signalslotdialog.cpp b/src/designer/src/lib/shared/signalslotdialog.cpp index a65aafade..2b0af64ef 100644 --- a/src/designer/src/lib/shared/signalslotdialog.cpp +++ b/src/designer/src/lib/shared/signalslotdialog.cpp @@ -54,12 +54,12 @@ #include <QtDesigner/QDesignerWidgetFactoryInterface> #include <abstractdialoggui_p.h> -#include <QtGui/QStandardItemModel> +#include <QtWidgets/QStandardItemModel> #include <QtGui/QRegExpValidator> -#include <QtGui/QItemDelegate> -#include <QtGui/QLineEdit> -#include <QtGui/QApplication> -#include <QtGui/QMessageBox> +#include <QtWidgets/QItemDelegate> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QApplication> +#include <QtWidgets/QMessageBox> #include <QtCore/QRegExp> #include <QtCore/QDebug> diff --git a/src/designer/src/lib/shared/signalslotdialog_p.h b/src/designer/src/lib/shared/signalslotdialog_p.h index 1bfeecece..498f76fc9 100644 --- a/src/designer/src/lib/shared/signalslotdialog_p.h +++ b/src/designer/src/lib/shared/signalslotdialog_p.h @@ -55,8 +55,8 @@ #include "shared_global_p.h" #include <QtCore/QStringList> -#include <QtGui/QDialog> -#include <QtGui/QStandardItemModel> +#include <QtWidgets/QDialog> +#include <QtWidgets/QStandardItemModel> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/spacer_widget.cpp b/src/designer/src/lib/shared/spacer_widget.cpp index 528a4f427..959f73371 100644 --- a/src/designer/src/lib/shared/spacer_widget.cpp +++ b/src/designer/src/lib/shared/spacer_widget.cpp @@ -48,7 +48,7 @@ #include <QtDesigner/QDesignerPropertySheetExtension> #include <QtDesigner/QExtensionManager> -#include <QtGui/QLayout> +#include <QtWidgets/QLayout> #include <QtGui/QPainter> #include <QtGui/qevent.h> #include <QtCore/qdebug.h> diff --git a/src/designer/src/lib/shared/spacer_widget_p.h b/src/designer/src/lib/shared/spacer_widget_p.h index dd9288d24..58945b1d1 100644 --- a/src/designer/src/lib/shared/spacer_widget_p.h +++ b/src/designer/src/lib/shared/spacer_widget_p.h @@ -56,8 +56,8 @@ #include "shared_global_p.h" -#include <QtGui/QWidget> -#include <QtGui/QSizePolicy> +#include <QtWidgets/QWidget> +#include <QtWidgets/QSizePolicy> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/stylesheeteditor.cpp b/src/designer/src/lib/shared/stylesheeteditor.cpp index d96fe55f4..955db272a 100644 --- a/src/designer/src/lib/shared/stylesheeteditor.cpp +++ b/src/designer/src/lib/shared/stylesheeteditor.cpp @@ -56,16 +56,16 @@ #include <QtDesigner/QExtensionManager> #include <QtCore/QSignalMapper> -#include <QtGui/QAction> -#include <QtGui/QColorDialog> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QFontDialog> -#include <QtGui/QMenu> -#include <QtGui/QPushButton> +#include <QtWidgets/QAction> +#include <QtWidgets/QColorDialog> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QFontDialog> +#include <QtWidgets/QMenu> +#include <QtWidgets/QPushButton> #include <QtGui/QTextDocument> -#include <QtGui/QToolBar> -#include <QtGui/QVBoxLayout> -#include "private/qcssparser_p.h" +#include <QtWidgets/QToolBar> +#include <QtWidgets/QVBoxLayout> +#include <private/qcssparser_p.h> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/stylesheeteditor_p.h b/src/designer/src/lib/shared/stylesheeteditor_p.h index ce735c71b..5a1afd895 100644 --- a/src/designer/src/lib/shared/stylesheeteditor_p.h +++ b/src/designer/src/lib/shared/stylesheeteditor_p.h @@ -53,9 +53,9 @@ #ifndef STYLESHEETEDITOR_H #define STYLESHEETEDITOR_H -#include <QtGui/QTextEdit> -#include <QtGui/QDialog> -#include <QtGui/QLabel> +#include <QtWidgets/QTextEdit> +#include <QtWidgets/QDialog> +#include <QtWidgets/QLabel> #include "shared_global_p.h" QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/textpropertyeditor.cpp b/src/designer/src/lib/shared/textpropertyeditor.cpp index bc6cbeac7..b1e633824 100644 --- a/src/designer/src/lib/shared/textpropertyeditor.cpp +++ b/src/designer/src/lib/shared/textpropertyeditor.cpp @@ -43,11 +43,11 @@ #include "propertylineedit_p.h" #include "stylesheeteditor_p.h" -#include <QtGui/QLineEdit> +#include <QtWidgets/QLineEdit> #include <QtGui/QRegExpValidator> #include <QtGui/QResizeEvent> -#include <QtGui/QCompleter> -#include <QtGui/QAbstractItemView> +#include <QtWidgets/QCompleter> +#include <QtWidgets/QAbstractItemView> #include <QtCore/QRegExp> #include <QtCore/QUrl> #include <QtCore/QFile> diff --git a/src/designer/src/lib/shared/textpropertyeditor_p.h b/src/designer/src/lib/shared/textpropertyeditor_p.h index da92e8e82..b3e71c528 100644 --- a/src/designer/src/lib/shared/textpropertyeditor_p.h +++ b/src/designer/src/lib/shared/textpropertyeditor_p.h @@ -56,7 +56,7 @@ #include "shared_global_p.h" #include "shared_enums_p.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/lib/shared/widgetdatabase_p.h b/src/designer/src/lib/shared/widgetdatabase_p.h index eb89cb139..4300dbe5a 100644 --- a/src/designer/src/lib/shared/widgetdatabase_p.h +++ b/src/designer/src/lib/shared/widgetdatabase_p.h @@ -58,7 +58,7 @@ #include <QtDesigner/QDesignerWidgetDataBaseInterface> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <QtCore/QString> #include <QtCore/QVariant> #include <QtCore/QPair> diff --git a/src/designer/src/lib/shared/widgetfactory.cpp b/src/designer/src/lib/shared/widgetfactory.cpp index 400e5b9ef..dcfc445e4 100644 --- a/src/designer/src/lib/shared/widgetfactory.cpp +++ b/src/designer/src/lib/shared/widgetfactory.cpp @@ -70,15 +70,15 @@ #include <QtDesigner/QDesignerFormWindowManagerInterface> #include <QtDesigner/QDesignerFormWindowCursorInterface> -#include <QtGui/QtGui> -#include <QtGui/QScrollBar> -#include <QtGui/QFontComboBox> -#include <QtGui/QAbstractSpinBox> -#include <QtGui/QLineEdit> -#include <QtGui/QButtonGroup> -#include <QtGui/QStyle> -#include <QtGui/QStyleFactory> -#include <QtGui/QWizard> +#include <QtWidgets/QtWidgets> +#include <QtWidgets/QScrollBar> +#include <QtWidgets/QFontComboBox> +#include <QtWidgets/QAbstractSpinBox> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QButtonGroup> +#include <QtWidgets/QStyle> +#include <QtWidgets/QStyleFactory> +#include <QtWidgets/QWizard> #include <QtCore/qdebug.h> #include <QtCore/QMetaObject> diff --git a/src/designer/src/lib/shared/zoomwidget.cpp b/src/designer/src/lib/shared/zoomwidget.cpp index c77a518fe..91b991373 100644 --- a/src/designer/src/lib/shared/zoomwidget.cpp +++ b/src/designer/src/lib/shared/zoomwidget.cpp @@ -41,13 +41,13 @@ #include "zoomwidget_p.h" -#include <QtGui/QGraphicsScene> -#include <QtGui/QGraphicsProxyWidget> -#include <QtGui/QMenu> -#include <QtGui/QAction> -#include <QtGui/QActionGroup> +#include <QtWidgets/QGraphicsScene> +#include <QtWidgets/QGraphicsProxyWidget> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> +#include <QtWidgets/QActionGroup> #include <QtGui/QContextMenuEvent> -#include <QtGui/QScrollBar> +#include <QtWidgets/QScrollBar> #include <QtCore/QTextStream> #include <QtCore/qmath.h> diff --git a/src/designer/src/lib/shared/zoomwidget_p.h b/src/designer/src/lib/shared/zoomwidget_p.h index 4b2a05077..142512487 100644 --- a/src/designer/src/lib/shared/zoomwidget_p.h +++ b/src/designer/src/lib/shared/zoomwidget_p.h @@ -55,8 +55,8 @@ #include "shared_global_p.h" -#include <QtGui/QGraphicsView> -#include <QtGui/QGraphicsProxyWidget> +#include <QtWidgets/QGraphicsView> +#include <QtWidgets/QGraphicsProxyWidget> #include <QtCore/QList> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp b/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp index 019ada2f5..813c2bb28 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgetplugin.cpp @@ -49,7 +49,7 @@ #include <QtDesigner/QDesignerFormWindowInterface> #include <QtCore/qplugin.h> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <ActiveQt/QAxWidget> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp index d49f369d3..18f8962c0 100644 --- a/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp +++ b/src/designer/src/plugins/activeqt/qaxwidgettaskmenu.cpp @@ -48,9 +48,9 @@ #include <QtDesigner/QDesignerFormEditorInterface> #include <QtDesigner/QExtensionManager> -#include <QtGui/QUndoCommand> -#include <QtGui/QMessageBox> -#include <QtGui/QUndoStack> +#include <QtWidgets/QUndoCommand> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QUndoStack> #include <QtCore/QUuid> #include <ActiveQt/qaxselect.h> diff --git a/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp b/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp index cadbc1dd6..09f316fc9 100644 --- a/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp +++ b/src/designer/src/plugins/activeqt/qdesigneraxwidget.cpp @@ -43,9 +43,9 @@ #include <QtCore/QMetaProperty> #include <QtCore/QDebug> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <QtGui/QPainter> -#include <QtGui/QResizeEvent> +#include <QtWidgets/QResizeEvent> #include <ActiveQt/QAxWidget> diff --git a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h index 88d49e1b0..7aeba9e51 100644 --- a/src/designer/src/plugins/activeqt/qdesigneraxwidget.h +++ b/src/designer/src/plugins/activeqt/qdesigneraxwidget.h @@ -44,7 +44,7 @@ #include <QtCore/QPointer> #include <QtCore/QMap> -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtGui/QPixmap> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/plugins/phononwidgets/phononwidgets.pro b/src/designer/src/plugins/phononwidgets/phononwidgets.pro index 9cabfd761..1da3f5bf8 100644 --- a/src/designer/src/plugins/phononwidgets/phononwidgets.pro +++ b/src/designer/src/plugins/phononwidgets/phononwidgets.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = phononwidgets CONFIG += qt warn_on plugin -QT += phonon designer-private +QT += widgets phonon designer-private include(../plugins.pri) build_all:!build_pass { diff --git a/src/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp b/src/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp index 90cc96ffa..fd4a6ac7a 100644 --- a/src/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp +++ b/src/designer/src/plugins/phononwidgets/videoplayertaskmenu.cpp @@ -49,12 +49,12 @@ #include <phonon/videoplayer.h> #include <phonon/mediaobject.h> -#include <QtGui/QPlainTextEdit> -#include <QtGui/QDialogButtonBox> -#include <QtGui/QAction> -#include <QtGui/QVBoxLayout> -#include <QtGui/QFileDialog> -#include <QtGui/QMessageBox> +#include <QtWidgets/QPlainTextEdit> +#include <QtWidgets/QDialogButtonBox> +#include <QtWidgets/QAction> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QFileDialog> +#include <QtWidgets/QMessageBox> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro index b8abe8741..a677f0f18 100644 --- a/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro +++ b/src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = qdeclarativeview CONFIG += qt warn_on plugin designer -QT += declarative +QT += widgets declarative include(../plugins.pri) build_all:!build_pass { diff --git a/src/designer/src/plugins/qwebview/qwebview.pro b/src/designer/src/plugins/qwebview/qwebview.pro index b1f6371d1..cbbc37d2d 100644 --- a/src/designer/src/plugins/qwebview/qwebview.pro +++ b/src/designer/src/plugins/qwebview/qwebview.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = qwebview CONFIG += qt warn_on plugin -QT += webkit +QT += widgets webkit include(../plugins.pri) build_all:!build_pass { diff --git a/src/designer/src/plugins/tools/view3d/view3d.h b/src/designer/src/plugins/tools/view3d/view3d.h index 43e2ae9eb..ec19ec915 100644 --- a/src/designer/src/plugins/tools/view3d/view3d.h +++ b/src/designer/src/plugins/tools/view3d/view3d.h @@ -43,7 +43,7 @@ #define VIEW3D_H #include "view3d_global.h" -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/designer/src/plugins/tools/view3d/view3d_plugin.cpp b/src/designer/src/plugins/tools/view3d/view3d_plugin.cpp index 62b7868e7..f66fdeff6 100644 --- a/src/designer/src/plugins/tools/view3d/view3d_plugin.cpp +++ b/src/designer/src/plugins/tools/view3d/view3d_plugin.cpp @@ -41,7 +41,7 @@ #include <QtCore/qdebug.h> #include <QtCore/qplugin.h> -#include <QtGui/QAction> +#include <QtWidgets/QAction> #include "view3d_plugin.h" #include "view3d_tool.h" diff --git a/src/designer/src/plugins/tools/view3d/view3d_tool.cpp b/src/designer/src/plugins/tools/view3d/view3d_tool.cpp index e92a58bc9..f241a7c27 100644 --- a/src/designer/src/plugins/tools/view3d/view3d_tool.cpp +++ b/src/designer/src/plugins/tools/view3d/view3d_tool.cpp @@ -39,7 +39,7 @@ ** ****************************************************************************/ -#include <QtGui/QAction> +#include <QtWidgets/QAction> #include "view3d_tool.h" QView3DTool::QView3DTool(QDesignerFormWindowInterface *formWindow, QObject *parent) diff --git a/src/linguist/linguist/batchtranslationdialog.cpp b/src/linguist/linguist/batchtranslationdialog.cpp index e58316ff0..decccadfa 100644 --- a/src/linguist/linguist/batchtranslationdialog.cpp +++ b/src/linguist/linguist/batchtranslationdialog.cpp @@ -43,8 +43,8 @@ #include "phrase.h" #include "messagemodel.h" -#include <QtGui/QMessageBox> -#include <QtGui/QProgressDialog> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QProgressDialog> QT_BEGIN_NAMESPACE diff --git a/src/linguist/linguist/batchtranslationdialog.h b/src/linguist/linguist/batchtranslationdialog.h index 16d70cafe..fa35a4d15 100644 --- a/src/linguist/linguist/batchtranslationdialog.h +++ b/src/linguist/linguist/batchtranslationdialog.h @@ -45,8 +45,8 @@ #include "ui_batchtranslation.h" #include "phrase.h" -#include <QtGui/QDialog> -#include <QtGui/QStandardItemModel> +#include <QtWidgets/QDialog> +#include <QtWidgets/QStandardItemModel> QT_BEGIN_NAMESPACE diff --git a/src/linguist/linguist/errorsview.cpp b/src/linguist/linguist/errorsview.cpp index f24b3bede..8aa94858b 100644 --- a/src/linguist/linguist/errorsview.cpp +++ b/src/linguist/linguist/errorsview.cpp @@ -47,11 +47,11 @@ #include <QtCore/QString> #include <QtCore/QUrl> -#include <QtGui/QListView> -#include <QtGui/QStandardItem> -#include <QtGui/QStandardItemModel> -#include <QtGui/QTextEdit> -#include <QtGui/QVBoxLayout> +#include <QtWidgets/QListView> +#include <QtWidgets/QStandardItem> +#include <QtWidgets/QStandardItemModel> +#include <QtWidgets/QTextEdit> +#include <QtWidgets/QVBoxLayout> QT_BEGIN_NAMESPACE diff --git a/src/linguist/linguist/formpreviewview.cpp b/src/linguist/linguist/formpreviewview.cpp index a2a600257..7ad28454a 100644 --- a/src/linguist/linguist/formpreviewview.cpp +++ b/src/linguist/linguist/formpreviewview.cpp @@ -48,19 +48,19 @@ #include <QtCore/QDebug> #include <QtCore/QTime> -#include <QtGui/QAction> -#include <QtGui/QApplication> -#include <QtGui/QFontComboBox> -#include <QtGui/QFrame> -#include <QtGui/QGridLayout> -#include <QtGui/QListWidget> -#include <QtGui/QMdiArea> -#include <QtGui/QMdiSubWindow> -#include <QtGui/QMenu> -#include <QtGui/QTableWidget> -#include <QtGui/QTabWidget> -#include <QtGui/QToolBox> -#include <QtGui/QTreeWidget> +#include <QtWidgets/QAction> +#include <QtWidgets/QApplication> +#include <QtWidgets/QFontComboBox> +#include <QtWidgets/QFrame> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QListWidget> +#include <QtWidgets/QMdiArea> +#include <QtWidgets/QMdiSubWindow> +#include <QtWidgets/QMenu> +#include <QtWidgets/QTableWidget> +#include <QtWidgets/QTabWidget> +#include <QtWidgets/QToolBox> +#include <QtWidgets/QTreeWidget> QT_BEGIN_NAMESPACE diff --git a/src/linguist/linguist/formpreviewview.h b/src/linguist/linguist/formpreviewview.h index e30160670..15fafc4b7 100644 --- a/src/linguist/linguist/formpreviewview.h +++ b/src/linguist/linguist/formpreviewview.h @@ -47,7 +47,7 @@ #include <QtCore/QHash> #include <QtCore/QList> -#include <QtGui/QMainWindow> +#include <QtWidgets/QMainWindow> QT_BEGIN_NAMESPACE diff --git a/src/linguist/linguist/linguist.pro b/src/linguist/linguist/linguist.pro index 46aad5f07..db68e9130 100644 --- a/src/linguist/linguist/linguist.pro +++ b/src/linguist/linguist/linguist.pro @@ -4,7 +4,7 @@ TEMPLATE = app LANGUAGE = C++ DESTDIR = $$QT.designer.bins -QT += core-private xml designer +QT += core-private widgets xml designer CONFIG += qt \ warn_on \ diff --git a/src/linguist/linguist/main.cpp b/src/linguist/linguist/main.cpp index c1388e198..07e4768d3 100644 --- a/src/linguist/linguist/main.cpp +++ b/src/linguist/linguist/main.cpp @@ -49,10 +49,10 @@ #include <QtCore/QTextCodec> #include <QtCore/QTranslator> -#include <QtGui/QApplication> -#include <QtGui/QDesktopWidget> +#include <QtWidgets/QApplication> +#include <QtWidgets/QDesktopWidget> #include <QtGui/QPixmap> -#include <QtGui/QSplashScreen> +#include <QtWidgets/QSplashScreen> QT_USE_NAMESPACE diff --git a/src/linguist/linguist/mainwindow.h b/src/linguist/linguist/mainwindow.h index fe9daf264..1c90c42e6 100644 --- a/src/linguist/linguist/mainwindow.h +++ b/src/linguist/linguist/mainwindow.h @@ -50,7 +50,7 @@ #include <QtCore/QHash> #include <QtCore/QLocale> -#include <QtGui/QMainWindow> +#include <QtWidgets/QMainWindow> QT_BEGIN_NAMESPACE diff --git a/src/linguist/linguist/messageeditor.h b/src/linguist/linguist/messageeditor.h index 875ef3303..410f253f3 100644 --- a/src/linguist/linguist/messageeditor.h +++ b/src/linguist/linguist/messageeditor.h @@ -47,8 +47,8 @@ #include <QtCore/QLocale> #include <QtCore/QTimer> -#include <QtGui/QFrame> -#include <QtGui/QScrollArea> +#include <QtWidgets/QFrame> +#include <QtWidgets/QScrollArea> QT_BEGIN_NAMESPACE diff --git a/src/linguist/linguist/messagehighlighter.cpp b/src/linguist/linguist/messagehighlighter.cpp index bef2d6221..0191d4cab 100644 --- a/src/linguist/linguist/messagehighlighter.cpp +++ b/src/linguist/linguist/messagehighlighter.cpp @@ -42,11 +42,12 @@ #include "messagehighlighter.h" #include <QtCore/QTextStream> +#include <QtWidgets/QTextEdit> QT_BEGIN_NAMESPACE MessageHighlighter::MessageHighlighter(QTextEdit *textEdit) - : QSyntaxHighlighter(textEdit) + : QSyntaxHighlighter(textEdit->document()) { QTextCharFormat entityFormat; entityFormat.setForeground(Qt::red); diff --git a/src/linguist/linguist/messagehighlighter.h b/src/linguist/linguist/messagehighlighter.h index 455140f61..f041ac7fd 100644 --- a/src/linguist/linguist/messagehighlighter.h +++ b/src/linguist/linguist/messagehighlighter.h @@ -46,6 +46,8 @@ QT_BEGIN_NAMESPACE +class QTextEdit; + /* Message highlighter based on HtmlSyntaxHighlighter from designer */ class MessageHighlighter : public QSyntaxHighlighter { diff --git a/src/linguist/linguist/messagemodel.cpp b/src/linguist/linguist/messagemodel.cpp index 2d126577c..f90a3167f 100644 --- a/src/linguist/linguist/messagemodel.cpp +++ b/src/linguist/linguist/messagemodel.cpp @@ -45,7 +45,7 @@ #include <QtCore/QDebug> #include <QtCore/QTextCodec> -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> #include <QtGui/QPainter> #include <QtGui/QPixmap> #include <QtGui/QTextDocument> diff --git a/src/linguist/linguist/translationsettingsdialog.h b/src/linguist/linguist/translationsettingsdialog.h index 9eee406fa..083bc8ebd 100644 --- a/src/linguist/linguist/translationsettingsdialog.h +++ b/src/linguist/linguist/translationsettingsdialog.h @@ -45,7 +45,7 @@ #include "ui_translationsettings.h" #include <QtCore/QLocale> -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/pixeltool/pixeltool.pro b/src/pixeltool/pixeltool.pro index 60cd6d3ec..aa2804078 100644 --- a/src/pixeltool/pixeltool.pro +++ b/src/pixeltool/pixeltool.pro @@ -1,6 +1,6 @@ TEMPLATE = app CONFIG += qt warn_on -QT += network +QT += widgets network build_all:!build_pass { CONFIG -= build_all diff --git a/src/qdbus/qdbusviewer/main.cpp b/src/qdbus/qdbusviewer/main.cpp index f3726204c..72e5e8a1c 100644 --- a/src/qdbus/qdbusviewer/main.cpp +++ b/src/qdbus/qdbusviewer/main.cpp @@ -39,9 +39,12 @@ ** ****************************************************************************/ -#include <QtGui/qapplication.h> -#include <QtGui/qmainwindow.h> -#include <QtGui/qtabwidget.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qmainwindow.h> +#include <QtWidgets/qtabwidget.h> +#include <QtWidgets/QMenuBar> +#include <QtWidgets/QMenu> +#include <QtWidgets/QAction> #include <QtDBus/qdbusconnection.h> #include "qdbusviewer.h" diff --git a/src/qdbus/qdbusviewer/qdbusviewer.cpp b/src/qdbus/qdbusviewer/qdbusviewer.cpp index cab109386..3e2335e64 100644 --- a/src/qdbus/qdbusviewer/qdbusviewer.cpp +++ b/src/qdbus/qdbusviewer/qdbusviewer.cpp @@ -44,7 +44,22 @@ #include "propertydialog.h" #include <QtXml/QtXml> -#include <QtDBus/private/qdbusutil_p.h> + +#include <QtWidgets/QTreeWidget> +#include <QtWidgets/QStringListModel> +#include <QtWidgets/QSortFilterProxyModel> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QListView> +#include <QtWidgets/QTextBrowser> +#include <QtWidgets/QAction> +#include <QtWidgets/QShortcut> +#include <QtWidgets/QVBoxLayout> +#include <QtWidgets/QSplitter> +#include <QtWidgets/QInputDialog> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QMenu> + +#include <private/qdbusutil_p.h> class QDBusViewModel: public QDBusModel { diff --git a/src/qdbus/qdbusviewer/qdbusviewer.h b/src/qdbus/qdbusviewer/qdbusviewer.h index 19777882c..50e5120b8 100644 --- a/src/qdbus/qdbusviewer/qdbusviewer.h +++ b/src/qdbus/qdbusviewer/qdbusviewer.h @@ -42,12 +42,18 @@ #ifndef QDBUSVIEWER_H #define QDBUSVIEWER_H -#include <QtGui/QtGui> +#include <QtWidgets/QWidget> #include <QtDBus/QtDBus> -QT_FORWARD_DECLARE_CLASS(QTreeView); -QT_FORWARD_DECLARE_CLASS(QDomDocument); -QT_FORWARD_DECLARE_CLASS(QDomElement); +QT_FORWARD_DECLARE_CLASS(QTreeView) +QT_FORWARD_DECLARE_CLASS(QTreeWidget) +QT_FORWARD_DECLARE_CLASS(QStringListModel) +QT_FORWARD_DECLARE_CLASS(QSortFilterProxyModel) +QT_FORWARD_DECLARE_CLASS(QLineEdit) +QT_FORWARD_DECLARE_CLASS(QListView) +QT_FORWARD_DECLARE_CLASS(QTextBrowser) +QT_FORWARD_DECLARE_CLASS(QDomDocument) +QT_FORWARD_DECLARE_CLASS(QDomElement) struct BusSignature { diff --git a/src/qdbus/qdbusviewer/qdbusviewer.pro b/src/qdbus/qdbusviewer/qdbusviewer.pro index 42c6d1998..2c6476cd7 100644 --- a/src/qdbus/qdbusviewer/qdbusviewer.pro +++ b/src/qdbus/qdbusviewer/qdbusviewer.pro @@ -14,7 +14,7 @@ RESOURCES += qdbusviewer.qrc DESTDIR = $$QT.designer.bins -QT += dbus-private xml +QT += widgets dbus-private xml target.path=$$[QT_INSTALL_BINS] INSTALLS += target diff --git a/src/qmeegographicssystemhelper/qmeegoruntime.cpp b/src/qmeegographicssystemhelper/qmeegoruntime.cpp index 928d01a4a..141ad082c 100644 --- a/src/qmeegographicssystemhelper/qmeegoruntime.cpp +++ b/src/qmeegographicssystemhelper/qmeegoruntime.cpp @@ -43,8 +43,8 @@ #include "qmeegoswitchevent.h" -#include <QtGui/QApplication> -#include <QtGui/QWidget> +#include <QtWidgets/QApplication> +#include <QtWidgets/QWidget> #include <private/qlibrary_p.h> #include <private/qfactoryloader_p.h> diff --git a/src/qtconfig/mainwindow.cpp b/src/qtconfig/mainwindow.cpp index 059adb307..a46bd2090 100644 --- a/src/qtconfig/mainwindow.cpp +++ b/src/qtconfig/mainwindow.cpp @@ -75,7 +75,7 @@ #include <phonon/phononnamespace.h> #endif -#include <QtGui/private/qt_x11_p.h> +#include <QtWidgets/private/qt_x11_p.h> QT_BEGIN_NAMESPACE diff --git a/src/qtconfig/mainwindow.h b/src/qtconfig/mainwindow.h index 6f4c8a52e..d451bdaf3 100644 --- a/src/qtconfig/mainwindow.h +++ b/src/qtconfig/mainwindow.h @@ -42,7 +42,7 @@ #ifndef MAINWINDOW_H #define MAINWINDOW_H -#include <QtGui/QMainWindow> +#include <QtWidgets/QMainWindow> QT_BEGIN_NAMESPACE diff --git a/src/qtconfig/paletteeditoradvanced.h b/src/qtconfig/paletteeditoradvanced.h index 4f6167670..cb6b619a9 100644 --- a/src/qtconfig/paletteeditoradvanced.h +++ b/src/qtconfig/paletteeditoradvanced.h @@ -42,7 +42,7 @@ #ifndef PALETTEEDITORADVANCED_H #define PALETTEEDITORADVANCED_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/qtconfig/previewwidget.h b/src/qtconfig/previewwidget.h index d39fd7540..a3f418d29 100644 --- a/src/qtconfig/previewwidget.h +++ b/src/qtconfig/previewwidget.h @@ -42,7 +42,7 @@ #ifndef PREVIEWWIDGET_H #define PREVIEWWIDGET_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/qttracereplay/main.cpp b/src/qttracereplay/main.cpp index 771801362..c3ea29478 100644 --- a/src/qttracereplay/main.cpp +++ b/src/qttracereplay/main.cpp @@ -39,8 +39,13 @@ ** ****************************************************************************/ -#include <QtGui> -#include <QtDebug> +#include <QtGui/QPainter> +#include <QtWidgets/QWidget> +#include <QtWidgets/QApplication> +#include <QtCore/QtDebug> +#include <QtCore/QTime> +#include <QtCore/QTimer> +#include <QtCore/qmath.h> #include <private/qpaintengineex_p.h> #include <private/qpaintbuffer_p.h> diff --git a/src/qttracereplay/qttracereplay.pro b/src/qttracereplay/qttracereplay.pro index ca9956848..e7e0394f3 100644 --- a/src/qttracereplay/qttracereplay.pro +++ b/src/qttracereplay/qttracereplay.pro @@ -7,7 +7,7 @@ DESTDIR = $$QT.designer.bins DEPENDPATH += . INCLUDEPATH += . $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src TARGET = qttracereplay -QT += core-private gui-private +QT += core-private gui-private widgets widgets-private # Input SOURCES += main.cpp diff --git a/src/runonphone/symbianutils/bluetoothlistener_gui.cpp b/src/runonphone/symbianutils/bluetoothlistener_gui.cpp index c3f36b23a..85457f8ff 100644 --- a/src/runonphone/symbianutils/bluetoothlistener_gui.cpp +++ b/src/runonphone/symbianutils/bluetoothlistener_gui.cpp @@ -43,8 +43,8 @@ #include "bluetoothlistener.h" #include "communicationstarter.h" -#include <QtGui/QMessageBox> -#include <QtGui/QPushButton> +#include <QtWidgets/QMessageBox> +#include <QtWidgets/QPushButton> #include <QtCore/QCoreApplication> #include <QtCore/QDebug> diff --git a/src/shared/deviceskin/deviceskin.cpp b/src/shared/deviceskin/deviceskin.cpp index 1e3748fe8..2afb830e0 100644 --- a/src/shared/deviceskin/deviceskin.cpp +++ b/src/shared/deviceskin/deviceskin.cpp @@ -42,7 +42,7 @@ #include "deviceskin.h" #include <QtCore/qnamespace.h> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QBitmap> #include <QtGui/QPixmap> #include <QtGui/QPainter> diff --git a/src/shared/deviceskin/deviceskin.h b/src/shared/deviceskin/deviceskin.h index 8a53acffd..e4fb87e3c 100644 --- a/src/shared/deviceskin/deviceskin.h +++ b/src/shared/deviceskin/deviceskin.h @@ -42,7 +42,7 @@ #ifndef SKIN_H #define SKIN_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtGui/QPolygon> #include <QtGui/QRegion> #include <QtGui/QPixmap> diff --git a/src/shared/findwidget/abstractfindwidget.cpp b/src/shared/findwidget/abstractfindwidget.cpp index b9f7a811e..44f83ca58 100644 --- a/src/shared/findwidget/abstractfindwidget.cpp +++ b/src/shared/findwidget/abstractfindwidget.cpp @@ -59,13 +59,13 @@ #include <QtCore/QFile> #include <QtCore/QTimer> -#include <QtGui/QCheckBox> +#include <QtWidgets/QCheckBox> #include <QtGui/QKeyEvent> -#include <QtGui/QLabel> -#include <QtGui/QLayout> -#include <QtGui/QLineEdit> -#include <QtGui/QSpacerItem> -#include <QtGui/QToolButton> +#include <QtWidgets/QLabel> +#include <QtWidgets/QLayout> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QSpacerItem> +#include <QtWidgets/QToolButton> QT_BEGIN_NAMESPACE diff --git a/src/shared/findwidget/abstractfindwidget.h b/src/shared/findwidget/abstractfindwidget.h index 6592911a8..2dd9b96df 100644 --- a/src/shared/findwidget/abstractfindwidget.h +++ b/src/shared/findwidget/abstractfindwidget.h @@ -42,8 +42,8 @@ #ifndef ABSTRACTFINDWIDGET_H #define ABSTRACTFINDWIDGET_H -#include <QtGui/QIcon> -#include <QtGui/QWidget> +#include <QtWidgets/QIcon> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/shared/findwidget/itemviewfindwidget.cpp b/src/shared/findwidget/itemviewfindwidget.cpp index 9249ed5f7..2fff115c4 100644 --- a/src/shared/findwidget/itemviewfindwidget.cpp +++ b/src/shared/findwidget/itemviewfindwidget.cpp @@ -64,9 +64,9 @@ #include "itemviewfindwidget.h" -#include <QtGui/QAbstractItemView> -#include <QtGui/QCheckBox> -#include <QtGui/QTreeView> +#include <QtWidgets/QAbstractItemView> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QTreeView> QT_BEGIN_NAMESPACE diff --git a/src/shared/findwidget/texteditfindwidget.cpp b/src/shared/findwidget/texteditfindwidget.cpp index f02bdcc33..68174b6ed 100644 --- a/src/shared/findwidget/texteditfindwidget.cpp +++ b/src/shared/findwidget/texteditfindwidget.cpp @@ -60,9 +60,9 @@ #include "texteditfindwidget.h" -#include <QtGui/QCheckBox> +#include <QtWidgets/QCheckBox> #include <QtGui/QTextCursor> -#include <QtGui/QTextEdit> +#include <QtWidgets/QTextEdit> QT_BEGIN_NAMESPACE diff --git a/src/shared/fontpanel/fontpanel.cpp b/src/shared/fontpanel/fontpanel.cpp index 9bcef2a4b..b7f2b6173 100644 --- a/src/shared/fontpanel/fontpanel.cpp +++ b/src/shared/fontpanel/fontpanel.cpp @@ -41,13 +41,13 @@ #include "fontpanel.h" -#include <QtGui/QLabel> -#include <QtGui/QComboBox> -#include <QtGui/QFormLayout> -#include <QtGui/QSpacerItem> -#include <QtGui/QFontComboBox> +#include <QtWidgets/QLabel> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QFormLayout> +#include <QtWidgets/QSpacerItem> +#include <QtWidgets/QFontComboBox> #include <QtCore/QTimer> -#include <QtGui/QLineEdit> +#include <QtWidgets/QLineEdit> QT_BEGIN_NAMESPACE diff --git a/src/shared/fontpanel/fontpanel.h b/src/shared/fontpanel/fontpanel.h index 204ff7d4a..27ff1bc31 100644 --- a/src/shared/fontpanel/fontpanel.h +++ b/src/shared/fontpanel/fontpanel.h @@ -53,7 +53,7 @@ #ifndef FONTPANEL_H #define FONTPANEL_H -#include <QtGui/QGroupBox> +#include <QtWidgets/QGroupBox> #include <QtGui/QFont> #include <QtGui/QFontDatabase> diff --git a/src/shared/qtgradienteditor/qtcolorbutton.cpp b/src/shared/qtgradienteditor/qtcolorbutton.cpp index 96a8b26ca..b7cd29cc8 100644 --- a/src/shared/qtgradienteditor/qtcolorbutton.cpp +++ b/src/shared/qtgradienteditor/qtcolorbutton.cpp @@ -40,11 +40,12 @@ ****************************************************************************/ #include "qtcolorbutton.h" -#include <QtGui/QColorDialog> +#include <QtWidgets/QColorDialog> #include <QtGui/QPainter> #include <QtCore/QMimeData> #include <QtGui/QDragEnterEvent> -#include <QtGui/QApplication> +#include <QtGui/QDrag> +#include <QtWidgets/QApplication> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtgradienteditor/qtcolorbutton.h b/src/shared/qtgradienteditor/qtcolorbutton.h index 42fcfc113..733bccbbd 100644 --- a/src/shared/qtgradienteditor/qtcolorbutton.h +++ b/src/shared/qtgradienteditor/qtcolorbutton.h @@ -42,7 +42,7 @@ #ifndef QTCOLORBUTTON_H #define QTCOLORBUTTON_H -#include <QtGui/QToolButton> +#include <QtWidgets/QToolButton> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtgradienteditor/qtcolorline.cpp b/src/shared/qtgradienteditor/qtcolorline.cpp index f4eda3f9b..2f241f82d 100644 --- a/src/shared/qtgradienteditor/qtcolorline.cpp +++ b/src/shared/qtgradienteditor/qtcolorline.cpp @@ -44,7 +44,7 @@ #include <QtGui/QPainter> #include <QtGui/QPaintEvent> -#include <QtGui/QStyleOption> +#include <QtWidgets/QStyleOption> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtgradienteditor/qtcolorline.h b/src/shared/qtgradienteditor/qtcolorline.h index 8d04a7ca7..7c852ee68 100644 --- a/src/shared/qtgradienteditor/qtcolorline.h +++ b/src/shared/qtgradienteditor/qtcolorline.h @@ -42,7 +42,7 @@ #ifndef QTCOLORLINE_H #define QTCOLORLINE_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtgradienteditor/qtgradientdialog.cpp b/src/shared/qtgradienteditor/qtgradientdialog.cpp index dbeeb1f20..322ac33f1 100644 --- a/src/shared/qtgradienteditor/qtgradientdialog.cpp +++ b/src/shared/qtgradienteditor/qtgradientdialog.cpp @@ -41,7 +41,7 @@ #include "qtgradientdialog.h" #include "ui_qtgradientdialog.h" -#include <QtGui/QPushButton> +#include <QtWidgets/QPushButton> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtgradienteditor/qtgradientdialog.h b/src/shared/qtgradienteditor/qtgradientdialog.h index c6330d164..c73efcb35 100644 --- a/src/shared/qtgradienteditor/qtgradientdialog.h +++ b/src/shared/qtgradienteditor/qtgradientdialog.h @@ -42,7 +42,7 @@ #ifndef QTGRADIENTDIALOG_H #define QTGRADIENTDIALOG_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtgradienteditor/qtgradienteditor.h b/src/shared/qtgradienteditor/qtgradienteditor.h index 77e1d3470..3544e4959 100644 --- a/src/shared/qtgradienteditor/qtgradienteditor.h +++ b/src/shared/qtgradienteditor/qtgradienteditor.h @@ -42,7 +42,7 @@ #ifndef QTGRADIENTEDITOR_H #define QTGRADIENTEDITOR_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtgradienteditor/qtgradientstopscontroller.h b/src/shared/qtgradienteditor/qtgradientstopscontroller.h index 1ae96aafe..631ccdf9f 100644 --- a/src/shared/qtgradienteditor/qtgradientstopscontroller.h +++ b/src/shared/qtgradienteditor/qtgradientstopscontroller.h @@ -42,7 +42,7 @@ #ifndef QTGRADIENTSTOPSCONTROLLER_H #define QTGRADIENTSTOPSCONTROLLER_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtgradienteditor/qtgradientstopswidget.cpp b/src/shared/qtgradienteditor/qtgradientstopswidget.cpp index a4104327b..b3dc2fd6d 100644 --- a/src/shared/qtgradienteditor/qtgradientstopswidget.cpp +++ b/src/shared/qtgradienteditor/qtgradientstopswidget.cpp @@ -45,10 +45,10 @@ #include <QtCore/QMap> #include <QtGui/QImage> #include <QtGui/QPainter> -#include <QtGui/QScrollBar> +#include <QtWidgets/QScrollBar> #include <QtGui/QMouseEvent> -#include <QtGui/QRubberBand> -#include <QtGui/QMenu> +#include <QtWidgets/QRubberBand> +#include <QtWidgets/QMenu> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtgradienteditor/qtgradientstopswidget.h b/src/shared/qtgradienteditor/qtgradientstopswidget.h index a6893c07b..50e91cac4 100644 --- a/src/shared/qtgradienteditor/qtgradientstopswidget.h +++ b/src/shared/qtgradienteditor/qtgradientstopswidget.h @@ -42,7 +42,7 @@ #ifndef QTGRADIENTSTOPSWIDGET_H #define QTGRADIENTSTOPSWIDGET_H -#include <QtGui/QAbstractScrollArea> +#include <QtWidgets/QAbstractScrollArea> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtgradienteditor/qtgradientview.cpp b/src/shared/qtgradienteditor/qtgradientview.cpp index a3d17950d..d7b9caf0a 100644 --- a/src/shared/qtgradienteditor/qtgradientview.cpp +++ b/src/shared/qtgradienteditor/qtgradientview.cpp @@ -44,7 +44,7 @@ #include "qtgradientdialog.h" #include "qtgradientutils.h" #include <QtGui/QPainter> -#include <QtGui/QMessageBox> +#include <QtWidgets/QMessageBox> #include <QtGui/QClipboard> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtgradienteditor/qtgradientview.h b/src/shared/qtgradienteditor/qtgradientview.h index 8a45ecfcb..3ce27020b 100644 --- a/src/shared/qtgradienteditor/qtgradientview.h +++ b/src/shared/qtgradienteditor/qtgradientview.h @@ -42,7 +42,7 @@ #ifndef GRADIENTVIEW_H #define GRADIENTVIEW_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtCore/QMap> #include "ui_qtgradientview.h" diff --git a/src/shared/qtgradienteditor/qtgradientviewdialog.cpp b/src/shared/qtgradienteditor/qtgradientviewdialog.cpp index 260641d32..a1bbace35 100644 --- a/src/shared/qtgradienteditor/qtgradientviewdialog.cpp +++ b/src/shared/qtgradienteditor/qtgradientviewdialog.cpp @@ -41,7 +41,7 @@ #include "qtgradientviewdialog.h" #include "qtgradientmanager.h" -#include <QtGui/QPushButton> +#include <QtWidgets/QPushButton> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtgradienteditor/qtgradientviewdialog.h b/src/shared/qtgradienteditor/qtgradientviewdialog.h index 66cfeea40..b85060b28 100644 --- a/src/shared/qtgradienteditor/qtgradientviewdialog.h +++ b/src/shared/qtgradienteditor/qtgradientviewdialog.h @@ -42,7 +42,7 @@ #ifndef GRADIENTVIEWDIALOG_H #define GRADIENTVIEWDIALOG_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtCore/QMap> #include "ui_qtgradientviewdialog.h" diff --git a/src/shared/qtgradienteditor/qtgradientwidget.cpp b/src/shared/qtgradienteditor/qtgradientwidget.cpp index d9056a703..bf9ea0da6 100644 --- a/src/shared/qtgradienteditor/qtgradientwidget.cpp +++ b/src/shared/qtgradienteditor/qtgradientwidget.cpp @@ -43,7 +43,7 @@ #include <QtCore/QMap> #include <QtGui/QImage> #include <QtGui/QPainter> -#include <QtGui/QScrollBar> +#include <QtWidgets/QScrollBar> #include <QtGui/QMouseEvent> #define _USE_MATH_DEFINES diff --git a/src/shared/qtgradienteditor/qtgradientwidget.h b/src/shared/qtgradienteditor/qtgradientwidget.h index ee866feb9..de6a0272a 100644 --- a/src/shared/qtgradienteditor/qtgradientwidget.h +++ b/src/shared/qtgradienteditor/qtgradientwidget.h @@ -42,7 +42,7 @@ #ifndef QTGRADIENTWIDGET_H #define QTGRADIENTWIDGET_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp index 09571243f..e4b352ebf 100644 --- a/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qtbuttonpropertybrowser.cpp @@ -41,12 +41,12 @@ #include "qtbuttonpropertybrowser.h" #include <QtCore/QSet> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QLabel> #include <QtCore/QTimer> #include <QtCore/QMap> -#include <QtGui/QToolButton> -#include <QtGui/QStyle> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QStyle> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtpropertybrowser/qteditorfactory.cpp b/src/shared/qtpropertybrowser/qteditorfactory.cpp index 90ba3d3a2..5cad97938 100644 --- a/src/shared/qtpropertybrowser/qteditorfactory.cpp +++ b/src/shared/qtpropertybrowser/qteditorfactory.cpp @@ -41,21 +41,21 @@ #include "qteditorfactory.h" #include "qtpropertybrowserutils_p.h" -#include <QtGui/QSpinBox> -#include <QtGui/QScrollBar> -#include <QtGui/QComboBox> -#include <QtGui/QAbstractItemView> -#include <QtGui/QLineEdit> -#include <QtGui/QDateTimeEdit> -#include <QtGui/QHBoxLayout> -#include <QtGui/QMenu> +#include <QtWidgets/QSpinBox> +#include <QtWidgets/QScrollBar> +#include <QtWidgets/QComboBox> +#include <QtWidgets/QAbstractItemView> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QDateTimeEdit> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QMenu> #include <QtGui/QKeyEvent> -#include <QtGui/QApplication> -#include <QtGui/QLabel> -#include <QtGui/QToolButton> -#include <QtGui/QColorDialog> -#include <QtGui/QFontDialog> -#include <QtGui/QSpacerItem> +#include <QtWidgets/QApplication> +#include <QtWidgets/QLabel> +#include <QtWidgets/QToolButton> +#include <QtWidgets/QColorDialog> +#include <QtWidgets/QFontDialog> +#include <QtWidgets/QSpacerItem> #include <QtCore/QMap> #if defined(Q_CC_MSVC) diff --git a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp index 0633aa4f6..61462fe03 100644 --- a/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qtgroupboxpropertybrowser.cpp @@ -41,9 +41,9 @@ #include "qtgroupboxpropertybrowser.h" #include <QtCore/QSet> -#include <QtGui/QGridLayout> -#include <QtGui/QLabel> -#include <QtGui/QGroupBox> +#include <QtWidgets/QGridLayout> +#include <QtWidgets/QLabel> +#include <QtWidgets/QGroupBox> #include <QtCore/QTimer> #include <QtCore/QMap> diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp index 3771ef686..cf307caa1 100644 --- a/src/shared/qtpropertybrowser/qtpropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qtpropertybrowser.cpp @@ -42,7 +42,7 @@ #include "qtpropertybrowser.h" #include <QtCore/QSet> #include <QtCore/QMap> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #if defined(Q_CC_MSVC) # pragma warning(disable: 4786) /* MS VS 6: truncating debug info after 255 characters */ diff --git a/src/shared/qtpropertybrowser/qtpropertybrowser.h b/src/shared/qtpropertybrowser/qtpropertybrowser.h index 619f43501..3e1cf78ab 100644 --- a/src/shared/qtpropertybrowser/qtpropertybrowser.h +++ b/src/shared/qtpropertybrowser/qtpropertybrowser.h @@ -42,7 +42,7 @@ #ifndef QTPROPERTYBROWSER_H #define QTPROPERTYBROWSER_H -#include <QtGui/QWidget> +#include <QtWidgets/QWidget> #include <QtCore/QSet> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp b/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp index 0b57cff88..06a04faeb 100644 --- a/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp +++ b/src/shared/qtpropertybrowser/qtpropertybrowserutils.cpp @@ -40,13 +40,13 @@ ****************************************************************************/ #include "qtpropertybrowserutils_p.h" -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QPainter> -#include <QtGui/QHBoxLayout> +#include <QtWidgets/QHBoxLayout> #include <QtGui/QMouseEvent> -#include <QtGui/QCheckBox> -#include <QtGui/QLineEdit> -#include <QtGui/QMenu> +#include <QtWidgets/QCheckBox> +#include <QtWidgets/QLineEdit> +#include <QtWidgets/QMenu> #include <QtCore/QLocale> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h b/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h index 440ec9a11..64fc9de21 100644 --- a/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h +++ b/src/shared/qtpropertybrowser/qtpropertybrowserutils_p.h @@ -54,8 +54,8 @@ #define QTPROPERTYBROWSERUTILS_H #include <QtCore/QMap> -#include <QtGui/QIcon> -#include <QtGui/QWidget> +#include <QtWidgets/QIcon> +#include <QtWidgets/QWidget> #include <QtCore/QStringList> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtpropertybrowser/qtpropertymanager.cpp b/src/shared/qtpropertybrowser/qtpropertymanager.cpp index 962e35727..d380695bc 100644 --- a/src/shared/qtpropertybrowser/qtpropertymanager.cpp +++ b/src/shared/qtpropertybrowser/qtpropertymanager.cpp @@ -45,14 +45,14 @@ #include <QtCore/QLocale> #include <QtCore/QMap> #include <QtCore/QTimer> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <QtCore/QMetaEnum> #include <QtGui/QFontDatabase> -#include <QtGui/QStyleOption> -#include <QtGui/QStyle> -#include <QtGui/QApplication> +#include <QtWidgets/QStyleOption> +#include <QtWidgets/QStyle> +#include <QtWidgets/QApplication> #include <QtGui/QPainter> -#include <QtGui/QLabel> +#include <QtWidgets/QLabel> #include <limits.h> #include <float.h> diff --git a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp index 58a29e0e2..90337e9df 100644 --- a/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp +++ b/src/shared/qtpropertybrowser/qttreepropertybrowser.cpp @@ -41,15 +41,15 @@ #include "qttreepropertybrowser.h" #include <QtCore/QSet> -#include <QtGui/QIcon> -#include <QtGui/QTreeWidget> -#include <QtGui/QItemDelegate> -#include <QtGui/QHBoxLayout> -#include <QtGui/QHeaderView> +#include <QtWidgets/QIcon> +#include <QtWidgets/QTreeWidget> +#include <QtWidgets/QItemDelegate> +#include <QtWidgets/QHBoxLayout> +#include <QtWidgets/QHeaderView> #include <QtGui/QPainter> -#include <QtGui/QApplication> +#include <QtWidgets/QApplication> #include <QtGui/QFocusEvent> -#include <QtGui/QStyle> +#include <QtWidgets/QStyle> #include <QtGui/QPalette> QT_BEGIN_NAMESPACE diff --git a/src/shared/qtpropertybrowser/qtvariantproperty.cpp b/src/shared/qtpropertybrowser/qtvariantproperty.cpp index 9647b3ac7..cbaecf7ec 100644 --- a/src/shared/qtpropertybrowser/qtvariantproperty.cpp +++ b/src/shared/qtpropertybrowser/qtvariantproperty.cpp @@ -43,7 +43,7 @@ #include "qtpropertymanager.h" #include "qteditorfactory.h" #include <QtCore/QVariant> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> #include <QtCore/QDate> #include <QtCore/QLocale> diff --git a/src/shared/qtpropertybrowser/qtvariantproperty.h b/src/shared/qtpropertybrowser/qtvariantproperty.h index b5fe1f928..959a19392 100644 --- a/src/shared/qtpropertybrowser/qtvariantproperty.h +++ b/src/shared/qtpropertybrowser/qtvariantproperty.h @@ -44,7 +44,7 @@ #include "qtpropertybrowser.h" #include <QtCore/QVariant> -#include <QtGui/QIcon> +#include <QtWidgets/QIcon> QT_BEGIN_NAMESPACE diff --git a/src/shared/qttoolbardialog/qttoolbardialog.cpp b/src/shared/qttoolbardialog/qttoolbardialog.cpp index b45bef290..fae5cb548 100644 --- a/src/shared/qttoolbardialog/qttoolbardialog.cpp +++ b/src/shared/qttoolbardialog/qttoolbardialog.cpp @@ -44,11 +44,11 @@ #include <QtCore/QSet> #include <QtGui/QtEvents> -#include <QtGui/QAction> -#include <QtGui/QToolBar> -#include <QtGui/QMainWindow> -#include <QtGui/QHeaderView> -#include <QtGui/QPushButton> +#include <QtWidgets/QAction> +#include <QtWidgets/QToolBar> +#include <QtWidgets/QMainWindow> +#include <QtWidgets/QHeaderView> +#include <QtWidgets/QPushButton> QT_BEGIN_NAMESPACE diff --git a/src/shared/qttoolbardialog/qttoolbardialog.h b/src/shared/qttoolbardialog/qttoolbardialog.h index 925662e4b..fb372e67a 100644 --- a/src/shared/qttoolbardialog/qttoolbardialog.h +++ b/src/shared/qttoolbardialog/qttoolbardialog.h @@ -53,7 +53,7 @@ #ifndef QTTOOLBARDIALOG_H #define QTTOOLBARDIALOG_H -#include <QtGui/QDialog> +#include <QtWidgets/QDialog> QT_BEGIN_NAMESPACE |