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

Tracing/QmlProfiler/CtfVisualizer/PerfProfiler: Compile with Qt 6

Browse Source 
This makes the tracing lib, its tests and the three plugins which depend
on the lib compile with Qt 6.

The rectangles are not yet shown most likely because some OpenGL
specific code was #ifdef-ed for Qt 6. That code needs to be
reimplemented on top of the new Scenegraph API, using the RHI instead of
direct OpenGL in a follow-up patch.
An assertion failure in QQuickWidget::createFramebufferObject() needs to
be fixed as-well.

The code still builds and runs assertion free (and the autotests pass)
when built against Qt 5.

Task-number: QTCREATORBUG-20575
Change-Id: I47ebb477823de2f0d27329dac7c292a466cea1d7
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Alessandro Portale
2021-06-09 11:36:10 +02:00
parent 370410aca0
commit 43c5944571
17 changed files with 173 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/ctfvisualizer/ctftimelinemodel.cpp
View File

@@ -250,7 +250,7 @@ qint64 CtfTimelineModel::newStackEvent(const json &event, qint64 normalizedTime,
int selectionId)
{
int nestingLevel = m_openEventIds.size();
m_maxStackSize = std::max(m_maxStackSize, m_openEventIds.size() + 1);
m_maxStackSize = std::max(qsizetype(m_maxStackSize), qsizetype(m_openEventIds.size() + 1));
int index = 0;
qint64 duration = -1;
if (eventPhase == CtfEventTypeBegin) {