diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:17:54 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-04-11 14:17:54 +0200 |
| commit | 0e89ad543d2228c6c8eb9bc69f6ae8190b92db90 (patch) | |
| tree | e3b77b0eafaeca3b748033d82536b0d4dfc83423 | |
| parent | d4027540ef9e912b1fcf06fba25e6db0fcda561b (diff) | |
| parent | d25091bb8b52455e415f8147a9100094c489a041 (diff) | |
| download | qtxmlpatterns-0e89ad543d2228c6c8eb9bc69f6ae8190b92db90.tar.gz qtxmlpatterns-0e89ad543d2228c6c8eb9bc69f6ae8190b92db90.tar.bz2 qtxmlpatterns-0e89ad543d2228c6c8eb9bc69f6ae8190b92db90.zip | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I600107f9b564a5eddac5a1e9a346e3ae3d8bbd6e
| -rw-r--r-- | src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/qxmlquery/tst_qxmlquery.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h b/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h index ad042c6..9ef5a45 100644 --- a/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h +++ b/src/xmlpatterns/schema/qxsdstatemachine_tpl_p.h @@ -264,7 +264,7 @@ bool XsdStateMachine<TransitionType>::outputGraph(QIODevice *device, const QStri s << " " << it4.key() << " -> " << states.at(i) << " [label=\"ε\"]\n"; } - // draw node infos + // draw node info while (it3.hasNext()) { it3.next(); diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index 96a7e16..2cb79a6 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -2103,7 +2103,7 @@ void tst_QXmlQuery::fnDocNetworkAccessFailure_data() const QTest::newRow("data scheme, not-well-formed") << QUrl(QLatin1String("data:application/xml;base64,PGUvg===")); - QTest::newRow("file scheme, non-existant file") + QTest::newRow("file scheme, non-existent file") << QUrl(QLatin1String("file:///example.com/does/notExist.xml")); QTest::newRow("http scheme, file not found") |