feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Tracing/QmlProfiler: Fix deprecation warning with Qt 6.3+

Browse Source 
From Qt 6.3 on, QSGMaterial::CustomCompileStep is deprecated and
QSGMaterial::NoBatching should be used, instead.

Change-Id: I27b2fd2e8b86de85ec88ab81b90e056005a4986d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Alessandro Portale
2022-06-02 12:46:20 +02:00
parent f26da75f41
commit 79d08bd5dd
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/tracing/timelineitemsrenderpass.cpp
View File

@@ -542,9 +542,11 @@ void TimelineItemsMaterialShader::initialize()
TimelineItemsMaterial::TimelineItemsMaterial() : m_selectedItem(-1) TimelineItemsMaterial::TimelineItemsMaterial() : m_selectedItem(-1)
{ {
setFlag(QSGMaterial::Blending, false); setFlag(QSGMaterial::Blending, false);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
setFlag(QSGMaterial::NoBatching, true);
#elif QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
setFlag(QSGMaterial::CustomCompileStep, true); setFlag(QSGMaterial::CustomCompileStep, true);
#endif // >= Qt 6 #endif // >= Qt 6.3/6.0
} }
QVector2D TimelineItemsMaterial::scale() const QVector2D TimelineItemsMaterial::scale() const

6
src/libs/tracing/timelinenotesrenderpass.cpp
View File

@@ -178,9 +178,11 @@ TimelineNotesRenderPassState::TimelineNotesRenderPassState(int numExpandedRows)
m_nullGeometry(NotesGeometry::point2DWithDistanceFromTop(), 0) m_nullGeometry(NotesGeometry::point2DWithDistanceFromTop(), 0)
{ {
m_material.setFlag(QSGMaterial::Blending, true); m_material.setFlag(QSGMaterial::Blending, true);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
m_material.setFlag(QSGMaterial::NoBatching, true);
#elif QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
m_material.setFlag(QSGMaterial::CustomCompileStep, true); m_material.setFlag(QSGMaterial::CustomCompileStep, true);
#endif // >= Qt 6 #endif // >= Qt 6.3/6.0
m_expandedRows.reserve(numExpandedRows); m_expandedRows.reserve(numExpandedRows);
for (int i = 0; i < numExpandedRows; ++i) for (int i = 0; i < numExpandedRows; ++i)
m_expandedRows << createNode(); m_expandedRows << createNode();

6
src/plugins/qmlprofiler/qmlprofilerbindingloopsrenderpass.cpp
View File

@@ -383,9 +383,11 @@ void BindingLoopMaterialShader::initialize()
BindingLoopMaterial::BindingLoopMaterial() BindingLoopMaterial::BindingLoopMaterial()
{ {
setFlag(QSGMaterial::Blending, false); setFlag(QSGMaterial::Blending, false);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
setFlag(QSGMaterial::NoBatching, true);
#elif QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
setFlag(QSGMaterial::CustomCompileStep, true); setFlag(QSGMaterial::CustomCompileStep, true);
#endif // >= Qt 6 #endif // >= Qt 6.3/6.0
} }
QSGMaterialType *BindingLoopMaterial::type() const QSGMaterialType *BindingLoopMaterial::type() const