summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxwebview.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-10-12 03:00:08 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-10-12 03:00:08 (GMT)
commit6be94173f3f209d785e5787df8440d20ff0f2709 (patch)
tree75794282e09b2af08b26752069b0eb7fcabe3653 /src/declarative/fx/qfxwebview.cpp
parent68c69f88d4c3a7b9f24162a4c7708ded7caba90e (diff)
downloadQt-6be94173f3f209d785e5787df8440d20ff0f2709.zip
Qt-6be94173f3f209d785e5787df8440d20ff0f2709.tar.gz
Qt-6be94173f3f209d785e5787df8440d20ff0f2709.tar.bz2
Use utf8 instead of latin1 where appropriate
Diffstat (limited to 'src/declarative/fx/qfxwebview.cpp')
-rw-r--r--src/declarative/fx/qfxwebview.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp
index a06e294..f7030ca 100644
--- a/src/declarative/fx/qfxwebview.cpp
+++ b/src/declarative/fx/qfxwebview.cpp
@@ -1325,9 +1325,8 @@ public Q_SLOTS:
void qmlLoaded()
{
if (component->isError()) {
- // XXX Could instead give these errors to the WebView to handle.
- foreach (QmlError err, component->errors())
- qWarning(err.toString().toLatin1());
+ // ### Could instead give these errors to the WebView to handle.
+ qWarning() << component->errors();
return;
}
item = qobject_cast<QFxItem*>(component->create(qmlContext(webview)));
@@ -1335,7 +1334,7 @@ public Q_SLOTS:
QString jsObjName;
for (int i=0; i<propertyNames.count(); ++i) {
if (propertyNames[i] != QLatin1String("type") && propertyNames[i] != QLatin1String("data")) {
- item->setProperty(propertyNames[i].toLatin1(),propertyValues[i]);
+ item->setProperty(propertyNames[i].toUtf8(),propertyValues[i]);
if (propertyNames[i] == QLatin1String("objectname"))
jsObjName = propertyValues[i];
}