diff options
author | Liang Qi <liang.qi@qt.io> | 2019-04-10 08:16:20 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-04-10 08:16:20 +0200 |
commit | a20da2353cc308aab15e3efa05ab7d899e9c6ca7 (patch) | |
tree | 63881eb44f19384ebfb0e0443291b8f9ab82f149 /src/corelib/global/qt_pch.h | |
parent | 95f787bfdc890c259e8b347bdad9123d534efe0f (diff) | |
parent | eaf20420f8a4d72c804a9d3725c3e294b34c78c8 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
mkspecs/win32-clang-msvc/qmake.conf
src/gui/image/qpnghandler.cpp
Change-Id: Ied79d02912ffb3a307a99483df7db08c7f9d0cd8
Diffstat (limited to 'src/corelib/global/qt_pch.h')
-rw-r--r-- | src/corelib/global/qt_pch.h | 6 |
1 files changed, 6 insertions, 0 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 |