summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-03-09 07:13:52 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-03-09 07:13:52 (GMT)
commit42233381569dccd6fd23f2a112b9eac758093afa (patch)
treef912278252213c4ad210e01750a1c5122e75fef8 /tests/auto
parentfba8a431a9af215c54b04b5ab23c684621615a94 (diff)
downloadQt-42233381569dccd6fd23f2a112b9eac758093afa.zip
Qt-42233381569dccd6fd23f2a112b9eac758093afa.tar.gz
Qt-42233381569dccd6fd23f2a112b9eac758093afa.tar.bz2
Fix qdeclarativevaluetype::font() autotest
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp13
1 files changed, 11 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
index 51f9a07..eba83ce 100644
--- a/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
+++ b/tests/auto/declarative/qdeclarativevaluetypes/tst_qdeclarativevaluetypes.cpp
@@ -314,8 +314,17 @@ void tst_qdeclarativevaluetypes::font()
font.setLetterSpacing(QFont::AbsoluteSpacing, 9.7);
font.setWordSpacing(11.2);
- QEXPECT_FAIL("", "QT-2920", Continue);
- QCOMPARE(object->font(), font);
+ QFont f = object->font();
+ QCOMPARE(f.family(), font.family());
+ QCOMPARE(f.bold(), font.bold());
+ QCOMPARE(f.weight(), font.weight());
+ QCOMPARE(f.italic(), font.italic());
+ QCOMPARE(f.underline(), font.underline());
+ QCOMPARE(f.strikeOut(), font.strikeOut());
+ QCOMPARE(f.pointSize(), font.pointSize());
+ QCOMPARE(f.capitalization(), font.capitalization());
+ QCOMPARE(f.letterSpacing(), font.letterSpacing());
+ QCOMPARE(f.wordSpacing(), font.wordSpacing());
delete object;
}