Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

1 files changed, 0 insertions, 29 deletions

diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp
index c3cee4c..b605869 100644
--- a/src/declarative/qml/qmlcontext.cpp
+++ b/src/declarative/qml/qmlcontext.cpp
@@ -477,35 +477,6 @@ QUrl QmlContext::resolvedUrl(const QUrl &src)
 }
 
 /*!
-    Resolves the component URI \a src relative to the URL of the
-    containing component, and according to the
-    \l {QmlEngine::nameSpacePaths()} {namespace paths} of the
-    context's engine, returning the resolved URL.
-
-    \sa QmlEngine::componentUrl(), setBaseUrl()
-*/
-QUrl QmlContext::resolvedUri(const QUrl &src)
-{
-    QmlContext *ctxt = this;
-    if (src.isRelative()) {
-        if (ctxt) {
-            while(ctxt) {
-                if (ctxt->d_func()->url.isValid())
-                    break;
-                else
-                    ctxt = ctxt->parentContext();
-            }
-
-            if (ctxt)
-                return ctxt->d_func()->engine->componentUrl(src, ctxt->d_func()->url);
-        }
-        return QUrl();
-    } else {
-        return ctxt->d_func()->engine->componentUrl(src, QUrl());
-    }
-}
-
-/*!
     Explicitly sets the url both resolveUri() and resolveUrl() will
     use for relative references to \a baseUrl.