diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-10-29 10:30:17 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-10-29 10:49:56 +0100 |
| commit | 824f01af8ffb39d94807c2b27d1259b9206b3014 (patch) | |
| tree | 3c4c4bb6bdd8ada776a5b9823b167d940448c968 /src/platformsupport | |
| parent | 3d5fb54eda2330d76c11a10c39fc70541eddf4a5 (diff) | |
fontconfig: do not assume the path to a font file is Latin1-encoded
Task-number: QTBUG-42249
Change-Id: Ie5d41ed26a69103991a5189c4f42aa37ac73de26
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp index 2b9883eb36..5dec1d0915 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp +++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp @@ -409,7 +409,7 @@ static void populateFromPattern(FcPattern *pattern) #endif FontFile *fontFile = new FontFile; - fontFile->fileName = QLatin1String((const char *)file_value); + fontFile->fileName = QString::fromLocal8Bit((const char *)file_value); fontFile->indexValue = indexValue; QFont::Style style = (slant_value == FC_SLANT_ITALIC) |