Resolve attached property typenames in correct context.

The imports of the component containing the reference to the
attached property are used to resolve typenames, rather than
assuming "Qt" namespace.

1 files changed, 18 insertions, 0 deletions

diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index 451dbcc..b73471a 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -451,4 +451,22 @@ void QmlContext::setBaseUrl(const QUrl &baseUrl)
     d_func()->url = baseUrl;
 }
 
+/*!
+    Returns the base url of the component, or the containing component
+    if none is set.
+*/
+QUrl QmlContext::baseUrl() const
+{
+    Q_D(const QmlContext);
+    const QmlContext* p = this;
+    while (p && p->d_func()->url.isEmpty()) {
+        p = p->parentContext();
+    }
+    if (p)
+        return p->d_func()->url;
+    else
+        return QUrl();
+}
+
+
 QT_END_NAMESPACE