From 2f8015b66528561dd9219842fd334956876ee85f Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Tue, 15 Dec 2009 15:33:01 +1000
Subject: Print exceptions generated in SQL callback functions.

---
 src/declarative/qml/qmlsqldatabase.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/declarative/qml/qmlsqldatabase.cpp b/src/declarative/qml/qmlsqldatabase.cpp
index c3c3ca3..4fa63cb 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 "qmlengine_p.h"
+#include "qmlexpression_p.h"
 
 #include <QtCore/qobject.h>
 #include <QtScript/qscriptvalue.h>
@@ -319,6 +319,10 @@ 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())
-- 
cgit v0.12