From ce73ca0b550daf2565b8de0c9946afc528ae8674 Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Sat, 20 Mar 2021 17:49:08 +0100
Subject: [PATCH] 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>
---
 src/corelib/global/qtypeinfo.h    | 1 +
 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 fea6ecd45c9..28b1a4242b7 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 96480c4a8a6..673e3c3de23 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