diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-07 15:05:43 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-07 19:36:54 +0200 |
| commit | 94c0628d22e844a23e1ee27cd3df03cc9e0e2c25 (patch) | |
| tree | cd9c206d19ed9d4f246f4dc59c743bd13216c6cc /src/widgets | |
| parent | e135c811bbde49b119c74b9ebb7f7b89e1b124fd (diff) | |
| download | qtbase-94c0628d22e844a23e1ee27cd3df03cc9e0e2c25.tar.gz | |
fix includes
Diffstat (limited to 'src/widgets')
215 files changed, 415 insertions, 413 deletions
diff --git a/src/widgets/accessible/qaccessible2.h b/src/widgets/accessible/qaccessible2.h index 65ab7166c6..2f660bda6e 100644 --- a/src/widgets/accessible/qaccessible2.h +++ b/src/widgets/accessible/qaccessible2.h @@ -42,7 +42,7 @@ #ifndef QACCESSIBLE2_H #define QACCESSIBLE2_H -#include <QtGui/qaccessible.h> +#include <QtWidgets/qaccessible.h> QT_BEGIN_HEADER diff --git a/src/widgets/accessible/qaccessibleobject.h b/src/widgets/accessible/qaccessibleobject.h index 0eb9399028..cc17fdc7c6 100644 --- a/src/widgets/accessible/qaccessibleobject.h +++ b/src/widgets/accessible/qaccessibleobject.h @@ -42,7 +42,7 @@ #ifndef QACCESSIBLEOBJECT_H #define QACCESSIBLEOBJECT_H -#include <QtGui/qaccessible.h> +#include <QtWidgets/qaccessible.h> QT_BEGIN_HEADER diff --git a/src/widgets/accessible/qaccessibleplugin.h b/src/widgets/accessible/qaccessibleplugin.h index dcf794e752..b073ca103a 100644 --- a/src/widgets/accessible/qaccessibleplugin.h +++ b/src/widgets/accessible/qaccessibleplugin.h @@ -42,7 +42,7 @@ #ifndef QACCESSIBLEPLUGIN_H #define QACCESSIBLEPLUGIN_H -#include <QtGui/qaccessible.h> +#include <QtWidgets/qaccessible.h> #include <QtCore/qfactoryinterface.h> QT_BEGIN_HEADER diff --git a/src/widgets/accessible/qaccessiblewidget.cpp b/src/widgets/accessible/qaccessiblewidget.cpp index 2b2cec0f02..d2d2984533 100644 --- a/src/widgets/accessible/qaccessiblewidget.cpp +++ b/src/widgets/accessible/qaccessiblewidget.cpp @@ -53,8 +53,8 @@ #include "qdebug.h" #include <qmath.h> #include <QRubberBand> -#include <QtGui/QFocusFrame> -#include <QtGui/QMenu> +#include <QFocusFrame> +#include <QMenu> QT_BEGIN_NAMESPACE diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h index ef22e05c60..4b53e319b1 100644 --- a/src/widgets/accessible/qaccessiblewidget.h +++ b/src/widgets/accessible/qaccessiblewidget.h @@ -42,7 +42,7 @@ #ifndef QACCESSIBLEWIDGET_H #define QACCESSIBLEWIDGET_H -#include <QtGui/qaccessibleobject.h> +#include <QtWidgets/qaccessibleobject.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qabstractpagesetupdialog.h b/src/widgets/dialogs/qabstractpagesetupdialog.h index ac3ffa5451..94e8566bc9 100644 --- a/src/widgets/dialogs/qabstractpagesetupdialog.h +++ b/src/widgets/dialogs/qabstractpagesetupdialog.h @@ -42,7 +42,7 @@ #ifndef QABSTRACTPAGESETUPDIALOG_H #define QABSTRACTPAGESETUPDIALOG_H -#include <QtGui/qdialog.h> +#include <QtWidgets/qdialog.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qabstractprintdialog.h b/src/widgets/dialogs/qabstractprintdialog.h index b9ac05ccff..fe02c58598 100644 --- a/src/widgets/dialogs/qabstractprintdialog.h +++ b/src/widgets/dialogs/qabstractprintdialog.h @@ -42,7 +42,7 @@ #ifndef QABSTRACTPRINTDIALOG_H #define QABSTRACTPRINTDIALOG_H -#include <QtGui/qdialog.h> +#include <QtWidgets/qdialog.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qabstractprintdialog_p.h b/src/widgets/dialogs/qabstractprintdialog_p.h index 1b5fa599f0..0de093805f 100644 --- a/src/widgets/dialogs/qabstractprintdialog_p.h +++ b/src/widgets/dialogs/qabstractprintdialog_p.h @@ -57,7 +57,7 @@ #ifndef QT_NO_PRINTDIALOG -#include "QtGui/qabstractprintdialog.h" +#include "QtWidgets/qabstractprintdialog.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index 80a893d568..2b3d24b171 100644 --- a/src/widgets/dialogs/qcolordialog.h +++ b/src/widgets/dialogs/qcolordialog.h @@ -42,7 +42,7 @@ #ifndef QCOLORDIALOG_H #define QCOLORDIALOG_H -#include <QtGui/qdialog.h> +#include <QtWidgets/qdialog.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h index ee23b7bf87..5780d15781 100644 --- a/src/widgets/dialogs/qdialog.h +++ b/src/widgets/dialogs/qdialog.h @@ -42,7 +42,7 @@ #ifndef QDIALOG_H #define QDIALOG_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h index a2a948e951..46c50c3c3f 100644 --- a/src/widgets/dialogs/qdialog_p.h +++ b/src/widgets/dialogs/qdialog_p.h @@ -56,8 +56,8 @@ #include "private/qwidget_p.h" #include "QtCore/qeventloop.h" #include "QtCore/qpointer.h" -#include "QtGui/qdialog.h" -#include "QtGui/qpushbutton.h" +#include "QtWidgets/qdialog.h" +#include "QtWidgets/qpushbutton.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qerrormessage.h b/src/widgets/dialogs/qerrormessage.h index 500482c722..7c7b56a7e9 100644 --- a/src/widgets/dialogs/qerrormessage.h +++ b/src/widgets/dialogs/qerrormessage.h @@ -42,7 +42,7 @@ #ifndef QERRORMESSAGE_H #define QERRORMESSAGE_H -#include <QtGui/qdialog.h> +#include <QtWidgets/qdialog.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index fabb575a5a..ce995aad5a 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -44,7 +44,7 @@ #include <QtCore/qdir.h> #include <QtCore/qstring.h> -#include <QtGui/qdialog.h> +#include <QtWidgets/qdialog.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h index 8aa9875d13..7a6edb2d02 100644 --- a/src/widgets/dialogs/qfilesystemmodel.h +++ b/src/widgets/dialogs/qfilesystemmodel.h @@ -45,7 +45,7 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qpair.h> #include <QtCore/qdir.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qicon.h> #include <QtCore/qdiriterator.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index b58021d877..60284ed6a1 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -66,7 +66,7 @@ #include <private/qfont_p.h> #if defined(Q_WS_S60) -#include <QtGui/qdesktopwidget.h> +#include <QtWidgets/qdesktopwidget.h> #endif QT_BEGIN_NAMESPACE diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h index a09f16d0a0..998e384abd 100644 --- a/src/widgets/dialogs/qfontdialog.h +++ b/src/widgets/dialogs/qfontdialog.h @@ -43,7 +43,7 @@ #define QFONTDIALOG_H #include <QtGui/qwindowdefs.h> -#include <QtGui/qdialog.h> +#include <QtWidgets/qdialog.h> #include <QtGui/qfont.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qfscompleter_p.h b/src/widgets/dialogs/qfscompleter_p.h index 26a6698a6c..9bb7ca1c26 100644 --- a/src/widgets/dialogs/qfscompleter_p.h +++ b/src/widgets/dialogs/qfscompleter_p.h @@ -54,7 +54,7 @@ // #include "qcompleter.h" -#include <QtGui/qfilesystemmodel.h> +#include <QtWidgets/qfilesystemmodel.h> QT_BEGIN_NAMESPACE #ifndef QT_NO_FSCOMPLETER diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index b0e6fbb216..6d8892a7f3 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -42,9 +42,9 @@ #ifndef QINPUTDIALOG_H #define QINPUTDIALOG_H -#include <QtGui/qdialog.h> +#include <QtWidgets/qdialog.h> #include <QtCore/qstring.h> -#include <QtGui/qlineedit.h> +#include <QtWidgets/qlineedit.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index d6dbcf6e78..5466a3838c 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -39,27 +39,27 @@ ** ****************************************************************************/ -#include <QtGui/qmessagebox.h> +#include <QtWidgets/qmessagebox.h> #ifndef QT_NO_MESSAGEBOX -#include <QtGui/qdialogbuttonbox.h> +#include <QtWidgets/qdialogbuttonbox.h> #include "private/qlabel_p.h" #include "private/qapplication_p.h" #include <QtCore/qlist.h> #include <QtCore/qdebug.h> -#include <QtGui/qstyle.h> -#include <QtGui/qstyleoption.h> -#include <QtGui/qgridlayout.h> -#include <QtGui/qdesktopwidget.h> -#include <QtGui/qpushbutton.h> -#include <QtGui/qaccessible.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qstyleoption.h> +#include <QtWidgets/qgridlayout.h> +#include <QtWidgets/qdesktopwidget.h> +#include <QtWidgets/qpushbutton.h> +#include <QtWidgets/qaccessible.h> +#include <QtWidgets/qicon.h> #include <QtGui/qtextdocument.h> -#include <QtGui/qapplication.h> -#include <QtGui/qtextedit.h> -#include <QtGui/qtextbrowser.h> -#include <QtGui/qmenu.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qtextedit.h> +#include <QtWidgets/qtextbrowser.h> +#include <QtWidgets/qmenu.h> #include "qdialog_p.h" #include <QtGui/qfont.h> #include <QtGui/qfontmetrics.h> diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index 37ddb38e2d..d1894e2c58 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -42,7 +42,7 @@ #ifndef QMESSAGEBOX_H #define QMESSAGEBOX_H -#include <QtGui/qdialog.h> +#include <QtWidgets/qdialog.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qpagesetupdialog.h b/src/widgets/dialogs/qpagesetupdialog.h index 184af251da..a0ec268adb 100644 --- a/src/widgets/dialogs/qpagesetupdialog.h +++ b/src/widgets/dialogs/qpagesetupdialog.h @@ -42,7 +42,7 @@ #ifndef QPAGESETUPDIALOG_H #define QPAGESETUPDIALOG_H -#include <QtGui/qabstractpagesetupdialog.h> +#include <QtWidgets/qabstractpagesetupdialog.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qprintdialog.h b/src/widgets/dialogs/qprintdialog.h index 05431608c4..a23766f0d8 100644 --- a/src/widgets/dialogs/qprintdialog.h +++ b/src/widgets/dialogs/qprintdialog.h @@ -42,7 +42,7 @@ #ifndef QPRINTDIALOG_H #define QPRINTDIALOG_H -#include <QtGui/qabstractprintdialog.h> +#include <QtWidgets/qabstractprintdialog.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qprintdialog_unix.cpp b/src/widgets/dialogs/qprintdialog_unix.cpp index c6a1474b21..bb43e9b689 100644 --- a/src/widgets/dialogs/qprintdialog_unix.cpp +++ b/src/widgets/dialogs/qprintdialog_unix.cpp @@ -44,16 +44,16 @@ #ifndef QT_NO_PRINTDIALOG #include "private/qabstractprintdialog_p.h" -#include <QtGui/qmessagebox.h> +#include <QtWidgets/qmessagebox.h> #include "qprintdialog.h" #include "qfiledialog.h" #include <QtCore/qdir.h> #include <QtGui/qevent.h> -#include <QtGui/qfilesystemmodel.h> -#include <QtGui/qstyleditemdelegate.h> +#include <QtWidgets/qfilesystemmodel.h> +#include <QtWidgets/qstyleditemdelegate.h> #include <QtGui/qprinter.h> -#include <QtGui/qdialogbuttonbox.h> +#include <QtWidgets/qdialogbuttonbox.h> #include "qfscompleter_p.h" #include "ui_qprintpropertieswidget.h" diff --git a/src/widgets/dialogs/qprintpreviewdialog.cpp b/src/widgets/dialogs/qprintpreviewdialog.cpp index 950500d739..a83944374b 100644 --- a/src/widgets/dialogs/qprintpreviewdialog.cpp +++ b/src/widgets/dialogs/qprintpreviewdialog.cpp @@ -45,20 +45,20 @@ #include "private/qdialog_p.h" #include "qprintdialog.h" -#include <QtGui/qaction.h> -#include <QtGui/qboxlayout.h> -#include <QtGui/qcombobox.h> -#include <QtGui/qlabel.h> -#include <QtGui/qlineedit.h> -#include <QtGui/qpagesetupdialog.h> +#include <QtWidgets/qaction.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qcombobox.h> +#include <QtWidgets/qlabel.h> +#include <QtWidgets/qlineedit.h> +#include <QtWidgets/qpagesetupdialog.h> #include <QtGui/qprinter.h> -#include <QtGui/qstyle.h> -#include <QtGui/qtoolbutton.h> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qtoolbutton.h> #include <QtGui/qvalidator.h> -#include <QtGui/qfiledialog.h> -#include <QtGui/qmainwindow.h> -#include <QtGui/qtoolbar.h> -#include <QtGui/qformlayout.h> +#include <QtWidgets/qfiledialog.h> +#include <QtWidgets/qmainwindow.h> +#include <QtWidgets/qtoolbar.h> +#include <QtWidgets/qformlayout.h> #include <QtCore/QCoreApplication> #include <math.h> diff --git a/src/widgets/dialogs/qprintpreviewdialog.h b/src/widgets/dialogs/qprintpreviewdialog.h index a49455b520..e7748819d3 100644 --- a/src/widgets/dialogs/qprintpreviewdialog.h +++ b/src/widgets/dialogs/qprintpreviewdialog.h @@ -42,7 +42,7 @@ #ifndef QPRINTPREVIEWDIALOG_H #define QPRINTPREVIEWDIALOG_H -#include <QtGui/qdialog.h> +#include <QtWidgets/qdialog.h> #ifndef QT_NO_PRINTPREVIEWDIALOG diff --git a/src/widgets/dialogs/qprogressdialog.cpp b/src/widgets/dialogs/qprogressdialog.cpp index a3fff9b617..841b41eee9 100644 --- a/src/widgets/dialogs/qprogressdialog.cpp +++ b/src/widgets/dialogs/qprogressdialog.cpp @@ -61,7 +61,7 @@ #include <qaction.h> #endif #ifdef Q_WS_S60 -#include <QtGui/qdesktopwidget.h> +#include <QtWidgets/qdesktopwidget.h> #endif diff --git a/src/widgets/dialogs/qprogressdialog.h b/src/widgets/dialogs/qprogressdialog.h index 21a40c152f..b7668774b9 100644 --- a/src/widgets/dialogs/qprogressdialog.h +++ b/src/widgets/dialogs/qprogressdialog.h @@ -42,7 +42,7 @@ #ifndef QPROGRESSDIALOG_H #define QPROGRESSDIALOG_H -#include <QtGui/qdialog.h> +#include <QtWidgets/qdialog.h> QT_BEGIN_HEADER diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h index 148a5924b9..c4813302a6 100644 --- a/src/widgets/dialogs/qwizard.h +++ b/src/widgets/dialogs/qwizard.h @@ -42,7 +42,7 @@ #ifndef QWIZARD_H #define QWIZARD_H -#include <QtGui/qdialog.h> +#include <QtWidgets/qdialog.h> QT_BEGIN_HEADER diff --git a/src/widgets/effects/qgraphicseffect.cpp b/src/widgets/effects/qgraphicseffect.cpp index 7ba38f6d3a..762fc83796 100644 --- a/src/widgets/effects/qgraphicseffect.cpp +++ b/src/widgets/effects/qgraphicseffect.cpp @@ -106,7 +106,7 @@ #include "qgraphicseffect_p.h" #include "private/qgraphicsitem_p.h" -#include <QtGui/qgraphicsitem.h> +#include <QtWidgets/qgraphicsitem.h> #include <QtGui/qimage.h> #include <QtGui/qpainter.h> diff --git a/src/widgets/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h index 961866c19b..c20d762e60 100644 --- a/src/widgets/effects/qpixmapfilter_p.h +++ b/src/widgets/effects/qpixmapfilter_p.h @@ -55,7 +55,7 @@ #include <QtCore/qnamespace.h> #include <QtGui/qpixmap.h> -#include <QtGui/qgraphicseffect.h> +#include <QtWidgets/qgraphicseffect.h> #ifndef QT_NO_GRAPHICSEFFECT QT_BEGIN_HEADER diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.h b/src/widgets/graphicsview/qgraphicsanchorlayout.h index cdb14bc3ba..ab4f957598 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout.h @@ -42,8 +42,8 @@ #ifndef QGRAPHICSANCHORLAYOUT_H #define QGRAPHICSANCHORLAYOUT_H -#include <QtGui/qgraphicsitem.h> -#include <QtGui/qgraphicslayout.h> +#include <QtWidgets/qgraphicsitem.h> +#include <QtWidgets/qgraphicslayout.h> QT_BEGIN_HEADER diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp index 48cbec3d62..38ddeb5ba7 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp +++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.cpp @@ -39,8 +39,8 @@ ** ****************************************************************************/ -#include <QtGui/qwidget.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qapplication.h> #include <QtCore/qlinkedlist.h> #include <QtCore/qstack.h> diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.h b/src/widgets/graphicsview/qgraphicsgridlayout.h index f493eb6153..2778683778 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.h +++ b/src/widgets/graphicsview/qgraphicsgridlayout.h @@ -42,8 +42,8 @@ #ifndef QGRAPHICSGRIDLAYOUT_H #define QGRAPHICSGRIDLAYOUT_H -#include <QtGui/qgraphicsitem.h> -#include <QtGui/qgraphicslayout.h> +#include <QtWidgets/qgraphicsitem.h> +#include <QtWidgets/qgraphicslayout.h> QT_BEGIN_HEADER diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp index e67fe82045..af9102f431 100644 --- a/src/widgets/graphicsview/qgraphicsitem.cpp +++ b/src/widgets/graphicsview/qgraphicsitem.cpp @@ -735,15 +735,15 @@ #include <QtCore/qvariant.h> #include <QtCore/qvarlengtharray.h> #include <QtCore/qnumeric.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qapplication.h> #include <QtGui/qbitmap.h> #include <QtGui/qpainter.h> #include <QtGui/qpainterpath.h> #include <QtGui/qpixmapcache.h> -#include <QtGui/qstyleoption.h> +#include <QtWidgets/qstyleoption.h> #include <QtGui/qevent.h> -#include <QtGui/qinputcontext.h> -#include <QtGui/qgraphicseffect.h> +#include <QtWidgets/qinputcontext.h> +#include <QtWidgets/qgraphicseffect.h> #ifndef QT_NO_ACCESSIBILITY # include "qaccessible.h" #endif diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index c622fb881e..113e6b9b7f 100644 --- a/src/widgets/graphicsview/qgraphicslayout.h +++ b/src/widgets/graphicsview/qgraphicslayout.h @@ -42,7 +42,7 @@ #ifndef QGRAPHICSLAYOUT_H #define QGRAPHICSLAYOUT_H -#include <QtGui/qgraphicslayoutitem.h> +#include <QtWidgets/qgraphicslayoutitem.h> QT_BEGIN_HEADER diff --git a/src/widgets/graphicsview/qgraphicslayout_p.h b/src/widgets/graphicsview/qgraphicslayout_p.h index 5358ec3cf4..e3c6ce7607 100644 --- a/src/widgets/graphicsview/qgraphicslayout_p.h +++ b/src/widgets/graphicsview/qgraphicslayout_p.h @@ -59,9 +59,9 @@ #include "qgraphicslayout.h" #include "qgraphicslayoutitem_p.h" -#include <QtGui/qstyle.h> -#include <QtGui/qwidget.h> -#include <QtGui/qstyleoption.h> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qwidget.h> +#include <QtWidgets/qstyleoption.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h index 7112dd06fc..a51b3320ad 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem.h +++ b/src/widgets/graphicsview/qgraphicslayoutitem.h @@ -43,7 +43,7 @@ #define QGRAPHICSLAYOUTITEM_H #include <QtCore/qscopedpointer.h> -#include <QtGui/qsizepolicy.h> +#include <QtWidgets/qsizepolicy.h> #include <QtGui/qevent.h> QT_BEGIN_HEADER diff --git a/src/widgets/graphicsview/qgraphicslayoutitem_p.h b/src/widgets/graphicsview/qgraphicslayoutitem_p.h index 85481b7a46..3751af315e 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem_p.h +++ b/src/widgets/graphicsview/qgraphicslayoutitem_p.h @@ -54,7 +54,7 @@ // #include <QtCore/QSizeF> -#include <QtGui/QSizePolicy> +#include <QtWidgets/QSizePolicy> QT_BEGIN_NAMESPACE diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.h b/src/widgets/graphicsview/qgraphicslinearlayout.h index 60749dbdaf..013731dc55 100644 --- a/src/widgets/graphicsview/qgraphicslinearlayout.h +++ b/src/widgets/graphicsview/qgraphicslinearlayout.h @@ -42,8 +42,8 @@ #ifndef QGRAPHICSLINEARLAYOUT_H #define QGRAPHICSLINEARLAYOUT_H -#include <QtGui/qgraphicsitem.h> -#include <QtGui/qgraphicslayout.h> +#include <QtWidgets/qgraphicsitem.h> +#include <QtWidgets/qgraphicslayout.h> QT_BEGIN_HEADER diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.cpp b/src/widgets/graphicsview/qgraphicsproxywidget.cpp index e6142e66ac..328c0803f1 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.cpp +++ b/src/widgets/graphicsview/qgraphicsproxywidget.cpp @@ -51,15 +51,15 @@ #include <QtCore/qdebug.h> #include <QtGui/qevent.h> -#include <QtGui/qgraphicsscene.h> -#include <QtGui/qgraphicssceneevent.h> -#include <QtGui/qlayout.h> +#include <QtWidgets/qgraphicsscene.h> +#include <QtWidgets/qgraphicssceneevent.h> +#include <QtWidgets/qlayout.h> #include <QtGui/qpainter.h> -#include <QtGui/qstyleoption.h> -#include <QtGui/qgraphicsview.h> -#include <QtGui/qlistview.h> -#include <QtGui/qlineedit.h> -#include <QtGui/qtextedit.h> +#include <QtWidgets/qstyleoption.h> +#include <QtWidgets/qgraphicsview.h> +#include <QtWidgets/qlistview.h> +#include <QtWidgets/qlineedit.h> +#include <QtWidgets/qtextedit.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.h b/src/widgets/graphicsview/qgraphicsproxywidget.h index b2ffe2f7d1..289c1e07f0 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.h +++ b/src/widgets/graphicsview/qgraphicsproxywidget.h @@ -42,7 +42,7 @@ #ifndef QGRAPHICSPROXYWIDGET_H #define QGRAPHICSPROXYWIDGET_H -#include <QtGui/qgraphicswidget.h> +#include <QtWidgets/qgraphicswidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index 0713d09296..0231dd9963 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -229,22 +229,22 @@ #include <QtCore/qtimer.h> #include <QtCore/qvarlengtharray.h> #include <QtCore/QMetaMethod> -#include <QtGui/qapplication.h> -#include <QtGui/qdesktopwidget.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qdesktopwidget.h> #include <QtGui/qevent.h> -#include <QtGui/qgraphicslayout.h> -#include <QtGui/qgraphicsproxywidget.h> -#include <QtGui/qgraphicswidget.h> +#include <QtWidgets/qgraphicslayout.h> +#include <QtWidgets/qgraphicsproxywidget.h> +#include <QtWidgets/qgraphicswidget.h> #include <QtGui/qmatrix.h> #include <QtGui/qpaintengine.h> #include <QtGui/qpainter.h> #include <QtGui/qpixmapcache.h> #include <QtGui/qpolygon.h> -#include <QtGui/qstyleoption.h> -#include <QtGui/qtooltip.h> +#include <QtWidgets/qstyleoption.h> +#include <QtWidgets/qtooltip.h> #include <QtGui/qtransform.h> -#include <QtGui/qinputcontext.h> -#include <QtGui/qgraphicseffect.h> +#include <QtWidgets/qinputcontext.h> +#include <QtWidgets/qgraphicseffect.h> #include <private/qapplication_p.h> #include <private/qobject_p.h> #ifdef Q_WS_X11 diff --git a/src/widgets/graphicsview/qgraphicsscene_p.h b/src/widgets/graphicsview/qgraphicsscene_p.h index 9460a4dc51..e75013ff8c 100644 --- a/src/widgets/graphicsview/qgraphicsscene_p.h +++ b/src/widgets/graphicsview/qgraphicsscene_p.h @@ -69,8 +69,8 @@ #include <QtCore/qset.h> #include <QtGui/qfont.h> #include <QtGui/qpalette.h> -#include <QtGui/qstyle.h> -#include <QtGui/qstyleoption.h> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qstyleoption.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/graphicsview/qgraphicssceneevent.cpp b/src/widgets/graphicsview/qgraphicssceneevent.cpp index 1b1f3db0aa..1236173840 100644 --- a/src/widgets/graphicsview/qgraphicssceneevent.cpp +++ b/src/widgets/graphicsview/qgraphicssceneevent.cpp @@ -263,7 +263,7 @@ #include <QtCore/qstring.h> #include "qgraphicsview.h" #include "qgraphicsitem.h" -#include <QtGui/qgesture.h> +#include <QtWidgets/qgesture.h> #include <private/qevent_p.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h index ef72f57faf..04d134b0d6 100644 --- a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h +++ b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h @@ -59,7 +59,7 @@ #include <QtCore/qrect.h> #include <QtCore/qlist.h> -#include <QtGui/qgraphicsitem.h> +#include <QtWidgets/qgraphicsitem.h> #include <private/qgraphicssceneindex_p.h> QT_BEGIN_HEADER diff --git a/src/widgets/graphicsview/qgraphicsview.cpp b/src/widgets/graphicsview/qgraphicsview.cpp index 488a36af49..07f09eb298 100644 --- a/src/widgets/graphicsview/qgraphicsview.cpp +++ b/src/widgets/graphicsview/qgraphicsview.cpp @@ -271,16 +271,16 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime < #include <QtCore/qdatetime.h> #include <QtCore/qdebug.h> #include <QtCore/qmath.h> -#include <QtGui/qapplication.h> -#include <QtGui/qdesktopwidget.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qdesktopwidget.h> #include <QtGui/qevent.h> -#include <QtGui/qlayout.h> +#include <QtWidgets/qlayout.h> #include <QtGui/qtransform.h> #include <QtGui/qmatrix.h> #include <QtGui/qpainter.h> -#include <QtGui/qscrollbar.h> -#include <QtGui/qstyleoption.h> -#include <QtGui/qinputcontext.h> +#include <QtWidgets/qscrollbar.h> +#include <QtWidgets/qstyleoption.h> +#include <QtWidgets/qinputcontext.h> #ifdef Q_WS_X11 #include <QtGui/qpaintengine.h> #include <private/qt_x11_p.h> diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h index b2a7bdb226..60bd3d5616 100644 --- a/src/widgets/graphicsview/qgraphicsview.h +++ b/src/widgets/graphicsview/qgraphicsview.h @@ -44,8 +44,8 @@ #include <QtCore/qmetatype.h> #include <QtGui/qpainter.h> -#include <QtGui/qscrollarea.h> -#include <QtGui/qgraphicsscene.h> +#include <QtWidgets/qscrollarea.h> +#include <QtWidgets/qgraphicsscene.h> QT_BEGIN_HEADER diff --git a/src/widgets/graphicsview/qgraphicsview_p.h b/src/widgets/graphicsview/qgraphicsview_p.h index 5572b7e770..0744ab7357 100644 --- a/src/widgets/graphicsview/qgraphicsview_p.h +++ b/src/widgets/graphicsview/qgraphicsview_p.h @@ -60,7 +60,7 @@ #include <QtGui/qevent.h> #include <QtCore/qcoreapplication.h> #include "qgraphicssceneevent.h" -#include <QtGui/qstyleoption.h> +#include <QtWidgets/qstyleoption.h> #include <private/qabstractscrollarea_p.h> #include <private/qapplication_p.h> diff --git a/src/widgets/graphicsview/qgraphicswidget.cpp b/src/widgets/graphicsview/qgraphicswidget.cpp index 675a5c5c77..60a80fc8b8 100644 --- a/src/widgets/graphicsview/qgraphicswidget.cpp +++ b/src/widgets/graphicsview/qgraphicswidget.cpp @@ -59,11 +59,11 @@ #include <private/qshortcutmap_p.h> #endif #include <QtCore/qmutex.h> -#include <QtGui/qapplication.h> -#include <QtGui/qgraphicsview.h> -#include <QtGui/qgraphicsproxywidget.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qgraphicsview.h> +#include <QtWidgets/qgraphicsproxywidget.h> #include <QtGui/qpalette.h> -#include <QtGui/qstyleoption.h> +#include <QtWidgets/qstyleoption.h> #include <qdebug.h> diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index 6cbe579608..5ccf45a43b 100644 --- a/src/widgets/graphicsview/qgraphicswidget.h +++ b/src/widgets/graphicsview/qgraphicswidget.h @@ -43,8 +43,8 @@ #define QGRAPHICSWIDGET_H #include <QtGui/qfont.h> -#include <QtGui/qgraphicslayoutitem.h> -#include <QtGui/qgraphicsitem.h> +#include <QtWidgets/qgraphicslayoutitem.h> +#include <QtWidgets/qgraphicsitem.h> #include <QtGui/qpalette.h> QT_BEGIN_HEADER diff --git a/src/widgets/graphicsview/qgraphicswidget_p.cpp b/src/widgets/graphicsview/qgraphicswidget_p.cpp index 45800551cb..cb2a2038c7 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.cpp +++ b/src/widgets/graphicsview/qgraphicswidget_p.cpp @@ -49,11 +49,11 @@ #include "qgraphicslayoutitem_p.h" #include "qgraphicslayout.h" #include "qgraphicsscene_p.h" -#include <QtGui/qapplication.h> -#include <QtGui/qgraphicsscene.h> -#include <QtGui/qstyleoption.h> -#include <QtGui/QStyleOptionTitleBar> -#include <QtGui/QGraphicsSceneMouseEvent> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qgraphicsscene.h> +#include <QtWidgets/qstyleoption.h> +#include <QtWidgets/QStyleOptionTitleBar> +#include <QtWidgets/QGraphicsSceneMouseEvent> #if defined(Q_WS_MAC) && !defined(QT_NO_STYLE_MAC) # include <QMacStyle> #endif diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h index 4379eafbde..546bac9d46 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.h +++ b/src/widgets/graphicsview/qgraphicswidget_p.h @@ -58,8 +58,8 @@ #include "qgraphicswidget.h" #include <QtGui/qfont.h> #include <QtGui/qpalette.h> -#include <QtGui/qsizepolicy.h> -#include <QtGui/qstyle.h> +#include <QtWidgets/qsizepolicy.h> +#include <QtWidgets/qstyle.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/inputmethod/qinputcontext.h b/src/widgets/inputmethod/qinputcontext.h index 089e6cdb9a..a447ae0fd9 100644 --- a/src/widgets/inputmethod/qinputcontext.h +++ b/src/widgets/inputmethod/qinputcontext.h @@ -61,7 +61,7 @@ #include <QtGui/qevent.h> #include <QtCore/qstring.h> #include <QtCore/qlist.h> -#include <QtGui/qaction.h> +#include <QtWidgets/qaction.h> #ifndef QT_NO_IM diff --git a/src/widgets/inputmethod/qmacinputcontext_p.h b/src/widgets/inputmethod/qmacinputcontext_p.h index c4575a3c60..10226d418d 100644 --- a/src/widgets/inputmethod/qmacinputcontext_p.h +++ b/src/widgets/inputmethod/qmacinputcontext_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "QtGui/qinputcontext.h" +#include "QtWidgets/qinputcontext.h" #include "private/qt_mac_p.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/inputmethod/qwininputcontext_p.h b/src/widgets/inputmethod/qwininputcontext_p.h index dc87000b6c..0fb574cdc6 100644 --- a/src/widgets/inputmethod/qwininputcontext_p.h +++ b/src/widgets/inputmethod/qwininputcontext_p.h @@ -53,7 +53,7 @@ // We mean it. // -#include "QtGui/qinputcontext.h" +#include "QtWidgets/qinputcontext.h" #include "QtCore/qt_windows.h" #if !defined(IMR_RECONVERTSTRING) diff --git a/src/widgets/inputmethod/qximinputcontext_p.h b/src/widgets/inputmethod/qximinputcontext_p.h index 13c389cce6..69b4fee9b3 100644 --- a/src/widgets/inputmethod/qximinputcontext_p.h +++ b/src/widgets/inputmethod/qximinputcontext_p.h @@ -70,7 +70,7 @@ #if !defined(Q_NO_IM) #include "QtCore/qglobal.h" -#include "QtGui/qinputcontext.h" +#include "QtWidgets/qinputcontext.h" #include "QtGui/qfont.h" #include "QtCore/qhash.h" #ifdef Q_WS_X11 diff --git a/src/widgets/itemviews/qabstractitemdelegate.h b/src/widgets/itemviews/qabstractitemdelegate.h index 6789317137..a0ce7c715c 100644 --- a/src/widgets/itemviews/qabstractitemdelegate.h +++ b/src/widgets/itemviews/qabstractitemdelegate.h @@ -43,7 +43,7 @@ #define QABSTRACTITEMDELEGATE_H #include <QtCore/qobject.h> -#include <QtGui/qstyleoption.h> +#include <QtWidgets/qstyleoption.h> QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index f11f209010..7ca5400566 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -42,10 +42,10 @@ #ifndef QABSTRACTITEMVIEW_H #define QABSTRACTITEMVIEW_H -#include <QtGui/qabstractscrollarea.h> +#include <QtWidgets/qabstractscrollarea.h> #include <QtCore/qabstractitemmodel.h> -#include <QtGui/qitemselectionmodel.h> -#include <QtGui/qabstractitemdelegate.h> +#include <QtWidgets/qitemselectionmodel.h> +#include <QtWidgets/qabstractitemdelegate.h> QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h index 6041e5e177..26ad627d90 100644 --- a/src/widgets/itemviews/qabstractitemview_p.h +++ b/src/widgets/itemviews/qabstractitemview_p.h @@ -55,7 +55,7 @@ #include "private/qabstractscrollarea_p.h" #include "private/qabstractitemmodel_p.h" -#include "QtGui/qapplication.h" +#include "QtWidgets/qapplication.h" #include "QtGui/qevent.h" #include "QtGui/qmime.h" #include "QtGui/qpainter.h" diff --git a/src/widgets/itemviews/qcolumnview.h b/src/widgets/itemviews/qcolumnview.h index a3f74b89d5..42747c2d25 100644 --- a/src/widgets/itemviews/qcolumnview.h +++ b/src/widgets/itemviews/qcolumnview.h @@ -42,7 +42,7 @@ #ifndef QCOLUMNVIEW_H #define QCOLUMNVIEW_H -#include <QtGui/qabstractitemview.h> +#include <QtWidgets/qabstractitemview.h> QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qcolumnview_p.h b/src/widgets/itemviews/qcolumnview_p.h index c42c236445..2bda4b1213 100644 --- a/src/widgets/itemviews/qcolumnview_p.h +++ b/src/widgets/itemviews/qcolumnview_p.h @@ -61,9 +61,9 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qpropertyanimation.h> -#include <QtGui/qabstractitemdelegate.h> -#include <QtGui/qabstractitemview.h> -#include <QtGui/qitemdelegate.h> +#include <QtWidgets/qabstractitemdelegate.h> +#include <QtWidgets/qabstractitemview.h> +#include <QtWidgets/qitemdelegate.h> #include <qlistview.h> #include <qevent.h> #include <qscrollbar.h> diff --git a/src/widgets/itemviews/qdirmodel.h b/src/widgets/itemviews/qdirmodel.h index 2b1cd9d81b..b081dfd34c 100644 --- a/src/widgets/itemviews/qdirmodel.h +++ b/src/widgets/itemviews/qdirmodel.h @@ -44,7 +44,7 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qdir.h> -#include <QtGui/qfileiconprovider.h> +#include <QtWidgets/qfileiconprovider.h> QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qfileiconprovider.h b/src/widgets/itemviews/qfileiconprovider.h index 5a70f80062..4950618979 100644 --- a/src/widgets/itemviews/qfileiconprovider.h +++ b/src/widgets/itemviews/qfileiconprovider.h @@ -44,7 +44,7 @@ #include <QtCore/qfileinfo.h> #include <QtCore/qscopedpointer.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qicon.h> QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h index bd0b7666b0..422fc7d8ff 100644 --- a/src/widgets/itemviews/qheaderview.h +++ b/src/widgets/itemviews/qheaderview.h @@ -42,7 +42,7 @@ #ifndef QHEADERVIEW_H #define QHEADERVIEW_H -#include <QtGui/qabstractitemview.h> +#include <QtWidgets/qabstractitemview.h> QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qheaderview_p.h b/src/widgets/itemviews/qheaderview_p.h index f4b7ff7df0..aeeff6b223 100644 --- a/src/widgets/itemviews/qheaderview_p.h +++ b/src/widgets/itemviews/qheaderview_p.h @@ -58,8 +58,8 @@ #ifndef QT_NO_ITEMVIEWS #include "QtCore/qbitarray.h" -#include "QtGui/qapplication.h" -#include "QtGui/qlabel.h" +#include "QtWidgets/qapplication.h" +#include "QtWidgets/qlabel.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h index 2df3d1c1c1..b5ca422cf9 100644 --- a/src/widgets/itemviews/qitemdelegate.h +++ b/src/widgets/itemviews/qitemdelegate.h @@ -42,7 +42,7 @@ #ifndef QITEMDELEGATE_H #define QITEMDELEGATE_H -#include <QtGui/qabstractitemdelegate.h> +#include <QtWidgets/qabstractitemdelegate.h> #include <QtCore/qstring.h> #include <QtGui/qpixmap.h> #include <QtCore/qvariant.h> diff --git a/src/widgets/itemviews/qlistview.h b/src/widgets/itemviews/qlistview.h index 3d6dd421f7..eaf776aff9 100644 --- a/src/widgets/itemviews/qlistview.h +++ b/src/widgets/itemviews/qlistview.h @@ -42,7 +42,7 @@ #ifndef QLISTVIEW_H #define QLISTVIEW_H -#include <QtGui/qabstractitemview.h> +#include <QtWidgets/qabstractitemview.h> QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index ff6616dfac..d9dadc51f0 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -42,10 +42,10 @@ #ifndef QLISTWIDGET_H #define QLISTWIDGET_H -#include <QtGui/qlistview.h> +#include <QtWidgets/qlistview.h> #include <QtCore/qvariant.h> #include <QtCore/qvector.h> -#include <QtGui/qitemselectionmodel.h> +#include <QtWidgets/qitemselectionmodel.h> QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qlistwidget_p.h b/src/widgets/itemviews/qlistwidget_p.h index 0614b66799..b180b8d51d 100644 --- a/src/widgets/itemviews/qlistwidget_p.h +++ b/src/widgets/itemviews/qlistwidget_p.h @@ -53,8 +53,8 @@ // #include <QtCore/qabstractitemmodel.h> -#include <QtGui/qabstractitemview.h> -#include <QtGui/qlistwidget.h> +#include <QtWidgets/qabstractitemview.h> +#include <QtWidgets/qlistwidget.h> #include <qitemdelegate.h> #include <private/qlistview_p.h> #include <private/qwidgetitemdata_p.h> diff --git a/src/widgets/itemviews/qsortfilterproxymodel.h b/src/widgets/itemviews/qsortfilterproxymodel.h index afeaa6936d..7b15fa1f6e 100644 --- a/src/widgets/itemviews/qsortfilterproxymodel.h +++ b/src/widgets/itemviews/qsortfilterproxymodel.h @@ -42,7 +42,7 @@ #ifndef QSORTFILTERPROXYMODEL_H #define QSORTFILTERPROXYMODEL_H -#include <QtGui/qabstractproxymodel.h> +#include <QtWidgets/qabstractproxymodel.h> #ifndef QT_NO_SORTFILTERPROXYMODEL diff --git a/src/widgets/itemviews/qstandarditemmodel.h b/src/widgets/itemviews/qstandarditemmodel.h index 6cc0270dad..b1a87f418f 100644 --- a/src/widgets/itemviews/qstandarditemmodel.h +++ b/src/widgets/itemviews/qstandarditemmodel.h @@ -45,7 +45,7 @@ #include <QtCore/qabstractitemmodel.h> #include <QtGui/qbrush.h> #include <QtGui/qfont.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qicon.h> #ifndef QT_NO_DATASTREAM #include <QtCore/qdatastream.h> #endif diff --git a/src/widgets/itemviews/qstringlistmodel.h b/src/widgets/itemviews/qstringlistmodel.h index b9b284cfc5..06527d6485 100644 --- a/src/widgets/itemviews/qstringlistmodel.h +++ b/src/widgets/itemviews/qstringlistmodel.h @@ -43,7 +43,7 @@ #define QSTRINGLISTMODEL_H #include <QtCore/qstringlist.h> -#include <QtGui/qabstractitemview.h> +#include <QtWidgets/qabstractitemview.h> QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qstyleditemdelegate.h b/src/widgets/itemviews/qstyleditemdelegate.h index 1c8299b07c..b171a6c50e 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.h +++ b/src/widgets/itemviews/qstyleditemdelegate.h @@ -42,7 +42,7 @@ #ifndef QSTYLEDITEMDELEGATE_H #define QSTYLEDITEMDELEGATE_H -#include <QtGui/qabstractitemdelegate.h> +#include <QtWidgets/qabstractitemdelegate.h> #include <QtCore/qstring.h> #include <QtGui/qpixmap.h> #include <QtCore/qvariant.h> diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h index d4be0868c0..0ef5daf0ef 100644 --- a/src/widgets/itemviews/qtableview.h +++ b/src/widgets/itemviews/qtableview.h @@ -42,7 +42,7 @@ #ifndef QTABLEVIEW_H #define QTABLEVIEW_H -#include <QtGui/qabstractitemview.h> +#include <QtWidgets/qabstractitemview.h> QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index 35e3b29628..b675809476 100644 --- a/src/widgets/itemviews/qtablewidget.h +++ b/src/widgets/itemviews/qtablewidget.h @@ -42,10 +42,10 @@ #ifndef QTABLEWIDGET_H #define QTABLEWIDGET_H -#include <QtGui/qtableview.h> +#include <QtWidgets/qtableview.h> #include <QtCore/qvariant.h> #include <QtCore/qvector.h> -//#include <QtGui/qitemselectionmodel.h> +//#include <QtWidgets/qitemselectionmodel.h> QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h index 49b8419389..aff42435b7 100644 --- a/src/widgets/itemviews/qtreeview.h +++ b/src/widgets/itemviews/qtreeview.h @@ -42,7 +42,7 @@ #ifndef QTREEVIEW_H #define QTREEVIEW_H -#include <QtGui/qabstractitemview.h> +#include <QtWidgets/qabstractitemview.h> QT_BEGIN_HEADER diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index 59532dd594..f835d92567 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -42,8 +42,8 @@ #ifndef QTREEWIDGET_H #define QTREEWIDGET_H -#include <QtGui/qtreeview.h> -#include <QtGui/qtreewidgetitemiterator.h> +#include <QtWidgets/qtreeview.h> +#include <QtWidgets/qtreewidgetitemiterator.h> #include <QtCore/qvariant.h> #include <QtCore/qvector.h> diff --git a/src/widgets/itemviews/qtreewidget_p.h b/src/widgets/itemviews/qtreewidget_p.h index 7395e6a5db..d5998daa39 100644 --- a/src/widgets/itemviews/qtreewidget_p.h +++ b/src/widgets/itemviews/qtreewidget_p.h @@ -56,9 +56,9 @@ #include <private/qabstractitemmodel_p.h> #include <QtCore/qpair.h> #include <QtCore/qbasictimer.h> -#include <QtGui/qtreewidget.h> +#include <QtWidgets/qtreewidget.h> #include <private/qtreeview_p.h> -#include <QtGui/qheaderview.h> +#include <QtWidgets/qheaderview.h> #ifndef QT_NO_TREEWIDGET diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index 856fd92f10..765fba1d9f 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -44,9 +44,9 @@ #include <QtGui/qkeysequence.h> #include <QtCore/qstring.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include <QtCore/qvariant.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qicon.h> QT_BEGIN_HEADER @@ -252,7 +252,7 @@ private: }; QT_BEGIN_INCLUDE_NAMESPACE -#include <QtGui/qactiongroup.h> +#include <QtWidgets/qactiongroup.h> QT_END_INCLUDE_NAMESPACE #endif // QT_NO_ACTION diff --git a/src/widgets/kernel/qaction_p.h b/src/widgets/kernel/qaction_p.h index f3154f90c1..652c9358e1 100644 --- a/src/widgets/kernel/qaction_p.h +++ b/src/widgets/kernel/qaction_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "QtGui/qaction.h" -#include "QtGui/qmenu.h" +#include "QtWidgets/qaction.h" +#include "QtWidgets/qmenu.h" #include "private/qgraphicswidget_p.h" #include "private/qobject_p.h" diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h index 88f4fe8eac..998d312f35 100644 --- a/src/widgets/kernel/qactiongroup.h +++ b/src/widgets/kernel/qactiongroup.h @@ -42,7 +42,7 @@ #ifndef QACTIONGROUP_H #define QACTIONGROUP_H -#include <QtGui/qaction.h> +#include <QtWidgets/qaction.h> QT_BEGIN_HEADER diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index af32c9f890..4e7119fdf9 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -67,7 +67,7 @@ #include "private/qstylesheetstyle_p.h" #include "private/qstyle_p.h" #include "qmessagebox.h" -#include <QtGui/qgraphicsproxywidget.h> +#include <QtWidgets/qgraphicsproxywidget.h> #include "qinputcontext.h" #include "private/qkeymapper_p.h" diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 3a5f02f144..16c7c7f4c3 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -48,10 +48,10 @@ #include <QtCore/qsize.h> #include <QtGui/qcursor.h> #ifdef QT_INCLUDE_COMPAT -# include <QtGui/qdesktopwidget.h> +# include <QtWidgets/qdesktopwidget.h> #endif #ifdef QT3_SUPPORT -# include <QtGui/qwidget.h> +# include <QtWidgets/qwidget.h> # include <QtGui/qpalette.h> #endif #ifdef Q_WS_QWS diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index a089a6ba40..41d3eaeb27 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -54,7 +54,7 @@ // We mean it. // -#include "QtGui/qapplication.h" +#include "QtWidgets/qapplication.h" #include "QtGui/qevent.h" #include "QtGui/qfont.h" #include "QtGui/qcursor.h" @@ -65,7 +65,7 @@ #include "QtCore/qhash.h" #include "QtCore/qpointer.h" #include "private/qcoreapplication_p.h" -#include "QtGui/private/qshortcutmap_p.h" +#include "private/qshortcutmap_p.h" #include <private/qthread_p.h> #include "QtCore/qpoint.h" #include <QTime> @@ -76,7 +76,7 @@ #include <QWindowSystemInterface> #include "private/qwindowsysteminterface_qpa_p.h" #include "QtGui/qplatformintegration_qpa.h" -#include "QtGui/private/qguiapplication_p.h" +#include "private/qguiapplication_p.h" #endif QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qbackingstore.cpp b/src/widgets/kernel/qbackingstore.cpp index 1ee66f09cc..5e0c158cec 100644 --- a/src/widgets/kernel/qbackingstore.cpp +++ b/src/widgets/kernel/qbackingstore.cpp @@ -48,9 +48,9 @@ #include <QtCore/qdebug.h> #include <QtCore/qvarlengtharray.h> #include <QtGui/qevent.h> -#include <QtGui/qapplication.h> +#include <QtWidgets/qapplication.h> #include <QtGui/qpaintengine.h> -#include <QtGui/qgraphicsproxywidget.h> +#include <QtWidgets/qgraphicsproxywidget.h> #include <private/qwidget_p.h> #include <private/qapplication_p.h> diff --git a/src/widgets/kernel/qbackingstore_p.h b/src/widgets/kernel/qbackingstore_p.h index 05f4bfcb6c..fe448da901 100644 --- a/src/widgets/kernel/qbackingstore_p.h +++ b/src/widgets/kernel/qbackingstore_p.h @@ -54,7 +54,7 @@ // #include <QDebug> -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include <private/qwidget_p.h> #include <private/qwindowsurface_p.h> #ifdef Q_WS_QWS diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h index 66ce23a9f5..b97d909994 100644 --- a/src/widgets/kernel/qboxlayout.h +++ b/src/widgets/kernel/qboxlayout.h @@ -42,9 +42,9 @@ #ifndef QBOXLAYOUT_H #define QBOXLAYOUT_H -#include <QtGui/qlayout.h> +#include <QtWidgets/qlayout.h> #ifdef QT_INCLUDE_COMPAT -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #endif #include <limits.h> diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index deb896029a..7e836b25f2 100644 --- a/src/widgets/kernel/qdesktopwidget.h +++ b/src/widgets/kernel/qdesktopwidget.h @@ -42,7 +42,7 @@ #ifndef QDESKTOPWIDGET_H #define QDESKTOPWIDGET_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h index f229ac2d83..60ce12cd3a 100644 --- a/src/widgets/kernel/qformlayout.h +++ b/src/widgets/kernel/qformlayout.h @@ -42,7 +42,7 @@ #ifndef QFORMLAYOUT_H #define QFORMLAYOUT_H -#include <QtGui/QLayout> +#include <QtWidgets/QLayout> QT_BEGIN_HEADER diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index 0ac66e8f87..cbfc6f7e48 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -42,9 +42,9 @@ #ifndef QGRIDLAYOUT_H #define QGRIDLAYOUT_H -#include <QtGui/qlayout.h> +#include <QtWidgets/qlayout.h> #ifdef QT_INCLUDE_COMPAT -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #endif #include <limits.h> diff --git a/src/widgets/kernel/qguiplatformplugin_p.h b/src/widgets/kernel/qguiplatformplugin_p.h index 49e2d9294a..18dd66615f 100644 --- a/src/widgets/kernel/qguiplatformplugin_p.h +++ b/src/widgets/kernel/qguiplatformplugin_p.h @@ -55,7 +55,7 @@ #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> -#include <QtGui/qdialog.h> +#include <QtWidgets/qdialog.h> QT_BEGIN_HEADER diff --git a/src/widgets/kernel/qicon_p.h b/src/widgets/kernel/qicon_p.h index 0bf7e65cc1..06eae53daf 100644 --- a/src/widgets/kernel/qicon_p.h +++ b/src/widgets/kernel/qicon_p.h @@ -57,8 +57,8 @@ #include <QtCore/qsize.h> #include <QtCore/qlist.h> #include <QtGui/qpixmap.h> -#include <QtGui/qicon.h> -#include <QtGui/qiconengine.h> +#include <QtWidgets/qicon.h> +#include <QtWidgets/qiconengine.h> #ifndef QT_NO_ICON QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qiconengine.h b/src/widgets/kernel/qiconengine.h index 12caea8a20..282dd38aa9 100644 --- a/src/widgets/kernel/qiconengine.h +++ b/src/widgets/kernel/qiconengine.h @@ -44,7 +44,7 @@ #include <QtCore/qglobal.h> #include <QtCore/qlist.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qicon.h> QT_BEGIN_HEADER diff --git a/src/widgets/kernel/qiconloader.cpp b/src/widgets/kernel/qiconloader.cpp index 19be636e9c..361a49a7ee 100644 --- a/src/widgets/kernel/qiconloader.cpp +++ b/src/widgets/kernel/qiconloader.cpp @@ -45,10 +45,10 @@ #include <private/qicon_p.h> #include <private/qguiplatformplugin_p.h> -#include <QtGui/QIconEnginePlugin> +#include <QtWidgets/QIconEnginePlugin> #include <QtGui/QPixmapCache> -#include <QtGui/QIconEngine> -#include <QtGui/QStyleOption> +#include <QtWidgets/QIconEngine> +#include <QtWidgets/QStyleOption> #include <QtCore/QList> #include <QtCore/QHash> #include <QtCore/QDir> diff --git a/src/widgets/kernel/qiconloader_p.h b/src/widgets/kernel/qiconloader_p.h index 00a3976b40..eff8bbf663 100644 --- a/src/widgets/kernel/qiconloader_p.h +++ b/src/widgets/kernel/qiconloader_p.h @@ -54,8 +54,8 @@ // We mean it. // -#include <QtGui/QIcon> -#include <QtGui/QIconEngine> +#include <QtWidgets/QIcon> +#include <QtWidgets/QIconEngine> #include <QtGui/QPixmapCache> #include <private/qicon_p.h> #include <private/qfactoryloader_p.h> diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index 5333150072..aca1748f99 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -43,8 +43,8 @@ #define QLAYOUT_H #include <QtCore/qobject.h> -#include <QtGui/qlayoutitem.h> -#include <QtGui/qsizepolicy.h> +#include <QtWidgets/qlayoutitem.h> +#include <QtWidgets/qsizepolicy.h> #include <QtCore/qrect.h> #include <QtCore/qmargins.h> @@ -233,8 +233,8 @@ inline void QLayoutIterator::deleteCurrent() { delete layout->takeAt(index); } //### support old includes #if 1 //def QT3_SUPPORT QT_BEGIN_INCLUDE_NAMESPACE -#include <QtGui/qboxlayout.h> -#include <QtGui/qgridlayout.h> +#include <QtWidgets/qboxlayout.h> +#include <QtWidgets/qgridlayout.h> QT_END_INCLUDE_NAMESPACE #endif diff --git a/src/widgets/kernel/qlayoutengine_p.h b/src/widgets/kernel/qlayoutengine_p.h index da07f3bab1..eede314348 100644 --- a/src/widgets/kernel/qlayoutengine_p.h +++ b/src/widgets/kernel/qlayoutengine_p.h @@ -53,8 +53,8 @@ // We mean it. // -#include "QtGui/qlayoutitem.h" -#include "QtGui/qstyle.h" +#include "QtWidgets/qlayoutitem.h" +#include "QtWidgets/qstyle.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/kernel/qlayoutitem.h b/src/widgets/kernel/qlayoutitem.h index a75011f3ff..52878b2c8b 100644 --- a/src/widgets/kernel/qlayoutitem.h +++ b/src/widgets/kernel/qlayoutitem.h @@ -42,7 +42,7 @@ #ifndef QLAYOUTITEM_H #define QLAYOUTITEM_H -#include <QtGui/qsizepolicy.h> +#include <QtWidgets/qsizepolicy.h> #include <QtCore/qrect.h> #include <limits.h> diff --git a/src/widgets/kernel/qsoftkeymanager_p.h b/src/widgets/kernel/qsoftkeymanager_p.h index 78999a97bd..726c8f7211 100644 --- a/src/widgets/kernel/qsoftkeymanager_p.h +++ b/src/widgets/kernel/qsoftkeymanager_p.h @@ -54,7 +54,7 @@ // #include <QtCore/qobject.h> -#include "QtGui/qaction.h" +#include "QtWidgets/qaction.h" QT_BEGIN_HEADER diff --git a/src/widgets/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h index 49b80c6445..b666b0c933 100644 --- a/src/widgets/kernel/qstackedlayout.h +++ b/src/widgets/kernel/qstackedlayout.h @@ -42,7 +42,7 @@ #ifndef QSTACKEDLAYOUT_H #define QSTACKEDLAYOUT_H -#include <QtGui/qlayout.h> +#include <QtWidgets/qlayout.h> QT_BEGIN_HEADER diff --git a/src/widgets/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h index 4195f1cb3e..076ab0f197 100644 --- a/src/widgets/kernel/qtooltip.h +++ b/src/widgets/kernel/qtooltip.h @@ -42,7 +42,7 @@ #ifndef QTOOLTIP_H #define QTOOLTIP_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 5e47ffa56b..908668e1c6 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -53,7 +53,7 @@ #include "qcursor.h" #include "qbitmap.h" #include "qtextdocument.h" -#include "../text/qtextdocumentlayout_p.h" +#include "private/qtextdocumentlayout_p.h" #include "qtoolbutton.h" #include "qdebug.h" #ifndef QT_NO_ACCESSIBILITY diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index b6e6a56f4a..e2969aad74 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -114,10 +114,10 @@ #include "qwidget_p.h" #include "qaction_p.h" #include "qlayout_p.h" -#include "QtGui/qgraphicsproxywidget.h" -#include "QtGui/qgraphicsscene.h" +#include "QtWidgets/qgraphicsproxywidget.h" +#include "QtWidgets/qgraphicsscene.h" #include "private/qgraphicsproxywidget_p.h" -#include "QtGui/qabstractscrollarea.h" +#include "QtWidgets/qabstractscrollarea.h" #include "private/qabstractscrollarea_p.h" #include "private/qevent_p.h" diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index d14e8652be..415fb67b38 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -50,7 +50,7 @@ #include <QtGui/qfont.h> #include <QtGui/qfontmetrics.h> #include <QtGui/qfontinfo.h> -#include <QtGui/qsizepolicy.h> +#include <QtWidgets/qsizepolicy.h> #include <QtGui/qregion.h> #include <QtGui/qbrush.h> #include <QtGui/qcursor.h> diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 7826cab795..e9d7682289 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -53,19 +53,19 @@ // We mean it. // -#include "QtGui/qwidget.h" +#include "QtWidgets/qwidget.h" #include "private/qobject_p.h" #include "QtCore/qrect.h" #include "QtCore/qlocale.h" #include "QtCore/qset.h" #include "QtGui/qregion.h" -#include "QtGui/qsizepolicy.h" -#include "QtGui/qstyle.h" -#include "QtGui/qapplication.h" +#include "QtWidgets/qsizepolicy.h" +#include "QtWidgets/qstyle.h" +#include "QtWidgets/qapplication.h" #include <private/qgraphicseffect_p.h> -#include "QtGui/qgraphicsproxywidget.h" -#include "QtGui/qgraphicsscene.h" -#include "QtGui/qgraphicsview.h" +#include "QtWidgets/qgraphicsproxywidget.h" +#include "QtWidgets/qgraphicsscene.h" +#include "QtWidgets/qgraphicsview.h" #include <private/qgesture_p.h> #ifdef Q_WS_WIN @@ -82,7 +82,7 @@ #endif #if defined(Q_WS_QWS) -#include "QtGui/qinputcontext.h" +#include "QtWidgets/qinputcontext.h" #include "QtGui/qscreen_qws.h" #endif diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp index d239e6d652..f6833915ec 100644 --- a/src/widgets/kernel/qwidget_qpa.cpp +++ b/src/widgets/kernel/qwidget_qpa.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#include "QtGui/qwidget.h" +#include "QtWidgets/qwidget.h" #include "QtGui/qevent.h" -#include "QtGui/qapplication.h" -#include "QtGui/private/qbackingstore_p.h" -#include "QtGui/private/qwidget_p.h" -#include "QtGui/private/qwidgetwindow_qpa_p.h" -#include "QtGui/private/qapplication_p.h" -#include "QtGui/qdesktopwidget.h" +#include "QtWidgets/qapplication.h" +#include "private/qbackingstore_p.h" +#include "private/qwidget_p.h" +#include "private/qwidgetwindow_qpa_p.h" +#include "private/qapplication_p.h" +#include "QtWidgets/qdesktopwidget.h" #include "QtGui/qplatformwindow_qpa.h" #include "QtGui/qplatformglcontext_qpa.h" diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h index a32b5d60dd..cf9f2e6da5 100644 --- a/src/widgets/kernel/qwidgetaction.h +++ b/src/widgets/kernel/qwidgetaction.h @@ -42,7 +42,7 @@ #ifndef QWIDGETACTION_H #define QWIDGETACTION_H -#include <QtGui/qaction.h> +#include <QtWidgets/qaction.h> QT_BEGIN_HEADER diff --git a/src/widgets/s60framework/qs60mainappui.cpp b/src/widgets/s60framework/qs60mainappui.cpp index f591fcba36..8a00668f22 100644 --- a/src/widgets/s60framework/qs60mainappui.cpp +++ b/src/widgets/s60framework/qs60mainappui.cpp @@ -53,9 +53,9 @@ #include <qconfig.h> #include "qs60mainappui.h" -#include <QtGui/qapplication.h> -#include <QtGui/qsymbianevent.h> -#include <QtGui/qmenu.h> +#include <QtWidgets/qapplication.h> +#include <QtWidgets/qsymbianevent.h> +#include <QtWidgets/qmenu.h> #include <private/qmenu_p.h> #include <private/qt_s60_p.h> #include <qdebug.h> diff --git a/src/widgets/statemachine/qguistatemachine.cpp b/src/widgets/statemachine/qguistatemachine.cpp index 031c135158..b22bd4a64d 100644 --- a/src/widgets/statemachine/qguistatemachine.cpp +++ b/src/widgets/statemachine/qguistatemachine.cpp @@ -45,7 +45,7 @@ #include <private/qstatemachine_p.h> #include <QtGui/qevent.h> -#include <QtGui/qgraphicssceneevent.h> +#include <QtWidgets/qgraphicssceneevent.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qcdestyle.h b/src/widgets/styles/qcdestyle.h index ca43b6a530..b0f010fbc5 100644 --- a/src/widgets/styles/qcdestyle.h +++ b/src/widgets/styles/qcdestyle.h @@ -43,7 +43,7 @@ #ifndef QCDESTYLE_H #define QCDESTYLE_H -#include <QtGui/qmotifstyle.h> +#include <QtWidgets/qmotifstyle.h> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qcleanlooksstyle.h b/src/widgets/styles/qcleanlooksstyle.h index 9ffa5789c0..de13b0947d 100644 --- a/src/widgets/styles/qcleanlooksstyle.h +++ b/src/widgets/styles/qcleanlooksstyle.h @@ -42,7 +42,7 @@ #ifndef QCLEANLOOKSSTYLE_H #define QCLEANLOOKSSTYLE_H -#include <QtGui/qwindowsstyle.h> +#include <QtWidgets/qwindowsstyle.h> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qcommonstyle.h b/src/widgets/styles/qcommonstyle.h index 2b42367aac..b420dd9b04 100644 --- a/src/widgets/styles/qcommonstyle.h +++ b/src/widgets/styles/qcommonstyle.h @@ -42,7 +42,7 @@ #ifndef QCOMMONSTYLE_H #define QCOMMONSTYLE_H -#include <QtGui/qstyle.h> +#include <QtWidgets/qstyle.h> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qmacstyle_mac.h b/src/widgets/styles/qmacstyle_mac.h index 78a25ce9b2..099c552929 100644 --- a/src/widgets/styles/qmacstyle_mac.h +++ b/src/widgets/styles/qmacstyle_mac.h @@ -42,7 +42,7 @@ #ifndef QMACSTYLE_MAC_H #define QMACSTYLE_MAC_H -#include <QtGui/qwindowsstyle.h> +#include <QtWidgets/qwindowsstyle.h> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qmacstyle_mac_p.h b/src/widgets/styles/qmacstyle_mac_p.h index fbd6d57e09..d5d3ed0d0d 100644 --- a/src/widgets/styles/qmacstyle_mac_p.h +++ b/src/widgets/styles/qmacstyle_mac_p.h @@ -92,8 +92,8 @@ #include <qlibrary.h> #include <qdatetimeedit.h> #include <qmath.h> -#include <QtGui/qgraphicsproxywidget.h> -#include <QtGui/qgraphicsview.h> +#include <QtWidgets/qgraphicsproxywidget.h> +#include <QtWidgets/qgraphicsview.h> #include <private/qt_cocoa_helpers_mac_p.h> // diff --git a/src/widgets/styles/qmotifstyle.cpp b/src/widgets/styles/qmotifstyle.cpp index 3bf8996650..876db114c6 100644 --- a/src/widgets/styles/qmotifstyle.cpp +++ b/src/widgets/styles/qmotifstyle.cpp @@ -69,8 +69,8 @@ #include "qdialogbuttonbox.h" #include "qformlayout.h" #include <limits.h> -#include <QtGui/qgraphicsproxywidget.h> -#include <QtGui/qgraphicsview.h> +#include <QtWidgets/qgraphicsproxywidget.h> +#include <QtWidgets/qgraphicsview.h> #ifdef Q_WS_X11 #include "qx11info_x11.h" diff --git a/src/widgets/styles/qmotifstyle.h b/src/widgets/styles/qmotifstyle.h index 5ca0795216..809443d0fe 100644 --- a/src/widgets/styles/qmotifstyle.h +++ b/src/widgets/styles/qmotifstyle.h @@ -42,7 +42,7 @@ #ifndef QMOTIFSTYLE_H #define QMOTIFSTYLE_H -#include <QtGui/qcommonstyle.h> +#include <QtWidgets/qcommonstyle.h> #include <QtCore/qpointer.h> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qplastiquestyle.h b/src/widgets/styles/qplastiquestyle.h index 20d2f490a6..1f9a0524ec 100644 --- a/src/widgets/styles/qplastiquestyle.h +++ b/src/widgets/styles/qplastiquestyle.h @@ -42,7 +42,7 @@ #ifndef QPLASTIQUESTYLE_H #define QPLASTIQUESTYLE_H -#include <QtGui/qwindowsstyle.h> +#include <QtWidgets/qwindowsstyle.h> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qproxystyle.h b/src/widgets/styles/qproxystyle.h index 9d4a5cc56c..5c87c95ae8 100644 --- a/src/widgets/styles/qproxystyle.h +++ b/src/widgets/styles/qproxystyle.h @@ -42,7 +42,7 @@ #ifndef QPROXYSTYLE_H #define QPROXYSTYLE_H -#include <QtGui/QCommonStyle> +#include <QtWidgets/QCommonStyle> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qs60style.h b/src/widgets/styles/qs60style.h index 5f44ca7b9b..61cf472b57 100644 --- a/src/widgets/styles/qs60style.h +++ b/src/widgets/styles/qs60style.h @@ -42,7 +42,7 @@ #ifndef QS60STYLE_H #define QS60STYLE_H -#include <QtGui/qcommonstyle.h> +#include <QtWidgets/qcommonstyle.h> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h index 94f2ce102f..26a1e0fa20 100644 --- a/src/widgets/styles/qstyle.h +++ b/src/widgets/styles/qstyle.h @@ -45,10 +45,10 @@ #include <QtCore/qobject.h> #include <QtCore/qrect.h> #include <QtCore/qsize.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qicon.h> #include <QtGui/qpixmap.h> #include <QtGui/qpalette.h> -#include <QtGui/qsizepolicy.h> +#include <QtWidgets/qsizepolicy.h> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qstyle_p.h b/src/widgets/styles/qstyle_p.h index 1fcd2eaf2a..0f3513d640 100644 --- a/src/widgets/styles/qstyle_p.h +++ b/src/widgets/styles/qstyle_p.h @@ -43,7 +43,7 @@ #define QSTYLE_P_H #include "private/qobject_p.h" -#include <QtGui/qstyle.h> +#include <QtWidgets/qstyle.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index 1b1de9cdf2..8611e952c2 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -43,15 +43,15 @@ #define QSTYLEOPTION_H #include <QtCore/qvariant.h> -#include <QtGui/qabstractspinbox.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qabstractspinbox.h> +#include <QtWidgets/qicon.h> #include <QtGui/qmatrix.h> -#include <QtGui/qslider.h> -#include <QtGui/qstyle.h> -#include <QtGui/qtabbar.h> -#include <QtGui/qtabwidget.h> -#include <QtGui/qrubberband.h> -#include <QtGui/qframe.h> +#include <QtWidgets/qslider.h> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qtabbar.h> +#include <QtWidgets/qtabwidget.h> +#include <QtWidgets/qrubberband.h> +#include <QtWidgets/qframe.h> #ifndef QT_NO_ITEMVIEWS # include <QtCore/qabstractitemmodel.h> #endif diff --git a/src/widgets/styles/qstylepainter.h b/src/widgets/styles/qstylepainter.h index 0fc3f2b4b9..1a65ef0616 100644 --- a/src/widgets/styles/qstylepainter.h +++ b/src/widgets/styles/qstylepainter.h @@ -43,8 +43,8 @@ #define QSTYLEPAINTER_H #include <QtGui/qpainter.h> -#include <QtGui/qstyle.h> -#include <QtGui/qwidget.h> +#include <QtWidgets/qstyle.h> +#include <QtWidgets/qwidget.h> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index faa929ebea..84272e23fb 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -84,7 +84,7 @@ #include "qdrawutil.h" #include <limits.h> -#include <QtGui/qtoolbar.h> +#include <QtWidgets/qtoolbar.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/styles/qstylesheetstyle_p.h b/src/widgets/styles/qstylesheetstyle_p.h index 1f331b2642..1e885e0e52 100644 --- a/src/widgets/styles/qstylesheetstyle_p.h +++ b/src/widgets/styles/qstylesheetstyle_p.h @@ -42,15 +42,15 @@ #ifndef QSTYLESHEETSTYLE_P_H #define QSTYLESHEETSTYLE_P_H -#include "QtGui/qwindowsstyle.h" +#include "QtWidgets/qwindowsstyle.h" #ifndef QT_NO_STYLE_STYLESHEET -#include "QtGui/qstyleoption.h" +#include "QtWidgets/qstyleoption.h" #include "QtCore/qhash.h" #include "QtGui/qevent.h" #include "QtCore/qvector.h" -#include "QtGui/qapplication.h" +#include "QtWidgets/qapplication.h" #include "private/qcssparser_p.h" #include "QtGui/qbrush.h" diff --git a/src/widgets/styles/qwindowscestyle.h b/src/widgets/styles/qwindowscestyle.h index 3fd83bc764..15a8f2c66a 100644 --- a/src/widgets/styles/qwindowscestyle.h +++ b/src/widgets/styles/qwindowscestyle.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSCESTYLE_H #define QWINDOWSCESTYLE_H -#include <QtGui/qwindowsstyle.h> +#include <QtWidgets/qwindowsstyle.h> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qwindowsmobilestyle.h b/src/widgets/styles/qwindowsmobilestyle.h index 6ac1af1c35..2a396b5dbb 100644 --- a/src/widgets/styles/qwindowsmobilestyle.h +++ b/src/widgets/styles/qwindowsmobilestyle.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSMOBILESTYLE_H #define QWINDOWSMOBILESTYLE_H -#include <QtGui/qwindowsstyle.h> +#include <QtWidgets/qwindowsstyle.h> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qwindowsstyle.h b/src/widgets/styles/qwindowsstyle.h index 99f64fcb05..644da5e6fa 100644 --- a/src/widgets/styles/qwindowsstyle.h +++ b/src/widgets/styles/qwindowsstyle.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSSTYLE_H #define QWINDOWSSTYLE_H -#include <QtGui/qcommonstyle.h> +#include <QtWidgets/qcommonstyle.h> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qwindowsvistastyle.h b/src/widgets/styles/qwindowsvistastyle.h index c13dccf28b..83e336c4e4 100644 --- a/src/widgets/styles/qwindowsvistastyle.h +++ b/src/widgets/styles/qwindowsvistastyle.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSVISTASTYLE_H #define QWINDOWSVISTASTYLE_H -#include <QtGui/qwindowsxpstyle.h> +#include <QtWidgets/qwindowsxpstyle.h> QT_BEGIN_HEADER diff --git a/src/widgets/styles/qwindowsxpstyle.h b/src/widgets/styles/qwindowsxpstyle.h index 08582d13a1..9895cc5f11 100644 --- a/src/widgets/styles/qwindowsxpstyle.h +++ b/src/widgets/styles/qwindowsxpstyle.h @@ -42,7 +42,7 @@ #ifndef QWINDOWSXPSTYLE_H #define QWINDOWSXPSTYLE_H -#include <QtGui/qwindowsstyle.h> +#include <QtWidgets/qwindowsstyle.h> QT_BEGIN_HEADER diff --git a/src/widgets/to_be_moved/qdnd_p.h b/src/widgets/to_be_moved/qdnd_p.h index 754366637c..dc18ffa22e 100644 --- a/src/widgets/to_be_moved/qdnd_p.h +++ b/src/widgets/to_be_moved/qdnd_p.h @@ -56,7 +56,7 @@ #include "QtCore/qobject.h" #include "QtCore/qmap.h" #include "QtGui/qmime.h" -#include "QtGui/qdrag.h" +#include "QtWidgets/qdrag.h" #include "QtGui/qpixmap.h" #include "QtGui/qcursor.h" #include "QtCore/qpoint.h" diff --git a/src/widgets/to_be_moved/qlinecontrol_p.h b/src/widgets/to_be_moved/qlinecontrol_p.h index 0042f17261..a5de15ff8b 100644 --- a/src/widgets/to_be_moved/qlinecontrol_p.h +++ b/src/widgets/to_be_moved/qlinecontrol_p.h @@ -57,14 +57,14 @@ #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/qpointer.h" -#include "QtGui/qlineedit.h" +#include "QtWidgets/qlineedit.h" #include "QtGui/qclipboard.h" #include "QtCore/qpoint.h" -#include "QtGui/qcompleter.h" +#include "QtWidgets/qcompleter.h" QT_BEGIN_HEADER diff --git a/src/widgets/to_be_moved/qshortcut.h b/src/widgets/to_be_moved/qshortcut.h index f432d9ad97..c337e177cd 100644 --- a/src/widgets/to_be_moved/qshortcut.h +++ b/src/widgets/to_be_moved/qshortcut.h @@ -42,7 +42,7 @@ #ifndef QSHORTCUT_H #define QSHORTCUT_H -#include <QtGui/qwidget.h> +#include <QtWidgets/qwidget.h> #include <QtGui/qkeysequence.h> QT_BEGIN_HEADER diff --git a/src/widgets/to_be_moved/qtextcontrol.cpp b/src/widgets/to_be_moved/qtextcontrol.cpp index 43967307bc..85bb6625eb 100644 --- a/src/widgets/to_be_moved/qtextcontrol.cpp +++ b/src/widgets/to_be_moved/qtextcontrol.cpp @@ -78,7 +78,7 @@ #include <qinputcontext.h> #include <qtooltip.h> #include <qstyleoption.h> -#include <QtGui/qlineedit.h> +#include <QtWidgets/qlineedit.h> #ifndef QT_NO_SHORTCUT #include "private/qapplication_p.h" diff --git a/src/widgets/to_be_moved/qtextcontrol_p.h b/src/widgets/to_be_moved/qtextcontrol_p.h index dce0ca90a5..d39cd57cf9 100644 --- a/src/widgets/to_be_moved/qtextcontrol_p.h +++ b/src/widgets/to_be_moved/qtextcontrol_p.h @@ -57,8 +57,8 @@ #include <QtGui/qtextoption.h> #include <QtGui/qtextcursor.h> #include <QtGui/qtextformat.h> -#include <QtGui/qtextedit.h> -#include <QtGui/qmenu.h> +#include <QtWidgets/qtextedit.h> +#include <QtWidgets/qmenu.h> #include <QtCore/qrect.h> #include <QtGui/qabstracttextdocumentlayout.h> #include <QtGui/qtextdocumentfragment.h> diff --git a/src/widgets/to_be_moved/qtextcontrol_p_p.h b/src/widgets/to_be_moved/qtextcontrol_p_p.h index 94670e225e..348501c57d 100644 --- a/src/widgets/to_be_moved/qtextcontrol_p_p.h +++ b/src/widgets/to_be_moved/qtextcontrol_p_p.h @@ -54,10 +54,10 @@ // #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/qpointer.h" diff --git a/src/widgets/util/qcompleter.cpp b/src/widgets/util/qcompleter.cpp index 0cb3bbdf8c..c37ddf899a 100644 --- a/src/widgets/util/qcompleter.cpp +++ b/src/widgets/util/qcompleter.cpp @@ -144,17 +144,17 @@ #ifndef QT_NO_COMPLETER -#include "QtGui/qscrollbar.h" -#include "QtGui/qstringlistmodel.h" -#include "QtGui/qdirmodel.h" -#include "QtGui/qfilesystemmodel.h" -#include "QtGui/qheaderview.h" -#include "QtGui/qlistview.h" -#include "QtGui/qapplication.h" +#include "QtWidgets/qscrollbar.h" +#include "QtWidgets/qstringlistmodel.h" +#include "QtWidgets/qdirmodel.h" +#include "QtWidgets/qfilesystemmodel.h" +#include "QtWidgets/qheaderview.h" +#include "QtWidgets/qlistview.h" +#include "QtWidgets/qapplication.h" #include "QtGui/qevent.h" -#include "QtGui/qheaderview.h" -#include "QtGui/qdesktopwidget.h" -#include "QtGui/qlineedit.h" +#include "QtWidgets/qheaderview.h" +#include "QtWidgets/qdesktopwidget.h" +#include "QtWidgets/qlineedit.h" QT_BEGIN_NAMESPACE diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h index 83e7a27636..0342c35c51 100644 --- a/src/widgets/util/qcompleter_p.h +++ b/src/widgets/util/qcompleter_p.h @@ -58,10 +58,10 @@ #ifndef QT_NO_COMPLETER -#include "QtGui/qtreeview.h" -#include "QtGui/qabstractproxymodel.h" +#include "QtWidgets/qtreeview.h" +#include "QtWidgets/qabstractproxymodel.h" #include "qcompleter.h" -#include "QtGui/qitemdelegate.h" +#include "QtWidgets/qitemdelegate.h" #include "QtGui/qpainter.h" #include "private/qabstractproxymodel_p.h" diff --git a/src/widgets/util/qscroller.h b/src/widgets/util/qscroller.h index 1599c7dcdf..dd4ff9d73e 100644 --- a/src/widgets/util/qscroller.h +++ b/src/widgets/util/qscroller.h @@ -44,7 +44,7 @@ #include <QtCore/QObject> #include <QtCore/QPointF> -#include <QtGui/QScrollerProperties> +#include <QtWidgets/QScrollerProperties> QT_BEGIN_HEADER diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h index 1f0dab5393..2bb0494eff 100644 --- a/src/widgets/util/qsystemtrayicon.h +++ b/src/widgets/util/qsystemtrayicon.h @@ -46,7 +46,7 @@ #ifndef QT_NO_SYSTEMTRAYICON -#include <QtGui/qicon.h> +#include <QtWidgets/qicon.h> QT_BEGIN_HEADER diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h index cc7bd47092..7d587da1af 100644 --- a/src/widgets/util/qsystemtrayicon_p.h +++ b/src/widgets/util/qsystemtrayicon_p.h @@ -58,7 +58,7 @@ #ifndef QT_NO_SYSTEMTRAYICON -#include "QtGui/qmenu.h" +#include "QtWidgets/qmenu.h" #include "QtGui/qpixmap.h" #include "QtCore/qstring.h" #include "QtCore/qpointer.h" diff --git a/src/widgets/util/qundostack_p.h b/src/widgets/util/qundostack_p.h index 3c7d0e7d85..f147fc5a81 100644 --- a/src/widgets/util/qundostack_p.h +++ b/src/widgets/util/qundostack_p.h @@ -45,7 +45,7 @@ #include <private/qobject_p.h> #include <QtCore/qlist.h> #include <QtCore/qstring.h> -#include <QtGui/qaction.h> +#include <QtWidgets/qaction.h> #include "qundostack.h" diff --git a/src/widgets/util/qundoview.cpp b/src/widgets/util/qundoview.cpp index 43c1774b25..35c18a04ac 100644 --- a/src/widgets/util/qundoview.cpp +++ b/src/widgets/util/qundoview.cpp @@ -47,7 +47,7 @@ #include "qundogroup.h" #include <QtCore/qabstractitemmodel.h> #include <QtCore/qpointer.h> -#include <QtGui/qicon.h> +#include <QtWidgets/qicon.h> #include <private/qlistview_p.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/util/qundoview.h b/src/widgets/util/qundoview.h index de32a39c54..ca9197b8ba 100644 --- a/src/widgets/util/qundoview.h +++ b/src/widgets/util/qundoview.h @@ -42,7 +42,7 @@ #ifndef QUNDOVIEW_H #define QUNDOVIEW_H -#include <QtGui/qlistview.h> +#include <QtWidgets/qlistview.h> #include <QtCore/qstring.h> #ifndef QT_NO_UNDOVIEW diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro index 36f36be499..c70f969f2c 100644 --- a/src/widgets/widgets.pro +++ b/src/widgets/widgets.pro @@ -1,6 +1,6 @@ -TARGET = QtGui +TARGET = QtWidgets QPRO_PWD = $$PWD -QT = core-private +QT = core-private gui-private CONFIG += module MODULE_PRI = ../modules/qt_gui.pri @@ -76,6 +76,8 @@ neon:*-g++* { QMAKE_EXTRA_COMPILERS += neon_compiler } +INCLUDEPATH += ../3rdparty/harfbuzz/src + win32:!contains(QT_CONFIG, directwrite) { DEFINES += QT_NO_DIRECTWRITE } 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 |