diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-03-23 22:28:30 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-04-03 13:04:15 +0000 |
commit | b60b2c5fc5f015192e73f5471eb28ba83b99cc56 (patch) | |
tree | 87db8f0b3974090f6a5c421c1bda360185e6c192 | |
parent | d12d7d37618d3fa1da9d42681168195a042abc1f (diff) |
QTextBrowser: do not try to open file with empty filename
When loading a resource from a href link, the link is not necessarily
a local filename. In this case QTextBrowserPrivate::findFile() returns
an empty filename which will create a warning when trying to open it.
Task-number: QTBUG-43270
Change-Id: I39803afe3db9da0bfe2aaab86a5ebb6ed4b7c732
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
-rw-r--r-- | src/widgets/widgets/qtextbrowser.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index fa4dd14c92..b1cb556505 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -163,6 +163,9 @@ QString QTextBrowserPrivate::findFile(const QUrl &name) const fileName = name.toLocalFile(); } + if (fileName.isEmpty()) + return fileName; + if (QFileInfo(fileName).isAbsolute()) return fileName; @@ -1089,6 +1092,8 @@ QVariant QTextBrowser::loadResource(int /*type*/, const QUrl &name) QByteArray data; QString fileName = d->findFile(d->resolveUrl(name)); + if (fileName.isEmpty()) + return QVariant(); QFile f(fileName); if (f.open(QFile::ReadOnly)) { data = f.readAll(); |