Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (59 commits)
  Doc: Cleaning style and adding support for Creator
  Add NTLMv2 authentication support to QAuthenticator.
  QIODPLB: Sync behavior of ungetBlock() and ungetChar()
  QFileIconProvider: Load icons on demand.
  Doc: fixing offline style
  Fix handling of SSL certificates with wildcard domain names
  Doc: fixing examples link
  doc: Fixed several qdoc warnings.
  doc: Fixed several qdoc warnings.
  SSL library loading: load system libs only once
  Revert "SSL backend: load libraries for certificates only once"
  doc: Fixed several qdoc warnings.
  doc: Fixed several qdoc warnings.
  doc: Fixed several qdoc warnings.
  doc: Fixed several qdoc warnings.
  doc: Fixed several qdoc warnings.
  Doc: Adding support for Qt Creator style
  doc: Fixed last of the declarative/QML qdoc warnings.
  qdoc: Marked some missing declarative properties and functions as \internal.
  qhelpgenerator: Fix namespace syntax checking.
  ...

1 files changed, 4 insertions, 2 deletions

diff --git a/tools/assistant/lib/qhelpprojectdata.cpp b/tools/assistant/lib/qhelpprojectdata.cpp
index b0faf0c..5247847 100644
--- a/tools/assistant/lib/qhelpprojectdata.cpp
+++ b/tools/assistant/lib/qhelpprojectdata.cpp
@@ -327,10 +327,12 @@ bool QHelpProjectDataPrivate::hasValidSyntax(const QString &nameSpace,
     QUrl url;
     const QLatin1String scheme("qthelp");
     url.setScheme(scheme);
-    url.setHost(nameSpace);
+    const QString canonicalNamespace = nameSpace.toLower();
+    url.setHost(canonicalNamespace);
     url.setPath(vFolder);
 
-    const QString expectedUrl(scheme + QLatin1String("://") + nameSpace + slash + vFolder);
+    const QString expectedUrl(scheme + QLatin1String("://")
+        + canonicalNamespace + slash + vFolder);
     return url.isValid() && url.toString() == expectedUrl;
 }