diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-07-05 02:16:10 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-07-05 02:16:10 (GMT) |
| commit | 325691bfdbf394c6a7c19ef2c3cb6db9140b3e01 (patch) | |
| tree | 40a1980a9202762e267a83ac2016072be55fec76 | |
| parent | dac42b0d66eda9a7101847ced61c118024ef9c6d (diff) | |
| download | Qt-325691bfdbf394c6a7c19ef2c3cb6db9140b3e01.zip Qt-325691bfdbf394c6a7c19ef2c3cb6db9140b3e01.tar.gz Qt-325691bfdbf394c6a7c19ef2c3cb6db9140b3e01.tar.bz2 | |
Work around QTBUG-11929
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index 9d3032c..5617ae9 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -448,7 +448,8 @@ void QDeclarativeComponent::loadUrl(const QUrl &url) d->clear(); - if (url.isRelative() && !url.isEmpty()) + if ((url.isRelative() && !url.isEmpty()) + || url.scheme() == QLatin1String("file")) // Workaround QTBUG-11929 d->url = d->engine->baseUrl().resolved(url); else d->url = url; |