diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2021-07-28 13:00:37 +0200 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2021-08-24 08:49:09 +0200 |
| commit | a7d5ba5de14d656a201cce7cd90b929a5337d82f (patch) | |
| tree | 631892b8c47cdf7efedea74700b2068736ac8229 /src/opengl | |
| parent | 2bff0db9b881dd71a89f530bb6896f2a9bdcf9f7 (diff) | |
Fix broken build when LTTng tracing is enabled
This change fixes 3c556885f02a93efc34dd439ee9aaea22993a2d6 which was a
broken cherry-pick from Qt 6, since it mixed up src/opengl and
src/gui/opengl directories.
It also cherry-picks 3dcdd89dd158306784159d673a1be76a32036b14 from Qt 6,
which fixes the errors in the tracepoints file.
Fixes: QTBUG-94826
Change-Id: I6d2bcfca0e7aa873dd9dbcf0004ef936efeffc07
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/opengl.pro | 3 | ||||
| -rw-r--r-- | src/opengl/qtopengl.tracepoints | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 487538733c..8b2349ff2f 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -55,6 +55,3 @@ qtConfig(graphicseffect) { } load(qt_module) - -TRACEPOINT_PROVIDER = $$PWD/qtopengl.tracepoints -CONFIG += qt_tracepoints diff --git a/src/opengl/qtopengl.tracepoints b/src/opengl/qtopengl.tracepoints deleted file mode 100644 index 3c3043d3d4..0000000000 --- a/src/opengl/qtopengl.tracepoints +++ /dev/null @@ -1,3 +0,0 @@ -QOpenGLFramebufferObjectPrivate_init(QOpenGLFramebufferObject *qfbo, const QSize &size, QOpenGLFramebufferObject::Attachment attachment, GLenum texture_target, GLenum internal_format, GLint samples, bool mipmap) -QOpenGL2PaintEngineExPrivate_drawTexture(const QOpenGLRect& dest, const QOpenGLRect& src, const QSize &textureSize, bool opaque, bool pattern) -QOpenGLTextureCache_bindTexture(QOpenGLContext *context, qint64 key, const QImage &image, QOpenGLTextureUploader::BindOptions options) |