diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 03:49:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 03:49:56 (GMT) |
| commit | 8e1327f1d5caee67203a21929b1d85fb92d59cec (patch) | |
| tree | 457886d0d114af8b160a66eaa1ee561518ee2784 /tests/auto | |
| parent | a8ff8e81f7b120e1ecdd434093be075cdd92fb24 (diff) | |
| parent | a49f2700c6b5c0f5851f9cfab38b5554e9530577 (diff) | |
| download | Qt-8e1327f1d5caee67203a21929b1d85fb92d59cec.zip Qt-8e1327f1d5caee67203a21929b1d85fb92d59cec.tar.gz Qt-8e1327f1d5caee67203a21929b1d85fb92d59cec.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QStyleSheet documentation: QMenu's tear-off is styled with ::tearoff
Fix QTextEngine overflow caused by extremely long text
Replace the SSE prologues by a macro
QDom: Do not crash on "<a:>text</a:>"
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qdom/tst_qdom.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qdom/tst_qdom.cpp b/tests/auto/qdom/tst_qdom.cpp index 0f6cdaa..8bf7620 100644 --- a/tests/auto/qdom/tst_qdom.cpp +++ b/tests/auto/qdom/tst_qdom.cpp @@ -1776,6 +1776,7 @@ void tst_QDom::crashInSetContent() const QDomImplementation::setInvalidDataPolicy(QDomImplementation::ReturnNullNode); QDomDocument docImport; + QCOMPARE(docImport.setContent(QLatin1String("<a:>text</a:>"), true), false); QVERIFY(docImport.setContent(QLatin1String("<?xml version=\"1.0\"?><e/>"))); } |