AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation error when LTTng enabled

Browse Source 
Updates tracepoint for qtgui and qtopengl fit to current source code.

Change-Id: I2e8ecc86a37942425734202a11bbc792e8f27bf3
Reviewed-by: Hyungchan Kim <hyungchan2.kim@lge.com>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
This commit is contained in:
Hyungchan Kim 2021-03-03 09:58:14 +09:00
parent 5577cbaac5
commit 3dcdd89dd1
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/qtgui.tracepoints
View File

@ -11,8 +11,8 @@ QGuiApplicationPrivate_processWindowSystemEvent_entry(int type)
QGuiApplicationPrivate_processWindowSystemEvent_exit() QGuiApplicationPrivate_processWindowSystemEvent_exit()
QFontDatabase_addApplicationFont(const QString &filename) QFontDatabase_addApplicationFont(const QString &filename)
QFontDatabase_load(const QString &family, int pointSize) QFontDatabase_load(const QStringList &family, int pointSize)
QFontDatabase_loadEngine(const QString &family, int pointSize) QFontDatabase_loadEngine(const QStringList &families, int pointSize)
QFontDatabasePrivate_addAppFont(const QString &fileName) QFontDatabasePrivate_addAppFont(const QString &fileName)
QImageData_create_entry(const QSize &size, QImage::Format format) QImageData_create_entry(const QSize &size, QImage::Format format)

4
src/gui/text/qfontdatabase.cpp
View File

@ -820,7 +820,7 @@ QFontEngine *loadEngine(int script, const QFontDef &request,
QFontEngine *engine = loadSingleEngine(script, request, family, foundry, style, size); QFontEngine *engine = loadSingleEngine(script, request, family, foundry, style, size);
if (engine && !(request.styleStrategy & QFont::NoFontMerging) && !engine->symbol) { if (engine && !(request.styleStrategy & QFont::NoFontMerging) && !engine->symbol) {
Q_TRACE(QFontDatabase_loadEngine, request.family, request.pointSize); Q_TRACE(QFontDatabase_loadEngine, request.families, request.pointSize);
QPlatformFontDatabase *pfdb = QGuiApplicationPrivate::platformIntegration()->fontDatabase(); QPlatformFontDatabase *pfdb = QGuiApplicationPrivate::platformIntegration()->fontDatabase();
QFontEngineMulti *pfMultiEngine = pfdb->fontEngineMulti(engine, QChar::Script(script)); QFontEngineMulti *pfMultiEngine = pfdb->fontEngineMulti(engine, QChar::Script(script));
@ -2492,7 +2492,7 @@ void QFontDatabasePrivate::load(const QFontPrivate *d, int script)
QFontEngine *fe = nullptr; QFontEngine *fe = nullptr;
Q_TRACE(QFontDatabase_load, req.family, req.pointSize); Q_TRACE(QFontDatabase_load, req.families, req.pointSize);
req.fallBackFamilies = fallBackFamilies; req.fallBackFamilies = fallBackFamilies;
if (!req.fallBackFamilies.isEmpty()) if (!req.fallBackFamilies.isEmpty())

15
src/opengl/qtopengl.tracepoints
View File

@ -1,3 +1,12 @@
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) #include <private/qopengl2pexvertexarray_p.h>
QOpenGLTextureCache_bindTexture(QOpenGLContext *context, qint64 key, const QImage &image, QOpenGLTextureUploader::BindOptions options) #include <private/qopengltextureuploader_p.h>
#include <qopenglframebufferobject.h>
}
QOpenGLFramebufferObjectPrivate_init_entry(QOpenGLFramebufferObject *qfbo, const QSize &size, QOpenGLFramebufferObject::Attachment attachment, GLenum texture_target, GLenum internal_format, GLint samples, bool mipmap)
QOpenGLFramebufferObjectPrivate_init_exit()
QOpenGL2PaintEngineExPrivate_drawTexture_entry(const QOpenGLRect& dest, const QOpenGLRect& src, const QSize &textureSize, bool opaque, bool pattern)
QOpenGL2PaintEngineExPrivate_drawTexture_exit()
QOpenGLTextureCache_bindTexture_entry(QOpenGLContext *context, qint64 key, const QImage &image, QOpenGLTextureUploader::BindOptions options)
QOpenGLTextureCache_bindTexture_exit()