diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-02 14:47:30 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 12:09:48 +0200 |
| commit | 05de01eb639ecff1487f9fddbd9fef3d30520c44 (patch) | |
| tree | e89360b7671089294fcb56010373fae8a17ad64c | |
| parent | d913f99e654d580299471d710cceb0baebde7682 (diff) | |
| download | qtbase-05de01eb639ecff1487f9fddbd9fef3d30520c44.tar.gz | |
Allow the QPA plugin arguments to contain non-ASCII.
Who knows what we might need them for in the future?
Change-Id: Ic68e04aea6cb26afb0ed98684bbb37a62c111638
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qrawfont_ft.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index fac466b0fd..d92dc40d84 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -670,7 +670,7 @@ static void init_platform(const QString &pluginArgument, const QString &platform foreach (const QString &argument, arguments) { const int equalsPos = argument.indexOf(QLatin1Char('=')); const QByteArray name = - equalsPos != -1 ? argument.left(equalsPos).toAscii() : argument.toAscii(); + equalsPos != -1 ? argument.left(equalsPos).toUtf8() : argument.toUtf8(); const QVariant value = equalsPos != -1 ? QVariant(argument.mid(equalsPos + 1)) : QVariant(true); nativeInterface->setProperty(name.constData(), value); diff --git a/src/gui/text/qrawfont_ft.cpp b/src/gui/text/qrawfont_ft.cpp index b54a7a3ac3..959fb44606 100644 --- a/src/gui/text/qrawfont_ft.cpp +++ b/src/gui/text/qrawfont_ft.cpp @@ -63,7 +63,7 @@ public: 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) fontDef.style = QFont::StyleItalic; |