From 491bd18d1fbc99d695ef5ca9f6e357de0fb32d4a Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 26 Aug 2021 13:58:58 +0200 Subject: [PATCH] Update scenegraph API check in isUsable Do not test for OpenGL-through-QRhi, but rather for anything-through-QRhi. The implementation of the profiler views is not tied to OpenGL anymore. That said, QQuickWidget implies using OpenGL as of now, so in practice we will always have OpenGL at best, but update the tests now to be better prepared for the future. Change-Id: Ic43eac1c5cf0e2ce2ef35cdd8a29b475884a5af8 Reviewed-by: Alessandro Portale --- src/plugins/perfprofiler/perfprofilertraceview.cpp | 4 ++++ src/plugins/qmlprofiler/qmlprofilertraceview.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/plugins/perfprofiler/perfprofilertraceview.cpp b/src/plugins/perfprofiler/perfprofilertraceview.cpp index bc2df091520..a330b6eb9a9 100644 --- a/src/plugins/perfprofiler/perfprofilertraceview.cpp +++ b/src/plugins/perfprofiler/perfprofilertraceview.cpp @@ -76,7 +76,11 @@ PerfProfilerTraceView::PerfProfilerTraceView(QWidget *parent, PerfProfilerTool * bool PerfProfilerTraceView::isUsable() const { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) return quickWindow()->rendererInterface()->graphicsApi() == QSGRendererInterface::OpenGL; +#else + return QSGRendererInterface::isApiRhiBased(quickWindow()->rendererInterface()->graphicsApi()); +#endif } void PerfProfilerTraceView::selectByTypeId(int typeId) diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp index 3ceae1d712b..4e40644c6f2 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp @@ -296,8 +296,12 @@ void QmlProfilerTraceView::showContextMenu(QPoint position) bool QmlProfilerTraceView::isUsable() const { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) return d->m_mainView->quickWindow()->rendererInterface()->graphicsApi() == QSGRendererInterface::OpenGL; +#else + return QSGRendererInterface::isApiRhiBased(d->m_mainView->quickWindow()->rendererInterface()->graphicsApi()); +#endif } bool QmlProfilerTraceView::isSuspended() const