5 files changed, 40 insertions, 2 deletions

diff --git a/examples/declarative/listview/dummydata/MyPetsModel.qml b/examples/declarative/listview/dummydata/MyPetsModel.qml
index 9a00dca..074fc13 100644
--- a/examples/declarative/listview/dummydata/MyPetsModel.qml
+++ b/examples/declarative/listview/dummydata/MyPetsModel.qml
@@ -29,7 +29,7 @@ ListModel {
         size: "Medium"
     }
     ListElement {
-        name: "Whiskers"
+        name: "Schrödinger"
         type: "Cat"
         age: 2
         size: "Medium"
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 0a00092..aa66c17 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -144,6 +144,8 @@ QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
     qtObject.setProperty(QLatin1String("playSound"), scriptEngine.newFunction(QmlEnginePrivate::playSound, 1));
     qtObject.setProperty(QLatin1String("openUrlExternally"),scriptEngine.newFunction(desktopOpenUrl, 1));
     qtObject.setProperty(QLatin1String("md5"),scriptEngine.newFunction(md5, 1));
+    qtObject.setProperty(QLatin1String("btoa"),scriptEngine.newFunction(btoa, 1));
+    qtObject.setProperty(QLatin1String("atob"),scriptEngine.newFunction(atob, 1));
 
     //firebug/webkit compat
     QScriptValue consoleObject = scriptEngine.newObject();
@@ -818,6 +820,26 @@ QScriptValue QmlEnginePrivate::md5(QScriptContext *ctxt, QScriptEngine *)
     return QScriptValue(QLatin1String(result.toHex()));
 }
 
+QScriptValue QmlEnginePrivate::btoa(QScriptContext *ctxt, QScriptEngine *)
+{
+    QByteArray data;
+
+    if (ctxt->argumentCount() >= 1)
+        data = ctxt->argument(0).toString().toUtf8();
+
+    return QScriptValue(QLatin1String(data.toBase64()));
+}
+
+QScriptValue QmlEnginePrivate::atob(QScriptContext *ctxt, QScriptEngine *)
+{
+    QByteArray data;
+
+    if (ctxt->argumentCount() >= 1)
+        data = ctxt->argument(0).toString().toUtf8();
+
+    return QScriptValue(QLatin1String(QByteArray::fromBase64(data)));
+}
+
 QScriptValue QmlEnginePrivate::consoleLog(QScriptContext *ctxt, QScriptEngine *e)
 {
     if(ctxt->argumentCount() < 1)
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index c11a399..cabd0ad 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -269,6 +269,8 @@ public:
     static QScriptValue playSound(QScriptContext*, QScriptEngine*);
     static QScriptValue desktopOpenUrl(QScriptContext*, QScriptEngine*);
     static QScriptValue md5(QScriptContext*, QScriptEngine*);
+    static QScriptValue btoa(QScriptContext*, QScriptEngine*);
+    static QScriptValue atob(QScriptContext*, QScriptEngine*);
     static QScriptValue consoleLog(QScriptContext*, QScriptEngine*);
 
     static QScriptEngine *getScriptEngine(QmlEngine *e) { return &e->d_func()->scriptEngine; }
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 5491fd7..8259dcd 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -851,7 +851,7 @@ void QmlListModelParser::setCustomData(QObject *obj, const QByteArray &d)
         case ListInstruction::Value:
             {
                 ModelNode *n = nodes.top();
-                n->values.append(QByteArray(data + instr.dataIdx));
+                n->values.append(QString::fromUtf8(QByteArray(data + instr.dataIdx)));
             }
             break;
 
diff --git a/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp b/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
index f2ffb7b..c7de5d9 100644
--- a/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
+++ b/tests/auto/declarative/qmllistmodel/tst_qmllistmodel.cpp
@@ -51,12 +51,26 @@ public:
     tst_QmlListModel() {}
 
 private slots:
+    void static_i18n();
     void dynamic_data();
     void dynamic();
     void error_data();
     void error();
 };
 
+void tst_QmlListModel::static_i18n()
+{
+    QString expect = QString::fromUtf8("na\303\257ve");
+    QString componentStr = "import Qt 4.6\nListModel { ListElement { prop1: \""+expect+"\" } }";
+    QmlEngine engine;
+    QmlComponent component(&engine, componentStr.toUtf8(), QUrl("file://"));
+    QmlListModel *obj = qobject_cast<QmlListModel*>(component.create());
+    QVERIFY(obj != 0);
+    QString prop = obj->get(0).property(QLatin1String("prop1")).toString();
+    QCOMPARE(prop,expect);
+    delete obj;
+}
+
 void tst_QmlListModel::dynamic_data()
 {
     QTest::addColumn<QString>("script");