diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-12-07 11:47:24 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-12-13 07:56:47 +0100 |
| commit | 714cbf82558399e0e32d0e2e226783c9ece53a9f (patch) | |
| tree | 7ac07c8b9d53bce45b955b5256865b90228b24a1 /src/corelib/tools | |
| parent | b2288de7cdb32e622da09163d4c373439760b221 (diff) | |
qpair.h: remove duplicate QPair alias definition
The original is in qcontainerfwd.h these days, so just include that.
Pick-to: 6.7
Change-Id: I1d0adaf528f158c48caf47d65b20d09eff06f57d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qpair.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/tools/qpair.h b/src/corelib/tools/qpair.h index 8070ca0175..009191c467 100644 --- a/src/corelib/tools/qpair.h +++ b/src/corelib/tools/qpair.h @@ -4,6 +4,7 @@ #ifndef QPAIR_H #define QPAIR_H +#include <QtCore/qcontainerfwd.h> #include <QtCore/qglobal.h> QT_BEGIN_NAMESPACE @@ -13,9 +14,6 @@ QT_BEGIN_NAMESPACE #endif template <typename T1, typename T2> -using QPair = std::pair<T1, T2>; - -template <typename T1, typename T2> constexpr decltype(auto) qMakePair(T1 &&value1, T2 &&value2) noexcept(noexcept(std::make_pair(std::forward<T1>(value1), std::forward<T2>(value2)))) { |