Merge remote-tracking branch 'origin/stable' into dev

Change-Id: If9e2f5b518a9078488a7df537d306d495da4672a

examples/xmlpatterns/filetree/doc/src/filetree.qdoc

@@ -44,7 +44,7 @@
 
   \image filetree_1-example.png
 
-  \section2 The User Inteface
+  \section2 The User Interface
 
   The example is shown below. First, we use \c{File->Open Directory}
   (not shown) to select the \c{/filetree} directory. Then we use the

examples/xmlpatterns/schema/doc/src/schema.qdoc

@@ -114,7 +114,7 @@
 
   After the \l{QXmlSchema} {QXmlSchema} is instanciated and the message handler set
   on it, the \l{QXmlSchema::load()} {load()} method is called with the schema data as argument.
-  If the schema is invalid or a parsing error has occured, \l{QXmlSchema::isValid()} {isValid()}
+  If the schema is invalid or a parsing error has occurred, \l{QXmlSchema::isValid()} {isValid()}
   returns \c{false} and the error is flagged in \c{errorOccurred}.
   If the loading was successful, a \l{QXmlSchemaValidator} {QXmlSchemaValidator} is
   instanciated and the schema passed in the constructor.

tests/auto/xmlpatternssdk/TestSuiteHandler.cpp

@@ -273,7 +273,7 @@ bool TestSuiteHandler::endElement(const QString &namespaceURI,
     else if(localName == QLatin1String("title"))
     {
         /* A bit dangerous, the only element with name title in the vocabulary
-         * is the the child of GroupInfo */
+         * is the child of GroupInfo */
         m_container->setTitle(m_ch.simplified());
     }
     else if(localName == QLatin1String("test-group"))

tests/auto/xmlpatternssdk/XMLWriter.cpp

@@ -60,7 +60,7 @@
 
 /* Design rationalis, comments:
  *
- * - The class is called XMLWriter to harvest familarity by being consistent with
+ * - The class is called XMLWriter to harvest familiarity by being consistent with
  *   Java's XMLWriter class. If XMLWriter is moved to Qt, the name QXmlWriter is perhaps suitable.
  * - The class does not handle indentation because the "do one thing well"-principle is
  *   in use. XMLWriter should be fast and not assume a certain idea of indentation. Indentation