diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2017-01-30 20:09:23 +0100 |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2017-01-31 08:22:14 +0000 |
commit | 659d5202f915b84bd22b618b0696bbe68ab4b6b0 (patch) | |
tree | 26c466ae5187f770d8a80c66c6ceaf4b57127097 /tests/auto/quick/qquicktext/tst_qquicktext.cpp | |
parent | 9500615569df7e3b68e42a979272747353dd9b7f (diff) |
Add fontInfo property to Text
This provides a way to determine which font will actually be
used to presenting the text, which can be especially useful when
not using a fixed size font (the font info will then expose the
actual font size used by the Text element.)
[ChangeLog][QtQuick][Text] Added fontInfo property to Text type,
providing a way to query properties of the actual font used
for presenting the text.
Task-number: QTBUG-51133
Change-Id: I5860fb1bd25ac5734713f49c8482428f2d531d22
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Diffstat (limited to 'tests/auto/quick/qquicktext/tst_qquicktext.cpp')
-rw-r--r-- | tests/auto/quick/qquicktext/tst_qquicktext.cpp | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/tests/auto/quick/qquicktext/tst_qquicktext.cpp b/tests/auto/quick/qquicktext/tst_qquicktext.cpp index 034ea4aec8..f741062d42 100644 --- a/tests/auto/quick/qquicktext/tst_qquicktext.cpp +++ b/tests/auto/quick/qquicktext/tst_qquicktext.cpp @@ -154,6 +154,8 @@ private slots: void hAlignWidthDependsOnImplicitWidth_data(); void hAlignWidthDependsOnImplicitWidth(); + void fontInfo(); + private: QStringList standard; QStringList richText; @@ -4253,6 +4255,23 @@ void tst_qquicktext::hAlignWidthDependsOnImplicitWidth() QCOMPARE(numberOfNonWhitePixels(0, rectX - 1, image), 0); } +void tst_qquicktext::fontInfo() +{ + QQmlComponent component(&engine, testFile("fontInfo.qml")); + + QScopedPointer<QObject> object(component.create()); + QObject *root = object.data(); + + QQuickText *main = root->findChild<QQuickText *>("main"); + QVERIFY(main); + QCOMPARE(main->font().pixelSize(), 1000); + + QQuickText *copy = root->findChild<QQuickText *>("copy"); + QVERIFY(copy); + QCOMPARE(copy->font().family(), QFontInfo(QFont()).family()); + QVERIFY(copy->font().pixelSize() < 1000); +} + QTEST_MAIN(tst_qquicktext) #include "tst_qquicktext.moc" |