diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-16 06:14:12 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-10-16 06:14:12 (GMT) |
| commit | c017a4dc6b5a81136b3654ca0ac75630cdf11675 (patch) | |
| tree | 5952b81c6ce003cee138fea45ecae86ac2d31b26 /src/declarative/qml | |
| parent | 5d261870c2c208027fd4fd90d66b2e734235ba3d (diff) | |
| parent | 5010c2e8b0e9e8d90d971377e87b5ac8a6820ed1 (diff) | |
| download | Qt-c017a4dc6b5a81136b3654ca0ac75630cdf11675.zip Qt-c017a4dc6b5a81136b3654ca0ac75630cdf11675.tar.gz Qt-c017a4dc6b5a81136b3654ca0ac75630cdf11675.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qmlcontext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp index 43a4741..31d4e1f 100644 --- a/src/declarative/qml/qmlcontext.cpp +++ b/src/declarative/qml/qmlcontext.cpp @@ -469,7 +469,7 @@ QUrl QmlContext::resolvedUrl(const QUrl &src) } /*! - Explicitly sets the url resolveUrl() will use for relative references to \a baseUrl. + Explicitly sets the url resolvedUrl() will use for relative references to \a baseUrl. Calling this function will override the url of the containing component used by default. |