diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-03 14:14:32 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-09 21:57:17 +0000 |
| commit | fe7a8d61d1428f4d316c2a6884d8dfb8190520f0 (patch) | |
| tree | f889e464eeac6055cbd6def4930ea19f630848db | |
| parent | ac244dbcf21e730c9314a47736cbc46ee19eb787 (diff) | |
Update precompiled headers
Include many headers that are commonly used now, and avoid listing them
twice.
Change-Id: I679dc24cff2cb3a3c9c18585ec78007ab3550743
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/global/qt_pch.h | 6 | ||||
| -rw-r--r-- | src/gui/kernel/qt_gui_pch.h | 31 | ||||
| -rw-r--r-- | src/widgets/kernel/qt_widgets_pch.h | 38 |
3 files changed, 20 insertions, 55 deletions
diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h index 76e46374c3..3972991618 100644 --- a/src/corelib/global/qt_pch.h +++ b/src/corelib/global/qt_pch.h @@ -60,12 +60,18 @@ # undef _POSIX_ #endif #include <qcoreapplication.h> +#include <qcoreevent.h> +#include <qiodevice.h> #include <qlist.h> #include <qvariant.h> /* All moc genereated code has this include */ #include <qobject.h> #include <qregexp.h> +#include <qscopedpointer.h> +#include <qshareddata.h> #include <qstring.h> #include <qstringlist.h> +#include <qtimer.h> +#include <qvector.h> #if QT_CONFIG(textcodec) #include <qtextcodec.h> #endif diff --git a/src/gui/kernel/qt_gui_pch.h b/src/gui/kernel/qt_gui_pch.h index aa5d3f0572..5e07fa45e7 100644 --- a/src/gui/kernel/qt_gui_pch.h +++ b/src/gui/kernel/qt_gui_pch.h @@ -45,37 +45,20 @@ * UNSUPPORTED. */ -// from corelib/global/qt_pch.h +#include "../../corelib/global/qt_pch.h" + #if defined __cplusplus #include <qtguiglobal.h> - - -#ifdef Q_OS_WIN -# define _POSIX_ -# include <limits.h> -# undef _POSIX_ -#endif - -#include <qcoreapplication.h> -#include <qlist.h> -#include <qvariant.h> // All moc genereated code has this include -#include <qobject.h> -#include <qregexp.h> -#include <qstring.h> -#include <qstringlist.h> -#if QT_CONFIG(textcodec) -#include <qtextcodec.h> -#endif - #include <qguiapplication.h> #include <qbitmap.h> +#include <qclipboard.h> #include <qcursor.h> #include <qevent.h> +#include <qfont.h> #include <qimage.h> #include <qpainter.h> #include <qpixmap.h> -#include <qtimer.h> - -#include <stdlib.h> - +#include <qscreen.h> +#include <qsurface.h> +#include <qwindow.h> #endif diff --git a/src/widgets/kernel/qt_widgets_pch.h b/src/widgets/kernel/qt_widgets_pch.h index bec6536637..b70941950b 100644 --- a/src/widgets/kernel/qt_widgets_pch.h +++ b/src/widgets/kernel/qt_widgets_pch.h @@ -45,41 +45,17 @@ * UNSUPPORTED. */ -// from corelib/global/qt_pch.h +#include "../../gui/kernel/qt_gui_pch.h" + #if defined __cplusplus #include <qtwidgetsglobal.h> - - -#if 0 // Used to be included in Qt4 for Q_WS_WIN -# define _POSIX_ -# include <limits.h> -# undef _POSIX_ -#endif - -#include <qcoreapplication.h> -#include <qlist.h> -#include <qvariant.h> // All moc genereated code has this include -#include <qobject.h> -#include <qregexp.h> -#include <qstring.h> -#include <qstringlist.h> -#if QT_CONFIG(textcodec) -#include <qtextcodec.h> -#endif - #include <qapplication.h> -#include <qbitmap.h> -#include <qcursor.h> -#include <qdesktopwidget.h> -#include <qevent.h> -#include <qimage.h> +#include <qabstractbutton.h> +#include <qabstractscrollarea.h> +#include <qabstractslider.h> +#include <qaction.h> +#include <qcommonstyle.h> #include <qlayout.h> -#include <qpainter.h> -#include <qpixmap.h> #include <qstyle.h> -#include <qtimer.h> #include <qwidget.h> - -#include <stdlib.h> - #endif |