diff options
| author | Isak Fyksen <[email protected]> | 2024-10-17 12:01:48 +0200 |
|---|---|---|
| committer | Isak Fyksen <[email protected]> | 2024-11-21 16:10:37 +0000 |
| commit | 35022c1698664b1171e0e5e9611bd9de75d31765 (patch) | |
| tree | 208b7e1600992fd48c94f515076798587c82b2d9 /src/opengl/qopenglfunctions_3_3_compatibility.cpp | |
| parent | abe3eed54889dc8979b14c4aed1a0cae431f50ff (diff) | |
Replace QPair/qMakePair with std::pair in qtbase/opengl
Task-number: QTBUG-115841
Change-Id: Ic7a362a41fb52d39d8a168f0ba4ed6d33458dd73
Reviewed-by: Matthias Rauter <[email protected]>
Diffstat (limited to 'src/opengl/qopenglfunctions_3_3_compatibility.cpp')
| -rw-r--r-- | src/opengl/qopenglfunctions_3_3_compatibility.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qopenglfunctions_3_3_compatibility.cpp b/src/opengl/qopenglfunctions_3_3_compatibility.cpp index 60ef10553b4..eb94a7806aa 100644 --- a/src/opengl/qopenglfunctions_3_3_compatibility.cpp +++ b/src/opengl/qopenglfunctions_3_3_compatibility.cpp @@ -225,8 +225,8 @@ bool QOpenGLFunctions_3_3_Compatibility::isContextCompatible(QOpenGLContext *con { Q_ASSERT(context); QSurfaceFormat f = context->format(); - const QPair<int, int> v = qMakePair(f.majorVersion(), f.minorVersion()); - if (v < qMakePair(3, 3)) + const auto v = std::pair(f.majorVersion(), f.minorVersion()); + if (v < std::pair(3, 3)) return false; if (f.profile() == QSurfaceFormat::CoreProfile) |