diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-17 11:14:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-17 11:14:28 (GMT) |
| commit | 17a0a50a101fc9863d0dffd0dcb887ba68a99622 (patch) | |
| tree | 941d14d5f9700da679e452f475b9210c91599a25 | |
| parent | 6668daf723ababe68f882b730bd8c2b6eaa77769 (diff) | |
| parent | 4a8dca8c43acb14b9299d182b70371b60b3ef991 (diff) | |
| download | Qt-17a0a50a101fc9863d0dffd0dcb887ba68a99622.zip Qt-17a0a50a101fc9863d0dffd0dcb887ba68a99622.tar.gz Qt-17a0a50a101fc9863d0dffd0dcb887ba68a99622.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.
| -rw-r--r-- | tools/assistant/tools/assistant/helpviewer.cpp | 5 |
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 |