diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-07-14 05:15:03 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-07-14 05:15:03 (GMT) |
| commit | 023fdd3116aa0cba5687c66eda9d3f17e1a731ba (patch) | |
| tree | 9944936c137cb1f6ac4bafeaef3ec928e286b567 /src/declarative/util | |
| parent | dec30a957ed84d25a06a4c83a972fb02f7ec4fa5 (diff) | |
| parent | 799380ea82ced8cc5eb4eed5b1306748125331fa (diff) | |
| download | Qt-023fdd3116aa0cba5687c66eda9d3f17e1a731ba.zip Qt-023fdd3116aa0cba5687c66eda9d3f17e1a731ba.tar.gz Qt-023fdd3116aa0cba5687c66eda9d3f17e1a731ba.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qmlscript.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/declarative/util/qmlscript.cpp b/src/declarative/util/qmlscript.cpp index 07cc1d5..8d03804 100644 --- a/src/declarative/util/qmlscript.cpp +++ b/src/declarative/util/qmlscript.cpp @@ -148,9 +148,8 @@ void QmlScript::setSource(const QUrl &source) Q_D(QmlScript); if (d->url == source) return; - d->url = source; - Q_ASSERT(!source.isRelative()); - + d->url = qmlContext(this)->resolvedUrl(source); + #ifndef QT_NO_LOCALFILE_OPTIMIZED_QML if (d->url.scheme() == QLatin1String("file")) { QFile file(d->url.toLocalFile()); |