diff options
| author | Bea Lam <bea.lam@nokia.com> | 2009-12-01 22:28:46 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2009-12-01 22:28:46 (GMT) |
| commit | c4d28c13d223cfded250d2c8c4a8da5ef0257b78 (patch) | |
| tree | c749e927dd04923cd696ad5536e35225e904cabc /src/declarative/qml/qmlsqldatabase.cpp | |
| parent | 5912a8bc5d59d4eb9d154c9b0a4ad495fe465c13 (diff) | |
| parent | 88ee1fa39e2f1aff0eac5503ca34274481125b8f (diff) | |
| download | Qt-c4d28c13d223cfded250d2c8c4a8da5ef0257b78.zip Qt-c4d28c13d223cfded250d2c8c4a8da5ef0257b78.tar.gz Qt-c4d28c13d223cfded250d2c8c4a8da5ef0257b78.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of 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")); } |