diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-01-11 04:34:25 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-01-11 04:34:25 (GMT) |
| commit | cf571ec8471d611c737e998e96b202eb118d29c8 (patch) | |
| tree | 1d5f93536e96b3dc1e0a19c03cd6774e5a91dd6a /src/declarative/qml | |
| parent | 39949590be794ec5d50a24b87c46d2771b67852b (diff) | |
| download | Qt-cf571ec8471d611c737e998e96b202eb118d29c8.zip Qt-cf571ec8471d611c737e998e96b202eb118d29c8.tar.gz Qt-cf571ec8471d611c737e998e96b202eb118d29c8.tar.bz2 | |
QTBUG-6507 appears fixed (don't know when)
Diffstat (limited to 'src/declarative/qml')
| -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()) |