From 824f01af8ffb39d94807c2b27d1259b9206b3014 Mon Sep 17 00:00:00 2001
From: Shawn Rutledge <shawn.rutledge@digia.com>
Date: Wed, 29 Oct 2014 10:30:17 +0100
Subject: 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>
---
 src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp')

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)
-- 
cgit v1.2.3