diff options
Diffstat (limited to 'src/shared')
37 files changed, 92 insertions, 91 deletions
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 |