1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qpair.h: remove duplicate QPair alias definition

Browse Source 
The original is in qcontainerfwd.h these days, so just include that.

Change-Id: I1d0adaf528f158c48caf47d65b20d09eff06f57d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 714cbf82558399e0e32d0e2e226783c9ece53a9f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Marc Mutz 2023-12-07 11:47:24 +01:00 committed by Qt Cherry-pick Bot
parent cab0d26c45
commit 02eb5e6d30
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qpair.h
View File

@ -4,6 +4,7 @@
#ifndef QPAIR_H
#define QPAIR_H
#include <QtCore/qcontainerfwd.h>
#include <QtCore/qglobal.h>
QT_BEGIN_NAMESPACE
@ -12,9 +13,6 @@ QT_BEGIN_NAMESPACE
#pragma qt_class(QPair)
#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))))