From 325691bfdbf394c6a7c19ef2c3cb6db9140b3e01 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Mon, 5 Jul 2010 12:16:10 +1000 Subject: Work around QTBUG-11929 --- src/declarative/qml/qdeclarativecomponent.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; -- cgit v0.12