diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:29:34 +0300 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-09-12 18:29:34 +0300 |
| commit | 6efece8c8fe18ec3cc01dbc9c02fed3f17208ef4 (patch) | |
| tree | 243504aa152967c5586bc848f9f62679d51551d0 /src/opengl | |
| parent | a5984e059385e93ab06eb95cbe12bea5215f7b9d (diff) | |
| parent | dbf21da8a66e4cf1a050792c3a5816d2c686a846 (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into tqtc/lts-5.15-opensource
Change-Id: I976ce0c3664c9953dd0019b7d76d3f603583634f
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) |