From 02eb5e6d300515b681ac8301c77da9eeb9c40a80 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 7 Dec 2023 11:47:24 +0100 Subject: [PATCH] qpair.h: remove duplicate QPair alias definition The original is in qcontainerfwd.h these days, so just include that. Change-Id: I1d0adaf528f158c48caf47d65b20d09eff06f57d Reviewed-by: Fabian Kosmale (cherry picked from commit 714cbf82558399e0e32d0e2e226783c9ece53a9f) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/tools/qpair.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/corelib/tools/qpair.h b/src/corelib/tools/qpair.h index 8070ca01755..009191c4670 100644 --- a/src/corelib/tools/qpair.h +++ b/src/corelib/tools/qpair.h @@ -4,6 +4,7 @@ #ifndef QPAIR_H #define QPAIR_H +#include #include QT_BEGIN_NAMESPACE @@ -12,9 +13,6 @@ QT_BEGIN_NAMESPACE #pragma qt_class(QPair) #endif -template -using QPair = std::pair; - template constexpr decltype(auto) qMakePair(T1 &&value1, T2 &&value2) noexcept(noexcept(std::make_pair(std::forward(value1), std::forward(value2))))