diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-11 05:08:52 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-11 05:08:52 (GMT) |
| commit | 25eddc815fe87d04616edd9cc1d37253b1d43246 (patch) | |
| tree | 91085e056c9e8a01eef10c46e7410a7aa304c0eb /src/declarative/qml/qmlsqldatabase.cpp | |
| parent | abfb755d7a8ff7f94d4dc59d37ac9934702254bd (diff) | |
| parent | 7287f1f01e7000a21f52f463a459fa0285db4cca (diff) | |
| download | Qt-25eddc815fe87d04616edd9cc1d37253b1d43246.zip Qt-25eddc815fe87d04616edd9cc1d37253b1d43246.tar.gz Qt-25eddc815fe87d04616edd9cc1d37253b1d43246.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 | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp index 4fa63cb..684caa2 100644 --- a/src/declarative/qml/qmlsqldatabase.cpp +++ b/src/declarative/qml/qmlsqldatabase.cpp @@ -44,7 +44,7 @@ #include "qmlengine.h" #include "qmlengine_p.h" #include "qmlrefcount_p.h" -#include "qmlexpression_p.h" +#include "qmlengine_p.h" #include <QtCore/qobject.h> #include <QtScript/qscriptvalue.h> @@ -199,7 +199,6 @@ static QScriptValue qmlsqldatabase_item(QScriptContext *context, QScriptEngine * 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()")); } @@ -319,10 +318,6 @@ static QScriptValue qmlsqldatabase_transaction_shared(QScriptContext *context, Q instance.setProperty(QLatin1String("executeSql"), engine->newFunction(qmlsqldatabase_executeSql_outsidetransaction)); if (engine->hasUncaughtException()) { - QmlError error; - QmlExpressionPrivate::exceptionToError(engine, error); - qWarning() << error; - engine->clearExceptions(); db.rollback(); } else { if (!db.commit()) |