Add bool* argument to QmlExpression::value() to help debugger.

3 files changed, 14 insertions, 8 deletions

diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp
index 76ca2c1..e158621 100644
--- a/src/declarative/qml/qmlexpression.cpp
+++ b/src/declarative/qml/qmlexpression.cpp
@@ -275,7 +275,7 @@ void QmlExpressionPrivate::printException(QScriptEngine *scriptEngine)
     }
 }
 
-QVariant QmlExpressionPrivate::evalQtScript(QObject *secondaryScope)
+QVariant QmlExpressionPrivate::evalQtScript(QObject *secondaryScope, bool *isUndefined)
 {
 #ifdef Q_ENABLE_PERFORMANCE_LOG
     QFxPerfTimer<QFxPerf::BindValueQt> perfqt;
@@ -312,6 +312,9 @@ QVariant QmlExpressionPrivate::evalQtScript(QObject *secondaryScope)
 
     QScriptValue svalue = data->expressionFunction.call();
 
+    if (isUndefined)
+        *isUndefined = svalue.isUndefined();
+
     if (scriptEngine->hasUncaughtException())
        printException(scriptEngine);
 
@@ -352,7 +355,7 @@ QVariant QmlExpressionPrivate::evalQtScript(QObject *secondaryScope)
     return rv;
 }
 
-QVariant QmlExpressionPrivate::value(QObject *secondaryScope)
+QVariant QmlExpressionPrivate::value(QObject *secondaryScope, bool *isUndefined)
 {
     Q_Q(QmlExpression);
 
@@ -379,7 +382,7 @@ QVariant QmlExpressionPrivate::value(QObject *secondaryScope)
     if (data->sse.isValid()) {
         rv = evalSSE();
     } else {
-        rv = evalQtScript(secondaryScope);
+        rv = evalQtScript(secondaryScope, isUndefined);
     }
 
     ep->currentExpression = lastCurrentExpression;
@@ -403,11 +406,14 @@ QVariant QmlExpressionPrivate::value(QObject *secondaryScope)
 /*!
     Returns the value of the expression, or an invalid QVariant if the
     expression is invalid or has an error.
+
+    \a isUndefined is set to true if the expression resulted in an
+    undefined value.
 */
-QVariant QmlExpression::value()
+QVariant QmlExpression::value(bool *isUndefined)
 {
     Q_D(QmlExpression);
-    return d->value();
+    return d->value(0, isUndefined);
 }
 
 /*!
diff --git a/src/declarative/qml/qmlexpression.h b/src/declarative/qml/qmlexpression.h
index b85e0a7..169d096 100644
--- a/src/declarative/qml/qmlexpression.h
+++ b/src/declarative/qml/qmlexpression.h
@@ -81,7 +81,7 @@ public:
     QObject *scopeObject() const;
 
 public Q_SLOTS:
-    QVariant value();
+    QVariant value(bool *isUndefined = 0);
 
 Q_SIGNALS:
     virtual void valueChanged();
diff --git a/src/declarative/qml/qmlexpression_p.h b/src/declarative/qml/qmlexpression_p.h
index d9bb27b..3ec8d1c 100644
--- a/src/declarative/qml/qmlexpression_p.h
+++ b/src/declarative/qml/qmlexpression_p.h
@@ -140,9 +140,9 @@ public:
 
     QmlExpressionData *data;
 
-    QVariant value(QObject *secondaryScope = 0);
+    QVariant value(QObject *secondaryScope = 0, bool *isUndefined = 0);
     QVariant evalSSE();
-    QVariant evalQtScript(QObject *secondaryScope);
+    QVariant evalQtScript(QObject *secondaryScope, bool *isUndefined = 0);
 
     void updateGuards(const QPODVector<QmlEnginePrivate::CapturedProperty> &properties);
     void clearGuards();