diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-29 06:05:51 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-29 06:05:51 (GMT) |
| commit | 1517c4fb9199d32c69378808a27f83d2edf065b2 (patch) | |
| tree | ad881c8e12bc9e9f245817ab33ea7a2b6ab29df7 /src/declarative | |
| parent | b3ab6e1c39870640f825c453cba082960fe940c5 (diff) | |
| download | Qt-1517c4fb9199d32c69378808a27f83d2edf065b2.zip Qt-1517c4fb9199d32c69378808a27f83d2edf065b2.tar.gz Qt-1517c4fb9199d32c69378808a27f83d2edf065b2.tar.bz2 | |
Ensure filenames are correctly resolved
Works around QUrl("file:a").isRelative() being false.
Reviewed-by: Aaron Kennedy
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index b83e9f4..a80f183 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -421,7 +421,7 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeEngine *engine, const Q { Q_D(QDeclarativeComponent); d->engine = engine; - loadUrl(QUrl::fromLocalFile(fileName)); + loadUrl(d->engine->baseUrl().resolved(QUrl::fromLocalFile(fileName))); } /*! |