diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-26 04:53:44 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-26 04:53:44 (GMT) |
| commit | 28c8fe7f248d5624cd84342a660a14dd62a525f8 (patch) | |
| tree | 29125f9fb432d86a27a4c39bee979caf4bb415fa /src/declarative/qml/qmlcomponent.cpp | |
| parent | 2ca0948d19c88df52b07c14b270c22dc623edcbe (diff) | |
| parent | 6467d58050ed7a865d0b69fa9f27c4a807e2c410 (diff) | |
| download | Qt-28c8fe7f248d5624cd84342a660a14dd62a525f8.zip Qt-28c8fe7f248d5624cd84342a660a14dd62a525f8.tar.gz Qt-28c8fe7f248d5624cd84342a660a14dd62a525f8.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlcomponent.cpp')
| -rw-r--r-- | src/declarative/qml/qmlcomponent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 9e1deb0..c844a32 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -355,7 +355,7 @@ void QmlComponent::loadUrl(const QUrl &url) d->clear(); - if (url.isRelative()) + if (url.isRelative() && !url.isEmpty()) d->url = d->engine->baseUrl().resolved(url); else d->url = url; |