diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
| commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
| tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /tests/auto/xml | |
| parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'tests/auto/xml')
| -rw-r--r-- | tests/auto/xml/dom/qdom/tst_qdom.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro | 13 | ||||
| -rw-r--r-- | tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro | 1 |
3 files changed, 2 insertions, 14 deletions
diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp index d79044157a..1533e6a139 100644 --- a/tests/auto/xml/dom/qdom/tst_qdom.cpp +++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp @@ -1845,7 +1845,7 @@ void tst_QDom::checkIntOverflow() const QVERIFY(doc.setContent(xmlMessage)); const QDomNodeList nl(doc.elementsByTagName(QLatin1String("test"))); - QCOMPARE(nl.length(), uint(1)); + QCOMPARE(nl.length(), 1); } } diff --git a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro index 93167f81c8..f801200942 100644 --- a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro +++ b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.pro @@ -1,15 +1,4 @@ -###################################################################### -# Automatically generated by qmake (1.06a) Thu Jun 5 19:00:42 2003 -###################################################################### - -TEMPLATE = app -INCLUDEPATH += . +QT += xml -# Input HEADERS += parser.h SOURCES += main.cpp parser.cpp - -CONFIG += qt warn_on debug -QT += xml - - diff --git a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro index cec33ded18..dc579ab742 100644 --- a/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro +++ b/tests/auto/xml/sax/qxmlsimplereader/qxmlsimplereader.pro @@ -4,7 +4,6 @@ TEMPLATE = app DEPENDPATH += parser INCLUDEPATH += . parser -# Input HEADERS += parser/parser.h SOURCES += tst_qxmlsimplereader.cpp parser/parser.cpp |