diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-12-01 03:32:00 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-12-01 03:32:00 (GMT) |
| commit | a1c89f8045fa57617312fac33c1c223965a791c5 (patch) | |
| tree | 5ef3f0c7a751af6cf2ef8b74442dbc2793b24e4d /src/declarative/qml/qmlsqldatabase.cpp | |
| parent | 5f9172a3db108a0cc4719fd75f7ffe3f256f1fcc (diff) | |
| parent | 91ba9959e4339dc547cea98a15d2aac011ac060e (diff) | |
| download | Qt-a1c89f8045fa57617312fac33c1c223965a791c5.zip Qt-a1c89f8045fa57617312fac33c1c223965a791c5.tar.gz Qt-a1c89f8045fa57617312fac33c1c223965a791c5.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlsqldatabase.cpp')
| -rw-r--r-- | src/declarative/qml/qmlsqldatabase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp index d11e3cb..5a7e94c 100644 --- a/src/declarative/qml/qmlsqldatabase.cpp +++ b/src/declarative/qml/qmlsqldatabase.cpp @@ -71,7 +71,7 @@ public: str_forwardOnly = engine->toStringHandle(QLatin1String("forwardOnly")); // not in HTML5 (an optimization) } - QueryFlags queryProperty(const QScriptValue &object, + QueryFlags queryProperty(const QScriptValue &, const QScriptString &name, QueryFlags flags, uint *) { @@ -369,7 +369,7 @@ static QScriptValue qmlsqldatabase_open_sync(QScriptContext *context, QScriptEng // Incompatible THROW_SQL(VERSION_ERR,QmlEngine::tr("SQL: database version mismatch")); } - version = ini.value("Version").toString(); + version = ini.value(QLatin1String("Version")).toString(); } database.setDatabaseName(basename+QLatin1String(".sqlite")); } |