summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-05-14 17:04:45 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-05-20 14:41:10 (GMT)
commit1ae65ed7207711dc69bfa11fc184a8c2975eea9f (patch)
treed5f449ca53f01fd2de4fd6acc929dc525c20e8d0 /src
parent594b066246713e95bb27af765fdaca46e1d02d0c (diff)
downloadQt-1ae65ed7207711dc69bfa11fc184a8c2975eea9f.zip
Qt-1ae65ed7207711dc69bfa11fc184a8c2975eea9f.tar.gz
Qt-1ae65ed7207711dc69bfa11fc184a8c2975eea9f.tar.bz2
Allow QTextDocument to resolve URLs to the current working dir.
Diffstat (limited to 'src')
-rw-r--r--src/gui/text/qtextdocument.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index c7a9756..6132d10 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -1970,6 +1970,8 @@ QVariant QTextDocument::loadResource(int type, const QUrl &name)
if (fi.exists()) {
resourceUrl =
QUrl::fromLocalFile(fi.absolutePath() + QDir::separator()).resolved(name);
+ } else if (currentURL.isEmpty()) {
+ resourceUrl.setScheme(QLatin1String("file"));
}
}