Replace QPair/qMakePair with std::pair in qtbase/opengl

Task-number: QTBUG-115841
Change-Id: Ic7a362a41fb52d39d8a168f0ba4ed6d33458dd73
Reviewed-by: Matthias Rauter <[email protected]>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/opengl/qopenglshaderprogram.cpp b/src/opengl/qopenglshaderprogram.cpp
index fb33bf0d5c1..250851134ac 100644
--- a/src/opengl/qopenglshaderprogram.cpp
+++ b/src/opengl/qopenglshaderprogram.cpp
@@ -183,18 +183,18 @@ static inline bool isFormatGLES(const QSurfaceFormat &f)
 
 static inline bool supportsGeometry(const QSurfaceFormat &f)
 {
-    return f.version() >= qMakePair(3, 2);
+    return f.version() >= std::pair(3, 2);
 }
 
 static inline bool supportsCompute(const QSurfaceFormat &f)
 {
 #if !QT_CONFIG(opengles2)
     if (!isFormatGLES(f))
-        return f.version() >= qMakePair(4, 3);
+        return f.version() >= std::pair(4, 3);
     else
-        return f.version() >= qMakePair(3, 1);
+        return f.version() >= std::pair(3, 1);
 #else
-    return f.version() >= qMakePair(3, 1);
+    return f.version() >= std::pair(3, 1);
 #endif
 }
 
@@ -202,11 +202,11 @@ static inline bool supportsTessellation(const QSurfaceFormat &f)
 {
 #if !QT_CONFIG(opengles2)
     if (!isFormatGLES(f))
-        return f.version() >= qMakePair(4, 0);
+        return f.version() >= std::pair(4, 0);
     else
-        return f.version() >= qMakePair(3, 2);
+        return f.version() >= std::pair(3, 2);
 #else
-    return f.version() >= qMakePair(3, 2);
+    return f.version() >= std::pair(3, 2);
 #endif
 }
 
@@ -863,7 +863,7 @@ bool QOpenGLShaderProgram::init()
     d->glfuncs->initializeOpenGLFunctions();
 
 #if !QT_CONFIG(opengles2)
-    if (!context->isOpenGLES() && context->format().version() >= qMakePair(4, 0)) {
+    if (!context->isOpenGLES() && context->format().version() >= std::pair(4, 0)) {
         d->tessellationFuncs = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_4_0_Core>(context);
         d->tessellationFuncs->initializeOpenGLFunctions();
     }