summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-17 03:09:50 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-17 03:09:50 (GMT)
commit4a8dca8c43acb14b9299d182b70371b60b3ef991 (patch)
tree97e2356f9a790e87393a9a2a77f7d92fe4cca787 /tools
parent10b4dee4b0e196646e0bb4aab37dae6eaca8326e (diff)
parent6800937b550ee2eb61869bcee411e514ec10ebac (diff)
downloadQt-4a8dca8c43acb14b9299d182b70371b60b3ef991.zip
Qt-4a8dca8c43acb14b9299d182b70371b60b3ef991.tar.gz
Qt-4a8dca8c43acb14b9299d182b70371b60b3ef991.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix broken image loading on windows.
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/tools/assistant/helpviewer.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/assistant/tools/assistant/helpviewer.cpp b/tools/assistant/tools/assistant/helpviewer.cpp
index be6245a..f22ab8a 100644
--- a/tools/assistant/tools/assistant/helpviewer.cpp
+++ b/tools/assistant/tools/assistant/helpviewer.cpp
@@ -151,8 +151,9 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation /*op*/,
mimeType = QLatin1String("text/html");
}
- const QByteArray &ba = helpEngine->fileData(url);
- return new HelpNetworkReply(request, ba.isEmpty() ? " " : ba, mimeType);
+ const QByteArray &data = helpEngine->findFile(url).isValid()
+ ? helpEngine->fileData(url) : QByteArray("File not found!");
+ return new HelpNetworkReply(request, data, mimeType);
}
class HelpPage : public QWebPage