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:
  Assistant docs: Fix link.
  QtHelp docs: Fix illegal namespace name.
  Assistant: Set correct mime type for text documents.

1 files changed, 4 insertions, 4 deletions

diff --git a/tools/assistant/tools/assistant/helpviewer.cpp b/tools/assistant/tools/assistant/helpviewer.cpp
index 1900c7e..be6245a 100644
--- a/tools/assistant/tools/assistant/helpviewer.cpp
+++ b/tools/assistant/tools/assistant/helpviewer.cpp
@@ -141,12 +141,12 @@ QNetworkReply *HelpNetworkAccessManager::createRequest(Operation /*op*/,
     if (mimeType.endsWith(QLatin1String(".svg"))
         || mimeType.endsWith(QLatin1String(".svgz"))) {
             mimeType = QLatin1String("image/svg+xml");
-    }
-    else if (mimeType.endsWith(QLatin1String(".css"))) {
+    } else if (mimeType.endsWith(QLatin1String(".css"))) {
         mimeType = QLatin1String("text/css");
-    }
-    else if (mimeType.endsWith(QLatin1String(".js"))) {
+    } else if (mimeType.endsWith(QLatin1String(".js"))) {
         mimeType = QLatin1String("text/javascript");
+    } else if (mimeType.endsWith(QLatin1String(".txt"))) {
+        mimeType = QLatin1String("text/plain");
     } else {
         mimeType = QLatin1String("text/html");
     }