diff options
Diffstat (limited to 'src/widgets/widgets')
70 files changed, 125 insertions, 125 deletions
diff --git a/src/widgets/widgets/qabstractbutton.h b/src/widgets/widgets/qabstractbutton.h index abdc11012c..40ce1fd6c9 100644 --- a/src/widgets/widgets/qabstractbutton.h +++ b/src/widgets/widgets/qabstractbutton.h @@ -42,9 +42,9 @@ #ifndef QABSTRACTBUTTON_H #define QABSTRACTBUTTON_H -#include <QtGui/qicon.h> +#include <QtWidgets/qicon.h> #include <QtGui/qkeysequence.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h index 34b7837284..ed2503e2ee 100644 --- a/src/widgets/widgets/qabstractscrollarea.h +++ b/src/widgets/widgets/qabstractscrollarea.h @@ -42,7 +42,7 @@ #ifndef QABSTRACTSCROLLAREA_H #define QABSTRACTSCROLLAREA_H -#include <QtGui/qframe.h> +#include <QtWidgets/qframe.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qabstractslider.h b/src/widgets/widgets/qabstractslider.h index bdcfe0ecc9..0aef801d3d 100644 --- a/src/widgets/widgets/qabstractslider.h +++ b/src/widgets/widgets/qabstractslider.h @@ -42,7 +42,7 @@ #ifndef QABSTRACTSLIDER_H #define QABSTRACTSLIDER_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qabstractspinbox.h b/src/widgets/widgets/qabstractspinbox.h index bb1307cca5..507921e272 100644 --- a/src/widgets/widgets/qabstractspinbox.h +++ b/src/widgets/widgets/qabstractspinbox.h @@ -42,7 +42,7 @@ #ifndef QABSTRACTSPINBOX_H #define QABSTRACTSPINBOX_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include <QtGui/qvalidator.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qabstractspinbox_p.h b/src/widgets/widgets/qabstractspinbox_p.h index 38270c4e95..b7524387ca 100644 --- a/src/widgets/widgets/qabstractspinbox_p.h +++ b/src/widgets/widgets/qabstractspinbox_p.h @@ -53,12 +53,12 @@ // We mean it. // -#include "QtGui/qabstractspinbox.h" +#include "QtWidgets/qabstractspinbox.h" #ifndef QT_NO_SPINBOX -#include "QtGui/qlineedit.h" -#include "QtGui/qstyleoption.h" +#include "QtWidgets/qlineedit.h" +#include "QtWidgets/qstyleoption.h" #include "QtGui/qvalidator.h" #include "QtCore/qdatetime.h" #include "QtCore/qvariant.h" diff --git a/src/widgets/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h index 08d2ca0a21..0d768a333c 100644 --- a/src/widgets/widgets/qcalendarwidget.h +++ b/src/widgets/widgets/qcalendarwidget.h @@ -42,7 +42,7 @@ #ifndef QCALENDARWIDGET_H #define QCALENDARWIDGET_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include <QtCore/qdatetime.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qcheckbox.h b/src/widgets/widgets/qcheckbox.h index ae2e93291f..f3d5cc185d 100644 --- a/src/widgets/widgets/qcheckbox.h +++ b/src/widgets/widgets/qcheckbox.h @@ -42,7 +42,7 @@ #ifndef QCHECKBOX_H #define QCHECKBOX_H -#include <QtGui/qabstractbutton.h> +#include <QtWidgets/qabstractbutton.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index fd6f68af2d..bfba3c7e6b 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -42,8 +42,8 @@ #ifndef QCOMBOBOX_H #define QCOMBOBOX_H -#include <QtGui/qwidget.h> -#include <QtGui/qabstractitemdelegate.h> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qabstractitemdelegate.h> #include <QtCore/qabstractitemmodel.h> #include <QtCore/qvariant.h> diff --git a/src/widgets/widgets/qcombobox_p.h b/src/widgets/widgets/qcombobox_p.h index cd84b87564..e58c1e5a3d 100644 --- a/src/widgets/widgets/qcombobox_p.h +++ b/src/widgets/widgets/qcombobox_p.h @@ -53,24 +53,24 @@ // We mean it. // -#include "QtGui/qcombobox.h" +#include "QtWidgets/qcombobox.h" #ifndef QT_NO_COMBOBOX -#include "QtGui/qabstractslider.h" -#include "QtGui/qapplication.h" -#include "QtGui/qitemdelegate.h" -#include "QtGui/qstandarditemmodel.h" -#include "QtGui/qlineedit.h" -#include "QtGui/qlistview.h" +#include "QtWidgets/qabstractslider.h" +#include "QtWidgets/qapplication.h" +#include "QtWidgets/qitemdelegate.h" +#include "QtWidgets/qstandarditemmodel.h" +#include "QtWidgets/qlineedit.h" +#include "QtWidgets/qlistview.h" #include "QtGui/qpainter.h" -#include "QtGui/qstyle.h" -#include "QtGui/qstyleoption.h" +#include "QtWidgets/qstyle.h" +#include "QtWidgets/qstyleoption.h" #include "QtCore/qhash.h" #include "QtCore/qpair.h" #include "QtCore/qtimer.h" #include "private/qwidget_p.h" #include "QtCore/qpointer.h" -#include "QtGui/qcompleter.h" +#include "QtWidgets/qcompleter.h" #include "QtGui/qevent.h" #include "QtCore/qdebug.h" diff --git a/src/widgets/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h index 0dc5dfc58d..326697fc86 100644 --- a/src/widgets/widgets/qcommandlinkbutton.h +++ b/src/widgets/widgets/qcommandlinkbutton.h @@ -42,7 +42,7 @@ #ifndef QCOMMANDLINKBUTTON_H #define QCOMMANDLINKBUTTON_H -#include <QtGui/qpushbutton.h> +#include <QtWidgets/qpushbutton.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qdatetimeedit.h b/src/widgets/widgets/qdatetimeedit.h index d174a41fc7..429fa0c590 100644 --- a/src/widgets/widgets/qdatetimeedit.h +++ b/src/widgets/widgets/qdatetimeedit.h @@ -44,7 +44,7 @@ #include <QtCore/qdatetime.h> #include <QtCore/qvariant.h> -#include <QtGui/qabstractspinbox.h> +#include <QtWidgets/qabstractspinbox.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h index acdc87826d..81e2afa53e 100644 --- a/src/widgets/widgets/qdatetimeedit_p.h +++ b/src/widgets/widgets/qdatetimeedit_p.h @@ -53,15 +53,15 @@ // We mean it. // -#include "QtGui/qcombobox.h" -#include "QtGui/qcalendarwidget.h" -#include "QtGui/qspinbox.h" -#include "QtGui/qtoolbutton.h" -#include "QtGui/qmenu.h" -#include "QtGui/qlabel.h" -#include "QtGui/qdatetimeedit.h" -#include "QtGui/private/qabstractspinbox_p.h" -#include "QtCore/private/qdatetime_p.h" +#include "QtWidgets/qcombobox.h" +#include "QtWidgets/qcalendarwidget.h" +#include "QtWidgets/qspinbox.h" +#include "QtWidgets/qtoolbutton.h" +#include "QtWidgets/qmenu.h" +#include "QtWidgets/qlabel.h" +#include "QtWidgets/qdatetimeedit.h" +#include "private/qabstractspinbox_p.h" +#include "private/qdatetime_p.h" #include "qdebug.h" diff --git a/src/widgets/widgets/qdial.h b/src/widgets/widgets/qdial.h index 6786358969..ee3930c23d 100644 --- a/src/widgets/widgets/qdial.h +++ b/src/widgets/widgets/qdial.h @@ -43,7 +43,7 @@ #ifndef QDIAL_H #define QDIAL_H -#include <QtGui/qabstractslider.h> +#include <QtWidgets/qabstractslider.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp index 6fe87b6ac8..5147cb12a7 100644 --- a/src/widgets/widgets/qdialogbuttonbox.cpp +++ b/src/widgets/widgets/qdialogbuttonbox.cpp @@ -40,18 +40,18 @@ ****************************************************************************/ #include <QtCore/qhash.h> -#include <QtGui/qpushbutton.h> -#include <QtGui/qstyle.h> -#include <QtGui/qlayout.h> -#include <QtGui/qdialog.h> -#include <QtGui/qapplication.h> -#include <QtGui/private/qwidget_p.h> -#include <QtGui/qaction.h> +#include <QtWidgets/qpushbutton.h> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qlayout.h> +#include <QtWidgets/qdialog.h> +#include <QtWidgets/qapplication.h> +#include <private/qwidget_p.h> +#include <QtWidgets/qaction.h> #include "qdialogbuttonbox.h" #ifdef QT_SOFTKEYS_ENABLED -#include <QtGui/qaction.h> +#include <QtWidgets/qaction.h> #endif diff --git a/src/widgets/widgets/qdialogbuttonbox.h b/src/widgets/widgets/qdialogbuttonbox.h index 4e390134c4..3bf242ba2f 100644 --- a/src/widgets/widgets/qdialogbuttonbox.h +++ b/src/widgets/widgets/qdialogbuttonbox.h @@ -42,7 +42,7 @@ #ifndef QDIALOGBUTTONBOX_H #define QDIALOGBUTTONBOX_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp index 223421dfb2..49feb476bf 100644 --- a/src/widgets/widgets/qdockarealayout.cpp +++ b/src/widgets/widgets/qdockarealayout.cpp @@ -39,11 +39,11 @@ ** ****************************************************************************/ -#include "QtGui/qapplication.h" -#include "QtGui/qwidget.h" -#include "QtGui/qtabbar.h" -#include "QtGui/qstyle.h" -#include "QtGui/qdesktopwidget.h" +#include "QtWidgets/qapplication.h" +#include "QtWidgets/qwidget.h" +#include "QtWidgets/qtabbar.h" +#include "QtWidgets/qstyle.h" +#include "QtWidgets/qdesktopwidget.h" #include "QtCore/qvariant.h" #include "qdockarealayout_p.h" #include "qdockwidget.h" diff --git a/src/widgets/widgets/qdockarealayout_p.h b/src/widgets/widgets/qdockarealayout_p.h index c1c8445b3d..a83a930c04 100644 --- a/src/widgets/widgets/qdockarealayout_p.h +++ b/src/widgets/widgets/qdockarealayout_p.h @@ -57,7 +57,7 @@ #include "QtCore/qpair.h" #include "QtCore/qlist.h" #include "QtCore/qvector.h" -#include "QtGui/qlayout.h" +#include "QtWidgets/qlayout.h" #ifndef QT_NO_DOCKWIDGET diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h index d26528bcb1..e6ff1756f3 100644 --- a/src/widgets/widgets/qdockwidget.h +++ b/src/widgets/widgets/qdockwidget.h @@ -42,7 +42,7 @@ #ifndef QDYNAMICDOCKWIDGET_H #define QDYNAMICDOCKWIDGET_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h index f71a276003..cf674d5d73 100644 --- a/src/widgets/widgets/qdockwidget_p.h +++ b/src/widgets/widgets/qdockwidget_p.h @@ -53,10 +53,10 @@ // We mean it. // -#include "QtGui/qstyleoption.h" +#include "QtWidgets/qstyleoption.h" #include "private/qwidget_p.h" -#include "QtGui/qboxlayout.h" -#include "QtGui/qdockwidget.h" +#include "QtWidgets/qboxlayout.h" +#include "QtWidgets/qdockwidget.h" #ifndef QT_NO_DOCKWIDGET diff --git a/src/widgets/widgets/qfocusframe.h b/src/widgets/widgets/qfocusframe.h index 3ed411d558..82d61b6067 100644 --- a/src/widgets/widgets/qfocusframe.h +++ b/src/widgets/widgets/qfocusframe.h @@ -42,7 +42,7 @@ #ifndef QFOCUSFRAME_H #define QFOCUSFRAME_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qfontcombobox.h b/src/widgets/widgets/qfontcombobox.h index 1eb647a855..6a7f755476 100644 --- a/src/widgets/widgets/qfontcombobox.h +++ b/src/widgets/widgets/qfontcombobox.h @@ -42,7 +42,7 @@ #ifndef QFONTCOMBOBOX_H #define QFONTCOMBOBOX_H -#include <QtGui/qcombobox.h> +#include <QtWidgets/qcombobox.h> #include <QtGui/qfontdatabase.h> #ifndef QT_NO_FONTCOMBOBOX diff --git a/src/widgets/widgets/qframe.h b/src/widgets/widgets/qframe.h index 8596961e62..d93db6b7cb 100644 --- a/src/widgets/widgets/qframe.h +++ b/src/widgets/widgets/qframe.h @@ -42,7 +42,7 @@ #ifndef QFRAME_H #define QFRAME_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h index 84dc886bb9..b84a34ff2b 100644 --- a/src/widgets/widgets/qgroupbox.h +++ b/src/widgets/widgets/qgroupbox.h @@ -42,7 +42,7 @@ #ifndef QGROUPBOX_H #define QGROUPBOX_H -#include <QtGui/qframe.h> +#include <QtWidgets/qframe.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qlabel.h b/src/widgets/widgets/qlabel.h index 27ab164dc6..a355b087b4 100644 --- a/src/widgets/widgets/qlabel.h +++ b/src/widgets/widgets/qlabel.h @@ -42,7 +42,7 @@ #ifndef QLABEL_H #define QLABEL_H -#include <QtGui/qframe.h> +#include <QtWidgets/qframe.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qlcdnumber.h b/src/widgets/widgets/qlcdnumber.h index b1719881bd..a2eacecc33 100644 --- a/src/widgets/widgets/qlcdnumber.h +++ b/src/widgets/widgets/qlcdnumber.h @@ -42,7 +42,7 @@ #ifndef QLCDNUMBER_H #define QLCDNUMBER_H -#include <QtGui/qframe.h> +#include <QtWidgets/qframe.h> #include <QtCore/qbitarray.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h index 73a736c690..7f7a7287fb 100644 --- a/src/widgets/widgets/qlineedit.h +++ b/src/widgets/widgets/qlineedit.h @@ -42,7 +42,7 @@ #ifndef QLINEEDIT_H #define QLINEEDIT_H -#include <QtGui/qframe.h> +#include <QtWidgets/qframe.h> #include <QtGui/qtextcursor.h> #include <QtCore/qstring.h> #include <QtCore/qmargins.h> diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index 32f6077438..b3ec575c86 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -57,13 +57,13 @@ #ifndef QT_NO_LINEEDIT #include "private/qwidget_p.h" -#include "QtGui/qlineedit.h" +#include "QtWidgets/qlineedit.h" #include "QtGui/qtextlayout.h" -#include "QtGui/qstyleoption.h" +#include "QtWidgets/qstyleoption.h" #include "QtCore/qbasictimer.h" -#include "QtGui/qcompleter.h" +#include "QtWidgets/qcompleter.h" #include "QtCore/qpointer.h" -#include "QtGui/qlineedit.h" +#include "QtWidgets/qlineedit.h" #include "private/qlinecontrol_p.h" diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index 051ee57cf2..73d7436805 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -42,8 +42,8 @@ #ifndef QDYNAMICMAINWINDOW_H #define QDYNAMICMAINWINDOW_H -#include <QtGui/qwidget.h> -#include <QtGui/qtabwidget.h> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qtabwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 20aca61deb..7d287c3038 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -57,8 +57,8 @@ #ifndef QT_NO_MAINWINDOW -#include "QtGui/qlayout.h" -#include "QtGui/qtabbar.h" +#include "QtWidgets/qlayout.h" +#include "QtWidgets/qtabbar.h" #include "QtCore/qvector.h" #include "QtCore/qset.h" #include "QtCore/qbasictimer.h" diff --git a/src/widgets/widgets/qmdiarea.h b/src/widgets/widgets/qmdiarea.h index a4b357c667..de64e11027 100644 --- a/src/widgets/widgets/qmdiarea.h +++ b/src/widgets/widgets/qmdiarea.h @@ -42,8 +42,8 @@ #ifndef QMDIAREA_H #define QMDIAREA_H -#include <QtGui/qabstractscrollarea.h> -#include <QtGui/qtabwidget.h> +#include <QtWidgets/qabstractscrollarea.h> +#include <QtWidgets/qtabwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qmdiarea_p.h b/src/widgets/widgets/qmdiarea_p.h index e5e20570d1..64624cc109 100644 --- a/src/widgets/widgets/qmdiarea_p.h +++ b/src/widgets/widgets/qmdiarea_p.h @@ -61,7 +61,7 @@ #include <QList> #include <QRect> #include <QPoint> -#include <QtGui/qapplication.h> +#include <QtWidgets/qapplication.h> #include <private/qmdisubwindow_p.h> #include <private/qabstractscrollarea_p.h> diff --git a/src/widgets/widgets/qmdisubwindow.h b/src/widgets/widgets/qmdisubwindow.h index 98c7b4c9c4..05021f1e5c 100644 --- a/src/widgets/widgets/qmdisubwindow.h +++ b/src/widgets/widgets/qmdisubwindow.h @@ -42,7 +42,7 @@ #ifndef QMDISUBWINDOW_H #define QMDISUBWINDOW_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index daac91632a..aa3a48cc17 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -42,10 +42,10 @@ #ifndef QMENU_H #define QMENU_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include <QtCore/qstring.h> -#include <QtGui/qicon.h> -#include <QtGui/qaction.h> +#include <QtWidgets/qicon.h> +#include <QtWidgets/qaction.h> #ifdef QT3_SUPPORT #include <QtGui/qpixmap.h> diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h index b6efde34cc..ad8818d76e 100644 --- a/src/widgets/widgets/qmenu_p.h +++ b/src/widgets/widgets/qmenu_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "QtGui/qmenubar.h" -#include "QtGui/qstyleoption.h" +#include "QtWidgets/qmenubar.h" +#include "QtWidgets/qstyleoption.h" #include "QtCore/qdatetime.h" #include "QtCore/qmap.h" #include "QtCore/qhash.h" diff --git a/src/widgets/widgets/qmenubar.h b/src/widgets/widgets/qmenubar.h index c22fceb8c2..f0e05b217d 100644 --- a/src/widgets/widgets/qmenubar.h +++ b/src/widgets/widgets/qmenubar.h @@ -42,7 +42,7 @@ #ifndef QMENUBAR_H #define QMENUBAR_H -#include <QtGui/qmenu.h> +#include <QtWidgets/qmenu.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qmenubar_p.h b/src/widgets/widgets/qmenubar_p.h index 5afe71376d..939cd430de 100644 --- a/src/widgets/widgets/qmenubar_p.h +++ b/src/widgets/widgets/qmenubar_p.h @@ -54,7 +54,7 @@ // #ifndef QMAC_Q3MENUBAR_CPP_FILE -#include "QtGui/qstyleoption.h" +#include "QtWidgets/qstyleoption.h" #include <private/qmenu_p.h> // Mac needs what in this file! #ifdef Q_WS_WINCE diff --git a/src/widgets/widgets/qmenudata.h b/src/widgets/widgets/qmenudata.h index b303f41394..c42a795183 100644 --- a/src/widgets/widgets/qmenudata.h +++ b/src/widgets/widgets/qmenudata.h @@ -45,7 +45,7 @@ #include <QtCore/qglobal.h> #ifdef QT3_SUPPORT -#include <QtGui/qaction.h> +#include <QtWidgets/qaction.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qplaintextedit.h b/src/widgets/widgets/qplaintextedit.h index 737bcb80b0..9269543ee8 100644 --- a/src/widgets/widgets/qplaintextedit.h +++ b/src/widgets/widgets/qplaintextedit.h @@ -42,9 +42,9 @@ #ifndef QPLAINTEXTEDIT_H #define QPLAINTEXTEDIT_H -#include <QtGui/qtextedit.h> +#include <QtWidgets/qtextedit.h> -#include <QtGui/qabstractscrollarea.h> +#include <QtWidgets/qabstractscrollarea.h> #include <QtGui/qtextdocument.h> #include <QtGui/qtextoption.h> #include <QtGui/qtextcursor.h> diff --git a/src/widgets/widgets/qplaintextedit_p.h b/src/widgets/widgets/qplaintextedit_p.h index 7988ad8772..ca059bc5b5 100644 --- a/src/widgets/widgets/qplaintextedit_p.h +++ b/src/widgets/widgets/qplaintextedit_p.h @@ -55,10 +55,10 @@ #include "private/qabstractscrollarea_p.h" #include "QtGui/qtextdocumentfragment.h" -#include "QtGui/qscrollbar.h" +#include "QtWidgets/qscrollbar.h" #include "QtGui/qtextcursor.h" #include "QtGui/qtextformat.h" -#include "QtGui/qmenu.h" +#include "QtWidgets/qmenu.h" #include "QtGui/qabstracttextdocumentlayout.h" #include "QtCore/qbasictimer.h" #include "private/qtextcontrol_p.h" diff --git a/src/widgets/widgets/qprintpreviewwidget.cpp b/src/widgets/widgets/qprintpreviewwidget.cpp index 9da3e47698..0b30af3d17 100644 --- a/src/widgets/widgets/qprintpreviewwidget.cpp +++ b/src/widgets/widgets/qprintpreviewwidget.cpp @@ -44,11 +44,11 @@ #include <private/qprinter_p.h> #include <QtCore/qmath.h> -#include <QtGui/qboxlayout.h> -#include <QtGui/qgraphicsitem.h> -#include <QtGui/qgraphicsview.h> -#include <QtGui/qscrollbar.h> -#include <QtGui/qstyleoption.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qgraphicsitem.h> +#include <QtWidgets/qgraphicsview.h> +#include <QtWidgets/qscrollbar.h> +#include <QtWidgets/qstyleoption.h> #ifndef QT_NO_PRINTPREVIEWWIDGET diff --git a/src/widgets/widgets/qprintpreviewwidget.h b/src/widgets/widgets/qprintpreviewwidget.h index a5d8fc6bc2..ac2e15b461 100644 --- a/src/widgets/widgets/qprintpreviewwidget.h +++ b/src/widgets/widgets/qprintpreviewwidget.h @@ -42,7 +42,7 @@ #ifndef QPRINTPREVIEWWIDGET_H #define QPRINTPREVIEWWIDGET_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include <QtGui/qprinter.h> #ifndef QT_NO_PRINTPREVIEWWIDGET diff --git a/src/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h index 23bc26dc1e..4690400feb 100644 --- a/src/widgets/widgets/qprogressbar.h +++ b/src/widgets/widgets/qprogressbar.h @@ -42,7 +42,7 @@ #ifndef QPROGRESSBAR_H #define QPROGRESSBAR_H -#include <QtGui/qframe.h> +#include <QtWidgets/qframe.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qpushbutton.h b/src/widgets/widgets/qpushbutton.h index 59d04055f7..412eb513d8 100644 --- a/src/widgets/widgets/qpushbutton.h +++ b/src/widgets/widgets/qpushbutton.h @@ -42,7 +42,7 @@ #ifndef QPUSHBUTTON_H #define QPUSHBUTTON_H -#include <QtGui/qabstractbutton.h> +#include <QtWidgets/qabstractbutton.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qradiobutton.h b/src/widgets/widgets/qradiobutton.h index b720498897..4489b93291 100644 --- a/src/widgets/widgets/qradiobutton.h +++ b/src/widgets/widgets/qradiobutton.h @@ -42,7 +42,7 @@ #ifndef QRADIOBUTTON_H #define QRADIOBUTTON_H -#include <QtGui/qabstractbutton.h> +#include <QtWidgets/qabstractbutton.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qrubberband.h b/src/widgets/widgets/qrubberband.h index 85fc17fc32..26257d351f 100644 --- a/src/widgets/widgets/qrubberband.h +++ b/src/widgets/widgets/qrubberband.h @@ -42,7 +42,7 @@ #ifndef QRUBBERBAND_H #define QRUBBERBAND_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qscrollarea.h b/src/widgets/widgets/qscrollarea.h index 0c1ef8750c..637f2ffb39 100644 --- a/src/widgets/widgets/qscrollarea.h +++ b/src/widgets/widgets/qscrollarea.h @@ -42,7 +42,7 @@ #ifndef QSCROLLAREA_H #define QSCROLLAREA_H -#include <QtGui/qabstractscrollarea.h> +#include <QtWidgets/qabstractscrollarea.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qscrollarea_p.h b/src/widgets/widgets/qscrollarea_p.h index cff39ea452..4a30ce217b 100644 --- a/src/widgets/widgets/qscrollarea_p.h +++ b/src/widgets/widgets/qscrollarea_p.h @@ -56,7 +56,7 @@ #ifndef QT_NO_SCROLLAREA #include "private/qabstractscrollarea_p.h" -#include <QtGui/qscrollbar.h> +#include <QtWidgets/qscrollbar.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qscrollbar.h b/src/widgets/widgets/qscrollbar.h index e407f575f5..47f858fe3f 100644 --- a/src/widgets/widgets/qscrollbar.h +++ b/src/widgets/widgets/qscrollbar.h @@ -42,8 +42,8 @@ #ifndef QSCROLLBAR_H #define QSCROLLBAR_H -#include <QtGui/qwidget.h> -#include <QtGui/qabstractslider.h> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qabstractslider.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qsizegrip.cpp b/src/widgets/widgets/qsizegrip.cpp index 630aecfc09..d5c231020c 100644 --- a/src/widgets/widgets/qsizegrip.cpp +++ b/src/widgets/widgets/qsizegrip.cpp @@ -62,7 +62,7 @@ #endif #include <private/qwidget_p.h> -#include <QtGui/qabstractscrollarea.h> +#include <QtWidgets/qabstractscrollarea.h> #define SZ_SIZEBOTTOMRIGHT 0xf008 #define SZ_SIZEBOTTOMLEFT 0xf007 diff --git a/src/widgets/widgets/qsizegrip.h b/src/widgets/widgets/qsizegrip.h index 7ec0818129..acb98e3a3c 100644 --- a/src/widgets/widgets/qsizegrip.h +++ b/src/widgets/widgets/qsizegrip.h @@ -42,7 +42,7 @@ #ifndef QSIZEGRIP_H #define QSIZEGRIP_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qslider.h b/src/widgets/widgets/qslider.h index a2201da9a2..a6c457267e 100644 --- a/src/widgets/widgets/qslider.h +++ b/src/widgets/widgets/qslider.h @@ -42,7 +42,7 @@ #ifndef QSLIDER_H #define QSLIDER_H -#include <QtGui/qabstractslider.h> +#include <QtWidgets/qabstractslider.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h index 8c9f67b29c..cb7f0b8b69 100644 --- a/src/widgets/widgets/qspinbox.h +++ b/src/widgets/widgets/qspinbox.h @@ -42,7 +42,7 @@ #ifndef QSPINBOX_H #define QSPINBOX_H -#include <QtGui/qabstractspinbox.h> +#include <QtWidgets/qabstractspinbox.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h index 588054f196..b2ea2b7f51 100644 --- a/src/widgets/widgets/qsplashscreen.h +++ b/src/widgets/widgets/qsplashscreen.h @@ -43,7 +43,7 @@ #define QSPLASHSCREEN_H #include <QtGui/qpixmap.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h index a3758eabe9..9650fa71c1 100644 --- a/src/widgets/widgets/qsplitter.h +++ b/src/widgets/widgets/qsplitter.h @@ -42,8 +42,8 @@ #ifndef QSPLITTER_H #define QSPLITTER_H -#include <QtGui/qframe.h> -#include <QtGui/qsizepolicy.h> +#include <QtWidgets/qframe.h> +#include <QtWidgets/qsizepolicy.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qstackedwidget.h b/src/widgets/widgets/qstackedwidget.h index 7919674aa7..ce81c6f65a 100644 --- a/src/widgets/widgets/qstackedwidget.h +++ b/src/widgets/widgets/qstackedwidget.h @@ -42,7 +42,7 @@ #ifndef QSTACKEDWIDGET_H #define QSTACKEDWIDGET_H -#include <QtGui/qframe.h> +#include <QtWidgets/qframe.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qstatusbar.h b/src/widgets/widgets/qstatusbar.h index 598aa4b890..9cb030e584 100644 --- a/src/widgets/widgets/qstatusbar.h +++ b/src/widgets/widgets/qstatusbar.h @@ -42,7 +42,7 @@ #ifndef QSTATUSBAR_H #define QSTATUSBAR_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h index b558445fc9..31b766ca5f 100644 --- a/src/widgets/widgets/qtabbar.h +++ b/src/widgets/widgets/qtabbar.h @@ -42,7 +42,7 @@ #ifndef QTABBAR_H #define QTABBAR_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h index b0e6fb3891..cc8d0265f6 100644 --- a/src/widgets/widgets/qtabwidget.h +++ b/src/widgets/widgets/qtabwidget.h @@ -42,8 +42,8 @@ #ifndef QTABWIDGET_H #define QTABWIDGET_H -#include <QtGui/qwidget.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qicon.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h index a30ce4d705..eb83820ea5 100644 --- a/src/widgets/widgets/qtextbrowser.h +++ b/src/widgets/widgets/qtextbrowser.h @@ -42,7 +42,7 @@ #ifndef QTEXTBROWSER_H #define QTEXTBROWSER_H -#include <QtGui/qtextedit.h> +#include <QtWidgets/qtextedit.h> #include <QtCore/qurl.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index 459f9bdd5e..59fd7542fa 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -42,7 +42,7 @@ #ifndef QTEXTEDIT_H #define QTEXTEDIT_H -#include <QtGui/qabstractscrollarea.h> +#include <QtWidgets/qabstractscrollarea.h> #include <QtGui/qtextdocument.h> #include <QtGui/qtextoption.h> #include <QtGui/qtextcursor.h> diff --git a/src/widgets/widgets/qtextedit_p.h b/src/widgets/widgets/qtextedit_p.h index 63941142a2..fc6b2a96fb 100644 --- a/src/widgets/widgets/qtextedit_p.h +++ b/src/widgets/widgets/qtextedit_p.h @@ -55,10 +55,10 @@ #include "private/qabstractscrollarea_p.h" #include "QtGui/qtextdocumentfragment.h" -#include "QtGui/qscrollbar.h" +#include "QtWidgets/qscrollbar.h" #include "QtGui/qtextcursor.h" #include "QtGui/qtextformat.h" -#include "QtGui/qmenu.h" +#include "QtWidgets/qmenu.h" #include "QtGui/qabstracttextdocumentlayout.h" #include "QtCore/qbasictimer.h" #include "QtCore/qurl.h" diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h index 116086ae7a..290b4d6f59 100644 --- a/src/widgets/widgets/qtoolbar.h +++ b/src/widgets/widgets/qtoolbar.h @@ -42,7 +42,7 @@ #ifndef QDYNAMICTOOLBAR_H #define QDYNAMICTOOLBAR_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qtoolbar_p.h b/src/widgets/widgets/qtoolbar_p.h index 3970c359e1..8159f3381e 100644 --- a/src/widgets/widgets/qtoolbar_p.h +++ b/src/widgets/widgets/qtoolbar_p.h @@ -54,7 +54,7 @@ // #include "qtoolbar.h" -#include "QtGui/qaction.h" +#include "QtWidgets/qaction.h" #include "private/qwidget_p.h" #include <QtCore/qbasictimer.h> diff --git a/src/widgets/widgets/qtoolbarextension_p.h b/src/widgets/widgets/qtoolbarextension_p.h index 533adf1c4f..eb529343d7 100644 --- a/src/widgets/widgets/qtoolbarextension_p.h +++ b/src/widgets/widgets/qtoolbarextension_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "QtGui/qtoolbutton.h" +#include "QtWidgets/qtoolbutton.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qtoolbarlayout_p.h b/src/widgets/widgets/qtoolbarlayout_p.h index 5b234d69ad..47ea08d14f 100644 --- a/src/widgets/widgets/qtoolbarlayout_p.h +++ b/src/widgets/widgets/qtoolbarlayout_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include <QtGui/qlayout.h> +#include <QtWidgets/qlayout.h> #include <private/qlayoutengine_p.h> #include <QVector> diff --git a/src/widgets/widgets/qtoolbarseparator_p.h b/src/widgets/widgets/qtoolbarseparator_p.h index b2029fa53d..b90f3d201f 100644 --- a/src/widgets/widgets/qtoolbarseparator_p.h +++ b/src/widgets/widgets/qtoolbarseparator_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "QtGui/qwidget.h" +#include "QtWidgets/qwidget.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h index f004ee7b04..f4b8980719 100644 --- a/src/widgets/widgets/qtoolbox.h +++ b/src/widgets/widgets/qtoolbox.h @@ -42,8 +42,8 @@ #ifndef QTOOLBOX_H #define QTOOLBOX_H -#include <QtGui/qframe.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qframe.h> +#include <QtWidgets/qicon.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h index 6b5f70210e..b89c0d0daa 100644 --- a/src/widgets/widgets/qtoolbutton.h +++ b/src/widgets/widgets/qtoolbutton.h @@ -42,7 +42,7 @@ #ifndef QTOOLBUTTON_H #define QTOOLBUTTON_H -#include <QtGui/qabstractbutton.h> +#include <QtWidgets/qabstractbutton.h> QT_BEGIN_HEADER diff --git a/src/widgets/widgets/qwidgetanimator.cpp b/src/widgets/widgets/qwidgetanimator.cpp index 7530412c09..4df14098ae 100644 --- a/src/widgets/widgets/qwidgetanimator.cpp +++ b/src/widgets/widgets/qwidgetanimator.cpp @@ -40,8 +40,8 @@ ****************************************************************************/ #include <QtCore/qpropertyanimation.h> -#include <QtGui/qwidget.h> -#include <QtGui/private/qmainwindowlayout_p.h> +#include <QtWidgets/qwidget.h> +#include <private/qmainwindowlayout_p.h> #include "qwidgetanimator_p.h" diff --git a/src/widgets/widgets/qworkspace.h b/src/widgets/widgets/qworkspace.h index f0b7c26867..af8b2eae2d 100644 --- a/src/widgets/widgets/qworkspace.h +++ b/src/widgets/widgets/qworkspace.h @@ -42,7 +42,7 @@ #ifndef QWORKSPACE_H #define QWORKSPACE_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER |