From 0ddd9958b483e4dbbd5d4b69f3a8425855bdc53b Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Thu, 15 Apr 2010 11:56:39 +1000
Subject: Output script errors in ScriptAction and StateChangeScript

Task-number: QTBUG-9897
---
 src/declarative/util/qdeclarativeanimation.cpp       | 7 +++++++
 src/declarative/util/qdeclarativestateoperations.cpp | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 33ddb46..fac38d7 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -44,6 +44,7 @@
 
 #include "private/qdeclarativebehavior_p.h"
 #include "private/qdeclarativestateoperations_p.h"
+#include "private/qdeclarativecontext_p.h"
 
 #include <qdeclarativepropertyvaluesource.h>
 #include <qdeclarative.h>
@@ -767,6 +768,7 @@ void QDeclarativeScriptAction::setStateChangeScriptName(const QString &name)
 
 void QDeclarativeScriptActionPrivate::execute()
 {
+    Q_Q(QDeclarativeScriptAction);
     if (hasRunScriptScript && reversing)
         return;
 
@@ -775,7 +777,12 @@ void QDeclarativeScriptActionPrivate::execute()
     const QString &str = scriptStr.script();
     if (!str.isEmpty()) {
         QDeclarativeExpression expr(scriptStr.context(), str, scriptStr.scopeObject());
+        QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(q);
+        if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty())
+            expr.setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber);
         expr.value();
+        if (expr.hasError())
+            qWarning() << expr.error();
     }
 }
 
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 410a269..0521d27 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -49,6 +49,7 @@
 #include <qdeclarativeitem_p.h>
 #include <qdeclarativeguard_p.h>
 #include <qdeclarativenullablevalue_p_p.h>
+#include "private/qdeclarativecontext_p.h"
 
 #include <QtCore/qdebug.h>
 #include <QtGui/qgraphicsitem.h>
@@ -571,7 +572,12 @@ void QDeclarativeStateChangeScript::execute()
     const QString &script = d->script.script();
     if (!script.isEmpty()) {
         QDeclarativeExpression expr(d->script.context(), script, d->script.scopeObject());
+        QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(this);
+        if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty())
+            expr.setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber);
         expr.value();
+        if (expr.hasError())
+            qWarning() << expr.error();
     }
 }
 
-- 
cgit v0.12