diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2018-06-05 09:34:36 +1000 |
|---|---|---|
| committer | Lorn Potter <lorn.potter@gmail.com> | 2018-06-07 04:20:55 +0000 |
| commit | 0c3328f659b20c970b59d9c2fcfd681194791bd4 (patch) | |
| tree | e35ccdbc89b451dd25555d755dfefb3f7d22d7c7 | |
| parent | c721795c82b43e31dd02fd0571c792c799eea879 (diff) | |
wasm: share more of the qt_getFreetypeData function
Change-Id: I478aa37742e7bc6911b1b9a866fc6fcab30ba736
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| -rw-r--r-- | src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp index 8cd6f269a5..a0720a05fa 100644 --- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp +++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp @@ -141,22 +141,16 @@ QtFreetypeData::~QtFreetypeData() #ifdef QT_NO_THREAD Q_GLOBAL_STATIC(QtFreetypeData, theFreetypeData) - -QtFreetypeData *qt_getFreetypeData() -{ - QtFreetypeData *freetypeData = theFreetypeData(); - if (!freetypeData->library) { - FT_Init_FreeType(&freetypeData->library); - } - - return freetypeData; -} #else Q_GLOBAL_STATIC(QThreadStorage<QtFreetypeData *>, theFreetypeData) - +#endif QtFreetypeData *qt_getFreetypeData() { +#ifndef QT_NO_THREAD QtFreetypeData *&freetypeData = theFreetypeData()->localData(); +#else + QtFreetypeData *freetypeData = theFreetypeData(); +#endif if (!freetypeData) freetypeData = new QtFreetypeData; if (!freetypeData->library) { @@ -174,7 +168,7 @@ QtFreetypeData *qt_getFreetypeData() } return freetypeData; } -#endif + FT_Library qt_getFreetype() { |