diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-21 09:23:52 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-21 14:21:54 +0000 |
| commit | 3ef2a63a9d39ce6fd121e74a7878310eb3056083 (patch) | |
| tree | 3b4dbd495fda31d38d6700ca8f921a3b9f9544dc /tests | |
| parent | 75e89f2454894c455241828cd290b5f553301d36 (diff) | |
tst_control: fix font tests
We cannot assume that TextField and TextArea have the same default font
than Control. This is no longer true for the Material style, which sets
specific fonts for the editor controls since 63ed622.
Change-Id: Ida26160b690fa0b4784c30f9e3b5a6211e9d743c
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/controls/data/tst_control.qml | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml index 115d1f81..5e795feb 100644 --- a/tests/auto/controls/data/tst_control.qml +++ b/tests/auto/controls/data/tst_control.qml @@ -339,20 +339,10 @@ TestCase { compare(control2.font.family, "Arial") compare(control2.item2_2.font.family, control2.font.family) - compare(control2.item2_2.font.pointSize, control2.font.pointSize) - compare(control2.item2_2.font.weight, control2.font.weight) compare(control2.item2_3.font.family, control2.font.family) - compare(control2.item2_3.font.pointSize, control2.font.pointSize) - compare(control2.item2_3.font.weight, control2.font.weight) compare(control2.item2_4.font.family, control2.font.family) - compare(control2.item2_4.font.pointSize, control2.font.pointSize) - compare(control2.item2_4.font.weight, control2.font.weight) compare(control2.item2_5.font.family, control2.font.family) - compare(control2.item2_5.font.pointSize, control2.font.pointSize) - compare(control2.item2_5.font.weight, control2.font.weight) compare(control2.item2_6.font.family, control2.font.family) - compare(control2.item2_6.font.pointSize, control2.font.pointSize) - compare(control2.item2_6.font.weight, control2.font.weight) control2.font.pointSize = 48 compare(control2.item2_2.font.pointSize, 48) @@ -496,20 +486,10 @@ TestCase { compare(control3.font.family, "Arial") compare(control3.item3_3.font.family, control3.font.family) - compare(control3.item3_3.font.pointSize, control3.font.pointSize) - compare(control3.item3_3.font.weight, control3.font.weight) compare(control3.item3_4.font.family, control3.font.family) - compare(control3.item3_4.font.pointSize, control3.font.pointSize) - compare(control3.item3_4.font.weight, control3.font.weight) compare(control3.item3_5.font.family, control3.font.family) - compare(control3.item3_5.font.pointSize, control3.font.pointSize) - compare(control3.item3_5.font.weight, control3.font.weight) compare(control3.item3_7.font.family, control3.font.family) - compare(control3.item3_7.font.pointSize, control3.font.pointSize) - compare(control3.item3_7.font.weight, control3.font.weight) compare(control3.item3_8.font.family, control3.font.family) - compare(control3.item3_8.font.pointSize, control3.font.pointSize) - compare(control3.item3_8.font.weight, control3.font.weight) control3.font.pointSize = 48 compare(control3.item3_3.font.pointSize, 48) |