diff options
| author | Lorn Potter <lorn.potter@nokia.com> | 2011-01-11 02:49:03 (GMT) |
|---|---|---|
| committer | Lorn Potter <lorn.potter@nokia.com> | 2011-01-11 02:49:03 (GMT) |
| commit | ad9a13225a92dbc90767f38f6eaa89808adde1c1 (patch) | |
| tree | 99006bea4e4f220bee08cb1d289570b265643b7b | |
| parent | 6e515810ad0ad31b4538b44a2c5e865e537f2c50 (diff) | |
| parent | 65f138ac6b8472ace226e769062f6aa92ebf9480 (diff) | |
| download | Qt-ad9a13225a92dbc90767f38f6eaa89808adde1c1.zip Qt-ad9a13225a92dbc90767f38f6eaa89808adde1c1.tar.gz Qt-ad9a13225a92dbc90767f38f6eaa89808adde1c1.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
| -rw-r--r-- | tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp index 507d5b9..997cd68 100644 --- a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp +++ b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp @@ -208,10 +208,10 @@ void tst_QTextOdfWriter::testWriteStyle2() QString xml = QString::fromLatin1( "<style:style style:name=\"p1\" style:family=\"paragraph\">" "<style:paragraph-properties>" - "<style:style-tab-stops>" - "<style:style-tab-stop style:position=\"30pt\" style:type=\"right\"/>" - "<style:style-tab-stop style:position=\"60pt\" style:type=\"char\" style:char=\"o\"/>" - "</style:style-tab-stops>" + "<style:tab-stops>" + "<style:tab-stop style:position=\"30pt\" style:type=\"right\"/>" + "<style:tab-stop style:position=\"60pt\" style:type=\"char\" style:char=\"o\"/>" + "</style:tab-stops>" "</style:paragraph-properties>" "</style:style>"); QCOMPARE(getContentFromXml(), xml); |