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

Allow the QPA plugin arguments to contain non-ASCII.

Browse Source 
Who knows what we might need them for in the future?

Change-Id: Ic68e04aea6cb26afb0ed98684bbb37a62c111638
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
This commit is contained in:
Thiago Macieira 2012-05-02 14:47:30 +02:00 committed by Qt by Nokia
parent 0ec1b9d162
commit 4ececbba58
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qguiapplication.cpp
View File

@ -670,7 +670,7 @@ static void init_platform(const QString &pluginArgument, const QString &platform
foreach (const QString &argument, arguments) { foreach (const QString &argument, arguments) {
const int equalsPos = argument.indexOf(QLatin1Char('=')); const int equalsPos = argument.indexOf(QLatin1Char('='));
const QByteArray name = const QByteArray name =
equalsPos != -1 ? argument.left(equalsPos).toAscii() : argument.toAscii(); equalsPos != -1 ? argument.left(equalsPos).toUtf8() : argument.toUtf8();
const QVariant value = const QVariant value =
equalsPos != -1 ? QVariant(argument.mid(equalsPos + 1)) : QVariant(true); equalsPos != -1 ? QVariant(argument.mid(equalsPos + 1)) : QVariant(true);
nativeInterface->setProperty(name.constData(), value); nativeInterface->setProperty(name.constData(), value);

2
src/gui/text/qrawfont_ft.cpp
View File

@ -63,7 +63,7 @@ public:
void updateFamilyNameAndStyle() void updateFamilyNameAndStyle()
{ {
fontDef.family = QString::fromAscii(freetype->face->family_name); fontDef.family = QString::fromUtf8(freetype->face->family_name);
if (freetype->face->style_flags & FT_STYLE_FLAG_ITALIC) if (freetype->face->style_flags & FT_STYLE_FLAG_ITALIC)
fontDef.style = QFont::StyleItalic; fontDef.style = QFont::StyleItalic;