diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-12-12 10:42:58 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-12-14 20:29:45 +0100 |
| commit | 31f437e658c25523c284a404ac7be153e6e347c9 (patch) | |
| tree | 6eb242da5f2508ba15b45c204e8a937fbb5f663b /src/corelib/tools/qpair.h | |
| parent | 0d09b4f6b9cae84b78d59cecab6d6feb993b112a (diff) | |
Add QT_NO_QPAIR
...and mark QtCore as free of QPair.
Task-number: QTBUG-115841
Pick-to: 6.7
Change-Id: Ic6009d3cabbf72b3b3fe966e47d48a80a328b499
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
Diffstat (limited to 'src/corelib/tools/qpair.h')
| -rw-r--r-- | src/corelib/tools/qpair.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/tools/qpair.h b/src/corelib/tools/qpair.h index 009191c467..84f99075e1 100644 --- a/src/corelib/tools/qpair.h +++ b/src/corelib/tools/qpair.h @@ -13,6 +13,8 @@ QT_BEGIN_NAMESPACE #pragma qt_class(QPair) #endif +#ifndef QT_NO_QPAIR + 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)))) @@ -20,6 +22,8 @@ constexpr decltype(auto) qMakePair(T1 &&value1, T2 &&value2) return std::make_pair(std::forward<T1>(value1), std::forward<T2>(value2)); } +#endif // QT_NO_QPAIR + QT_END_NAMESPACE #endif // QPAIR_H |