diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:09:51 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:09:51 +0100 |
commit | d4027540ef9e912b1fcf06fba25e6db0fcda561b (patch) | |
tree | 3054c444f20477a8cd51c4ae466b01eca798bc1f | |
parent | 8b70ff848f0cf1fc1582b55505e06d32bd00bc07 (diff) | |
parent | e14e55a6d222346f3d4a27c310913ed0742c3e6b (diff) | |
download | qtxmlpatterns-d4027540ef9e912b1fcf06fba25e6db0fcda561b.tar.gz |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If9e2f5b518a9078488a7df537d306d495da4672a
-rw-r--r-- | examples/xmlpatterns/filetree/doc/src/filetree.qdoc | 2 | ||||
-rw-r--r-- | examples/xmlpatterns/schema/doc/src/schema.qdoc | 2 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/TestSuiteHandler.cpp | 2 | ||||
-rw-r--r-- | tests/auto/xmlpatternssdk/XMLWriter.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/examples/xmlpatterns/filetree/doc/src/filetree.qdoc b/examples/xmlpatterns/filetree/doc/src/filetree.qdoc index b1204b6..1093d56 100644 --- a/examples/xmlpatterns/filetree/doc/src/filetree.qdoc +++ b/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 diff --git a/examples/xmlpatterns/schema/doc/src/schema.qdoc b/examples/xmlpatterns/schema/doc/src/schema.qdoc index 1bcfc8a..b628bca 100644 --- a/examples/xmlpatterns/schema/doc/src/schema.qdoc +++ b/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. diff --git a/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp b/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp index 3a44b8b..3f9f66d 100644 --- a/tests/auto/xmlpatternssdk/TestSuiteHandler.cpp +++ b/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")) diff --git a/tests/auto/xmlpatternssdk/XMLWriter.cpp b/tests/auto/xmlpatternssdk/XMLWriter.cpp index 9b37614..d98010c 100644 --- a/tests/auto/xmlpatternssdk/XMLWriter.cpp +++ b/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 |