diff options
author | David Boddie <dboddie@trolltech.com> | 2010-07-09 11:37:03 (GMT) |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-07-09 11:37:03 (GMT) |
commit | 17700d493527c2d7a25164e2540b9bb360338444 (patch) | |
tree | 1d49ce67b27817681e17a394461f74861656fe4d /tools/assistant/lib | |
parent | aba1572d588396d3c9e29192ae86047b5b10070a (diff) | |
parent | 3b2e680b5f56227af0716b3bc07b11cb7e044d78 (diff) | |
download | Qt-17700d493527c2d7a25164e2540b9bb360338444.zip Qt-17700d493527c2d7a25164e2540b9bb360338444.tar.gz Qt-17700d493527c2d7a25164e2540b9bb360338444.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools/assistant/lib')
-rw-r--r-- | tools/assistant/lib/qhelpprojectdata.cpp | 6 |
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; } |