diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-11 05:08:52 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-01-11 05:08:52 (GMT) |
commit | 25eddc815fe87d04616edd9cc1d37253b1d43246 (patch) | |
tree | 91085e056c9e8a01eef10c46e7410a7aa304c0eb /tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp | |
parent | abfb755d7a8ff7f94d4dc59d37ac9934702254bd (diff) | |
parent | 7287f1f01e7000a21f52f463a459fa0285db4cca (diff) | |
download | Qt-25eddc815fe87d04616edd9cc1d37253b1d43246.zip Qt-25eddc815fe87d04616edd9cc1d37253b1d43246.tar.gz Qt-25eddc815fe87d04616edd9cc1d37253b1d43246.tar.bz2 |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp')
-rw-r--r-- | tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp b/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp index 96df0a5..66ecff6 100644 --- a/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp +++ b/tests/auto/declarative/qmlgraphicstextedit/tst_qmlgraphicstextedit.cpp @@ -173,6 +173,7 @@ void tst_qmlgraphicstextedit::text() actual.replace(QRegExp(".*<body[^>]*>"),""); actual.replace(QRegExp("(<[^>]*>)+"),"<>"); expected.replace(QRegExp("(<[^>]*>)+"),"<>"); + expected = "<> <> <> " + expected; QCOMPARE(actual.simplified(),expected.simplified()); } } |