summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@nokia.com>2011-11-26 18:55:41 (GMT)
committerSergio Ahumada <sergio.ahumada@nokia.com>2011-11-26 18:55:41 (GMT)
commita7e1ff2b3fc0b5d6cad039f3fe19e31b12089250 (patch)
treedd0742d8d8f1ac20b78a5142b81a78ad89158b5c /tools
parent58504ad5ec6c467f90a355b1ca9c1a474ad3bcdc (diff)
parent2b18e27c041f17bbc8989aa0ef5363df34edb8e6 (diff)
downloadQt-a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250.zip
Qt-a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250.tar.gz
Qt-a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250.tar.bz2
Merge remote-tracking branch 'qt-qa-review/master'
Diffstat (limited to 'tools')
-rw-r--r--tools/assistant/lib/qhelpsearchengine.cpp2
-rw-r--r--tools/linguist/lupdate/cpp.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/assistant/lib/qhelpsearchengine.cpp b/tools/assistant/lib/qhelpsearchengine.cpp
index c33fc96..65b1113 100644
--- a/tools/assistant/lib/qhelpsearchengine.cpp
+++ b/tools/assistant/lib/qhelpsearchengine.cpp
@@ -272,7 +272,7 @@ private:
functionality to set up a proper search queries list that get's passed to the search engines
search() function.
- After the list of querys has been passed to the search engine, the signal searchingStarted()
+ After the list of queries have been passed to the search engine, the signal searchingStarted()
is emitted and after the search has finished the searchingFinished() signal is emitted. The
search process can be stopped by calling cancelSearching().
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp
index c7dd9fc..5bafd9d 100644
--- a/tools/linguist/lupdate/cpp.cpp
+++ b/tools/linguist/lupdate/cpp.cpp
@@ -283,7 +283,7 @@ private:
bool findNamespaceCallback(const Namespace *ns, void *context) const;
const Namespace *findNamespace(const NamespaceList &namespaces, int nsCount = -1) const;
void enterNamespace(NamespaceList *namespaces, const HashString &name);
- void truncateNamespaces(NamespaceList *namespaces, int lenght);
+ void truncateNamespaces(NamespaceList *namespaces, int length);
Namespace *modifyNamespace(NamespaceList *namespaces, bool haveLast = true);
enum {