diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-19 18:45:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-19 18:45:11 (GMT) |
| commit | 91db91cc7d91f767c2cba340d930b72d69a968b8 (patch) | |
| tree | 3a2a4b32b6b8c077f58f1dbc66b60cb66688c2c3 /tools/assistant | |
| parent | 2c86259f7422531c234faac1d1abbde603228195 (diff) | |
| parent | beab6d886504c011af9b973d1d0a81ce8e700e30 (diff) | |
| download | Qt-91db91cc7d91f767c2cba340d930b72d69a968b8.zip Qt-91db91cc7d91f767c2cba340d930b72d69a968b8.tar.gz Qt-91db91cc7d91f767c2cba340d930b72d69a968b8.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:
Return some fake data if we can't handle the network request.
Diffstat (limited to 'tools/assistant')
| -rw-r--r-- | tools/assistant/tools/assistant/helpviewer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/assistant/tools/assistant/helpviewer.cpp b/tools/assistant/tools/assistant/helpviewer.cpp index a9abda5..1900c7e 100644 --- a/tools/assistant/tools/assistant/helpviewer.cpp +++ b/tools/assistant/tools/assistant/helpviewer.cpp @@ -151,7 +151,8 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation /*op*/, mimeType = QLatin1String("text/html"); } - return new HelpNetworkReply(request, helpEngine->fileData(url), mimeType); + const QByteArray &ba = helpEngine->fileData(url); + return new HelpNetworkReply(request, ba.isEmpty() ? " " : ba, mimeType); } class HelpPage : public QWebPage |