Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 4 insertions, 3 deletions

diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp
index c7d2e12..6e32fb7 100644
--- a/src/declarative/qml/qmlsqldatabase.cpp
+++ b/src/declarative/qml/qmlsqldatabase.cpp
@@ -248,10 +248,10 @@ static QScriptValue qmlsqldatabase_executeSql(QScriptContext *context, QScriptEn
     QSqlQuery query(db);
     bool err = false;
     if (query.prepare(sql)) {
-        if (values.isArray()) {
+        if (values.isObject()) {
             for (QScriptValueIterator it(values); it.hasNext();) {
                 it.next();
-                query.addBindValue(it.value().toVariant());
+                query.bindValue(it.name(),it.value().toVariant());
             }
         } else {
             query.bindValue(0,values.toVariant());
@@ -337,7 +337,8 @@ static QScriptValue qmlsqldatabase_open(QScriptContext *context, QScriptEngine *
         database = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), dbid);
     }
     if (!database.isOpen()) {
-        QString basename = QmlEnginePrivate::get(engine)->offlineStoragePath + QLatin1String("/Databases/");
+        QString basename = QmlEnginePrivate::get(engine)->offlineStoragePath
+            + QDir::separator() + QLatin1String("Databases") + QDir::separator();
         QDir().mkpath(basename);
         basename += dbid;
         database.setDatabaseName(basename+QLatin1String(".sqlite"));