diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-03-20 17:49:08 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2021-03-21 09:13:04 +0100 |
| commit | ce73ca0b550daf2565b8de0c9946afc528ae8674 (patch) | |
| tree | 12c8c4dd047aa38b8445b9dd8925feea15c4d38b /src/corelib | |
| parent | b8b50c6c7a6df17db03ff6fd3a2501511e51703f (diff) | |
qcontainerfwd.h: Do not include variant and tuple
utility is enough to get std::pair; qtypeinfo.h needs to include tuple
now though.
Change-Id: I9feb625f9feb148b3f3133747ab5405c2eca049d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qtypeinfo.h | 1 | ||||
| -rw-r--r-- | src/corelib/tools/qcontainerfwd.h | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index fea6ecd45c..28b1a4242b 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -42,6 +42,7 @@ #include <QtCore/qcontainerfwd.h> #include <variant> #include <optional> +#include <tuple> #ifndef QTYPEINFO_H #define QTYPEINFO_H diff --git a/src/corelib/tools/qcontainerfwd.h b/src/corelib/tools/qcontainerfwd.h index 96480c4a8a..673e3c3de2 100644 --- a/src/corelib/tools/qcontainerfwd.h +++ b/src/corelib/tools/qcontainerfwd.h @@ -43,8 +43,7 @@ #define QCONTAINERFWD_H // std headers can unfortunately not be forward declared -#include <tuple> -#include <variant> +#include <utility> QT_BEGIN_NAMESPACE |