diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-09 09:28:29 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-07-09 09:28:29 (GMT) |
| commit | 49e66883ee4e104f9713d8e1e1b34215760a6174 (patch) | |
| tree | d9e0358cc65d4a60bae835b2f7eac77710b0115e | |
| parent | e0a102ee171ddcebb1104d98d8a4ff4993e91c1d (diff) | |
| parent | 7787b548907add8b7c2ac642d161181070050ea4 (diff) | |
| download | Qt-49e66883ee4e104f9713d8e1e1b34215760a6174.zip Qt-49e66883ee4e104f9713d8e1e1b34215760a6174.tar.gz Qt-49e66883ee4e104f9713d8e1e1b34215760a6174.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
| -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; } |