diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/platformsupport/cglconvenience/cglconvenience.mm | 2 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/platformsupport/cglconvenience/cglconvenience.mm b/src/platformsupport/cglconvenience/cglconvenience.mm index 325f5c5770..7ca9b6025e 100644 --- a/src/platformsupport/cglconvenience/cglconvenience.mm +++ b/src/platformsupport/cglconvenience/cglconvenience.mm @@ -49,7 +49,7 @@ void (*qcgl_getProcAddress(const QByteArray &procName))() CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, CFSTR("/System/Library/Frameworks/OpenGL.framework"), kCFURLPOSIXPathStyle, false); CFBundleRef bundle = CFBundleCreate(kCFAllocatorDefault, url); - CFStringRef procNameCF = QCFString::toCFStringRef(QString::fromAscii(procName.constData())); + CFStringRef procNameCF = QCFString::toCFStringRef(QString::fromLatin1(procName.constData())); void *proc = CFBundleGetFunctionPointerForName(bundle, procNameCF); CFRelease(url); CFRelease(bundle); diff --git a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp index 9a7e0d31db..cddc08c750 100644 --- a/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp +++ b/src/platformsupport/fontdatabases/basic/qbasicfontdatabase.cpp @@ -251,7 +251,7 @@ namespace { void updateFamilyNameAndStyle() { - fontDef.family = QString::fromAscii(freetype->face->family_name); + fontDef.family = QString::fromLatin1(freetype->face->family_name); if (freetype->face->style_flags & FT_STYLE_FLAG_ITALIC) fontDef.style = QFont::StyleItalic; @@ -413,7 +413,7 @@ QStringList QBasicFontDatabase::addTTFile(const QByteArray &fontData, const QByt } } - QString family = QString::fromAscii(face->family_name); + QString family = QString::fromLatin1(face->family_name); FontFile *fontFile = new FontFile; fontFile->fileName = QFile::decodeName(file); fontFile->indexValue = index; |