diff options
author | Lars Knoll <lars.knoll@digia.com> | 2013-09-17 18:16:35 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-22 01:06:20 +0200 |
commit | 21198a676128a52e892557bc434035bcd1ddfaac (patch) | |
tree | 10b165b797a7723507b8da375444549a5420e1e8 /src/qml/qml/qqmljavascriptexpression.cpp | |
parent | e441692b0b8f8fffdfdfa8a21c570adcd5cbae7a (diff) |
Don't use Value::emptyValue() anymore.
emptyValue is special and reserved for usage inside the
engine to mark missing values. The main to use cases
are when converting property descriptors, and to mark
holes in array data.
Change-Id: I0ed357e65102b1041bf9a878e6e9a4ae0657523b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression.cpp')
-rw-r--r-- | src/qml/qml/qqmljavascriptexpression.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression.cpp b/src/qml/qml/qqmljavascriptexpression.cpp index d16d421ed2..5c3e61759a 100644 --- a/src/qml/qml/qqmljavascriptexpression.cpp +++ b/src/qml/qml/qqmljavascriptexpression.cpp @@ -135,10 +135,10 @@ QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(QQmlContextData *context, { Q_ASSERT(context && context->engine); - if (function.isEmpty() || function.isUndefined()) { + if (function.isUndefined()) { if (isUndefined) *isUndefined = true; - return QV4::Value::emptyValue().asReturnedValue(); + return QV4::Value::undefinedValue().asReturnedValue(); } QQmlEnginePrivate *ep = QQmlEnginePrivate::get(context->engine); @@ -187,7 +187,7 @@ QV4::ReturnedValue QQmlJavaScriptExpression::evaluate(QQmlContextData *context, if (isUndefined) *isUndefined = true; if (!watcher.wasDeleted()) { - if (!ex->isEmpty()) { + if (!ex->isUndefined()) { delayedError()->setError(e); } else { if (hasDelayedError()) |