summaryrefslogtreecommitdiffstats
path: root/src/opengl/qopenglversionfunctions.h
diff options
context:
space:
mode:
authorIsak Fyksen <[email protected]>2024-10-17 12:01:48 +0200
committerIsak Fyksen <[email protected]>2024-11-21 16:10:37 +0000
commit35022c1698664b1171e0e5e9611bd9de75d31765 (patch)
tree208b7e1600992fd48c94f515076798587c82b2d9 /src/opengl/qopenglversionfunctions.h
parentabe3eed54889dc8979b14c4aed1a0cae431f50ff (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/qopenglversionfunctions.h')
-rw-r--r--src/opengl/qopenglversionfunctions.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/opengl/qopenglversionfunctions.h b/src/opengl/qopenglversionfunctions.h
index dc01b940bba..9cf0f5782eb 100644
--- a/src/opengl/qopenglversionfunctions.h
+++ b/src/opengl/qopenglversionfunctions.h
@@ -20,7 +20,6 @@
#ifndef QT_NO_OPENGL
#include <QtCore/qhashfunctions.h>
-#include <QtCore/qpair.h>
#include <QtGui/qopengl.h>
// MemoryBarrier is a macro on some architectures on Windows
@@ -57,7 +56,7 @@ struct QOpenGLVersionStatus
status(functionStatus)
{}
- QPair<int, int> version;
+ std::pair<int, int> version;
OpenGLStatus status;
friend constexpr bool operator==(const QOpenGLVersionStatus &lhs, const QOpenGLVersionStatus &rhs) noexcept