diff options
| author | Alessandro Portale <[email protected]> | 2021-06-09 11:36:10 +0200 |
|---|---|---|
| committer | Alessandro Portale <[email protected]> | 2021-06-09 15:30:21 +0000 |
| commit | 43c5944571601e49ac8dc29491a5000e92f16aaa (patch) | |
| tree | deb63c4fff3f7d620666d966b94b882a9d53c9df /src/libs/tracing/timelineitemsrenderpass.h | |
| parent | 370410aca06e75139414ae1f5cd34efa541e5c1b (diff) | |
Tracing/QmlProfiler/CtfVisualizer/PerfProfiler: Compile with Qt 6
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 <[email protected]>
Diffstat (limited to 'src/libs/tracing/timelineitemsrenderpass.h')
| -rw-r--r-- | src/libs/tracing/timelineitemsrenderpass.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libs/tracing/timelineitemsrenderpass.h b/src/libs/tracing/timelineitemsrenderpass.h index f08c1952b9b..807f0ed5518 100644 --- a/src/libs/tracing/timelineitemsrenderpass.h +++ b/src/libs/tracing/timelineitemsrenderpass.h @@ -45,7 +45,11 @@ public: void setSelectionColor(QColor selectionColor); QSGMaterialType *type() const override; +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QSGMaterialShader *createShader() const override; +#else + QSGMaterialShader *createShader(QSGRendererInterface::RenderMode renderMode) const override; +#endif // < Qt 6 private: QVector2D m_scale; |