diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-08-30 10:53:27 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-08-30 12:15:37 +0200 |
| commit | 987ad3fe9c0b823dd3821200fb38355335ce63ca (patch) | |
| tree | f89c1292d0158ac2f2ce6e607741e86f6a789bea /src/plugins/qmlprofiler | |
| parent | c145f95952fb51df2a993b9c7205f87832d97d20 (diff) | |
| parent | 263d8fb5d7b4888425002a213f3937674e04aa48 (diff) | |
Merge remote-tracking branch 'origin/5.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
src/plugins/android/androidconfigurations.cpp
Change-Id: Icd2b0fda2b2653656285bbbe457c30c9cd414d3f
Diffstat (limited to 'src/plugins/qmlprofiler')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertraceview.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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 |