diff options
| author | Isak Fyksen <isak.fyksen@qt.io> | 2024-10-17 12:01:48 +0200 |
|---|---|---|
| committer | Isak Fyksen <isak.fyksen@qt.io> | 2024-11-21 16:10:37 +0000 |
| commit | 35022c1698664b1171e0e5e9611bd9de75d31765 (patch) | |
| tree | 208b7e1600992fd48c94f515076798587c82b2d9 /src/opengl/qopengltimerquery.cpp | |
| parent | abe3eed54889dc8979b14c4aed1a0cae431f50ff (diff) | |
Replace QPair/qMakePair with std::pair in qtbase/opengl
Task-number: QTBUG-115841
Change-Id: Ic7a362a41fb52d39d8a168f0ba4ed6d33458dd73
Reviewed-by: Matthias Rauter <matthias.rauter@qt.io>
Diffstat (limited to 'src/opengl/qopengltimerquery.cpp')
| -rw-r--r-- | src/opengl/qopengltimerquery.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/qopengltimerquery.cpp b/src/opengl/qopengltimerquery.cpp index d4e385630e5..2a9f071c4b0 100644 --- a/src/opengl/qopengltimerquery.cpp +++ b/src/opengl/qopengltimerquery.cpp @@ -107,11 +107,11 @@ bool QOpenGLTimerQueryPrivate::create() // Check to see if we also need to resolve the functions for EXT_timer_query QSurfaceFormat f = context->format(); - if (f.version() <= qMakePair(3, 2) + if (f.version() <= std::pair(3, 2) && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query")) && context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) { ext = new QExtTimerQueryHelper(context); - } else if (f.version() <= qMakePair(3, 2) + } else if (f.version() <= std::pair(3, 2) && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query")) && !context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) { qWarning("QOpenGLTimerQuery requires one of:\n" @@ -494,11 +494,11 @@ bool QOpenGLTimeMonitorPrivate::create() // Check to see if we also need to resolve the functions for EXT_timer_query QSurfaceFormat f = context->format(); - if (f.version() <= qMakePair(3, 2) + if (f.version() <= std::pair(3, 2) && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query")) && context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) { ext = new QExtTimerQueryHelper(context); - } else if (f.version() <= qMakePair(3, 2) + } else if (f.version() <= std::pair(3, 2) && !context->hasExtension(QByteArrayLiteral("GL_ARB_timer_query")) && !context->hasExtension(QByteArrayLiteral("GL_EXT_timer_query"))) { qWarning("QOpenGLTimeMonitor requires one of:\n" |