summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorck <qt-info@nokia.com>2010-07-09 09:16:28 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-07-16 07:24:36 (GMT)
commit9fd83d455fa250d9a7901bd8d23a93abdc1cb283 (patch)
tree8e25f88765a37d8860edc9ed7b03a17e692d947f
parentda11546e7ec502670e1dda499a68fcc80272b9f6 (diff)
downloadQt-9fd83d455fa250d9a7901bd8d23a93abdc1cb283.zip
Qt-9fd83d455fa250d9a7901bd8d23a93abdc1cb283.tar.gz
Qt-9fd83d455fa250d9a7901bd8d23a93abdc1cb283.tar.bz2
qhelpgenerator: Fix namespace syntax checking.
(cherry picked from commit 7787b548907add8b7c2ac642d161181070050ea4)
-rw-r--r--tools/assistant/lib/qhelpprojectdata.cpp6
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;
}