1 files changed, 6 insertions, 1 deletions

diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp
index cb3866a0dc..d1ecfdc52d 100644
--- a/src/qml/qml/qqmlproperty.cpp
+++ b/src/qml/qml/qqmlproperty.cpp
@@ -113,7 +113,7 @@ property.write(24);
 qWarning() << "Pixel size should now be 24:" << property.read().toInt();
 \endcode
 
-The QtQuick 1 version of this class was named QDeclarativeProperty.
+The \l {Qt Quick 1} version of this class was named QDeclarativeProperty.
 */
 
 /*!
@@ -1531,6 +1531,7 @@ bool QQmlPropertyPrivate::writeBinding(QObject *object,
             // we explicitly disallow this case to avoid confusion.  Users can still store one
             // in an array in a var property if they need to, but the common case is user error.
             expression->delayedError()->setErrorDescription(QLatin1String("Invalid use of Qt.binding() in a binding declaration."));
+            expression->delayedError()->setErrorObject(object);
             return false;
         }
 
@@ -1546,6 +1547,7 @@ bool QQmlPropertyPrivate::writeBinding(QObject *object,
         QV4::FunctionObject *f = result.asFunctionObject();
         if (f && f->bindingKeyFlag) {
             expression->delayedError()->setErrorDescription(QLatin1String("Invalid use of Qt.binding() in a binding declaration."));
+            expression->delayedError()->setErrorObject(object);
             return false;
         }
         writeValueProperty(object, core, QVariant::fromValue(
@@ -1558,12 +1560,14 @@ bool QQmlPropertyPrivate::writeBinding(QObject *object,
         else
             errorStr += QLatin1String(QMetaType::typeName(type));
         expression->delayedError()->setErrorDescription(errorStr);
+        expression->delayedError()->setErrorObject(object);
         return false;
     } else if (QV4::FunctionObject *f = result.asFunctionObject()) {
         if (f->bindingKeyFlag)
             expression->delayedError()->setErrorDescription(QLatin1String("Invalid use of Qt.binding() in a binding declaration."));
         else
             expression->delayedError()->setErrorDescription(QLatin1String("Unable to assign a function to a property of any type other than var."));
+        expression->delayedError()->setErrorObject(object);
         return false;
     } else if (!writeValueProperty(object, core, value, context, flags)) {
 
@@ -1596,6 +1600,7 @@ bool QQmlPropertyPrivate::writeBinding(QObject *object,
                                                         QLatin1String(valueType) +
                                                         QLatin1String(" to ") +
                                                         QLatin1String(propertyType));
+        expression->delayedError()->setErrorObject(object);
         return false;
     }