diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-09 01:01:06 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-09 01:01:07 +0200 |
| commit | 8c3172d724f3ad03cdee7bae23443fa109d350b1 (patch) | |
| tree | 53ad546936e22b99d1ea395a875a312332d05516 /src/quick/scenegraph | |
| parent | 5a5441f38e0529d852536b776cd9f26dad410e62 (diff) | |
| parent | 4b6832828e04a9806aaf345da5f456817dd3970b (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2
Change-Id: I68211a7d4568a1c31c6a124fe6777709c53736a5
Diffstat (limited to 'src/quick/scenegraph')
| -rw-r--r-- | src/quick/scenegraph/qsgdefaultcontext.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/scenegraph/qsgdefaultcontext.cpp b/src/quick/scenegraph/qsgdefaultcontext.cpp index af0589e5d3..70b74b8877 100644 --- a/src/quick/scenegraph/qsgdefaultcontext.cpp +++ b/src/quick/scenegraph/qsgdefaultcontext.cpp @@ -62,6 +62,8 @@ #include <private/qqmlglobal_p.h> +#include <algorithm> + QT_BEGIN_NAMESPACE namespace QSGMultisampleAntialiasing { @@ -158,11 +160,9 @@ void QSGDefaultContext::renderContextInitialized(QSGRenderContext *renderContext qCDebug(QSG_LOG_INFO, "GL_RENDERER: %s", (const char*)funcs->glGetString(GL_RENDERER)); qCDebug(QSG_LOG_INFO, "GL_VERSION: %s", (const char*)funcs->glGetString(GL_VERSION)); - QSet<QByteArray> exts = openglRenderContext->openglContext()->extensions(); - QByteArray all; - for (const QByteArray &e : qAsConst(exts)) - all += ' ' + e; - qCDebug(QSG_LOG_INFO, "GL_EXTENSIONS: %s", all.constData()); + QByteArrayList exts = openglRenderContext->openglContext()->extensions().toList(); + std::sort(exts.begin(), exts.end()); + qCDebug(QSG_LOG_INFO, "GL_EXTENSIONS: %s", exts.join(' ').constData()); qCDebug(QSG_LOG_INFO, "Max Texture Size: %d", openglRenderContext->maxTextureSize()); qCDebug(QSG_LOG_INFO, "Debug context: %s", format.testOption(QSurfaceFormat::DebugContext) ? "true" : "false"); |