diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 20:06:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 20:06:10 +0200 |
| commit | d570274da3ba262d85cf9a32de34678c85c1af9e (patch) | |
| tree | 8e67de1cc937e835d3507a38a415ac4aa579608b /tests/auto/qxmlquery/tst_qxmlquery.cpp | |
| parent | 14afeb8512bb4c4614256ebd227c06df2a1c8103 (diff) | |
| parent | 688b29fc5aeab0eafbb457a0fa6953856eeac928 (diff) | |
| download | qtxmlpatterns-d570274da3ba262d85cf9a32de34678c85c1af9e.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/xmlpatterns/tst_xmlpatterns.cpp
Change-Id: Ib93b62f45d796dd3ed2d5d03f602699295f62705
Diffstat (limited to 'tests/auto/qxmlquery/tst_qxmlquery.cpp')
| -rw-r--r-- | tests/auto/qxmlquery/tst_qxmlquery.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index 30a900f..5f78fc9 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -231,7 +231,7 @@ private: /** * One excluded, since we skip static-base-uri.xq. */ - ExpectedQueryCount = 29 + ExpectedQueryCount = 30 }; static void checkBaseURI(const QUrl &baseURI, const QString &candidate); |