diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2014-11-14 08:08:32 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-12-13 08:42:12 +0100 |
| commit | 172cab1a74bc15f10dac5bda2d47a3523bcc237a (patch) | |
| tree | 9bc36a73905fe0c89344af10dc5cc103a23fceff /tests/auto/qml/qqmlvaluetypes | |
| parent | 450883d16b51b326e5d517de1517e14bf906df69 (diff) | |
Simplify QFont value type wrapper in preparation for gadgets
The value type wrapper for QFont tries to keep track whether pixel or point
sizes were set and warns the programmer accordingly if both were set. This is
implemented using separate boolean variables, but this can also be done using
QFont's resolve mask.
This move is motivated by the ability of the value type wrappers to operate
only on the type they wrap in the future, without requiring additional
helper variables.
Change-Id: Ia05093b5dcc950281ef89b2bb6fe96c18329cdfa
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Michael Brasser <michael.brasser@live.com>
Diffstat (limited to 'tests/auto/qml/qqmlvaluetypes')
| -rw-r--r-- | tests/auto/qml/qqmlvaluetypes/testtypes.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmlvaluetypes/testtypes.h b/tests/auto/qml/qqmlvaluetypes/testtypes.h index 559b14a015..715401e87d 100644 --- a/tests/auto/qml/qqmlvaluetypes/testtypes.h +++ b/tests/auto/qml/qqmlvaluetypes/testtypes.h @@ -100,7 +100,6 @@ public: m_font.setUnderline(true); m_font.setOverline(true); m_font.setStrikeOut(true); - m_font.setPointSize(29); m_font.setCapitalization(QFont::AllLowercase); m_font.setLetterSpacing(QFont::AbsoluteSpacing, 10.2); m_font.setWordSpacing(19.7); |