diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-12-06 23:52:22 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-12-06 23:52:22 (GMT) |
| commit | ff30a79b70ffd14104aa5a770bb67efb45da12dd (patch) | |
| tree | 18a776b4271559a9493f1f7c6452e341290dcaac /src/declarative/qml/qmlsqldatabase.cpp | |
| parent | f3a55136c0375d358e93929e94c2ab6c15dbfb93 (diff) | |
| parent | b1695545a5d57028910b88b4a75b82b86aa0f009 (diff) | |
| download | Qt-ff30a79b70ffd14104aa5a770bb67efb45da12dd.zip Qt-ff30a79b70ffd14104aa5a770bb67efb45da12dd.tar.gz Qt-ff30a79b70ffd14104aa5a770bb67efb45da12dd.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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp index e82c54e..6ddd5e5 100644 --- a/src/declarative/qml/qmlsqldatabase.cpp +++ b/src/declarative/qml/qmlsqldatabase.cpp @@ -197,7 +197,7 @@ static QScriptValue qmlsqldatabase_item(QScriptContext *context, QScriptEngine * return engine->undefinedValue(); } -static QScriptValue qmlsqldatabase_executeSql_outsidetransaction(QScriptContext *context, QScriptEngine *engine) +static QScriptValue qmlsqldatabase_executeSql_outsidetransaction(QScriptContext *context, QScriptEngine * /*engine*/) { qDebug() << QmlEngine::tr("executeSql called outside transaction()"); // XXX pending bug QTBUG-6507 THROW_SQL(DATABASE_ERR,QmlEngine::tr("executeSql called outside transaction()")); |