summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Brasser <mbrasser@ford.com>2020-10-21 13:03:12 -0500
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-10-23 14:31:29 +0000
commit00a757f3bb3b021b6d6ae2afa05a2224af25de52 (patch)
treed9b673160771e77649a572257e8b4c007176eed3
parent21fa917f99350465129bf4a3c78e8b3f734ac175 (diff)
Document how the font is used for extruded text
Change-Id: Ib18adc0809948092beaad6511bfddc68f22cc459 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 4ab96961366a8486deed675b27cfbe243ffa2363) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/extras/3dtext/qextrudedtextgeometry.cpp8
-rw-r--r--src/extras/3dtext/qextrudedtextmesh.cpp8
2 files changed, 16 insertions, 0 deletions
diff --git a/src/extras/3dtext/qextrudedtextgeometry.cpp b/src/extras/3dtext/qextrudedtextgeometry.cpp
index dd7f98269..b2612755c 100644
--- a/src/extras/3dtext/qextrudedtextgeometry.cpp
+++ b/src/extras/3dtext/qextrudedtextgeometry.cpp
@@ -225,6 +225,10 @@ void QExtrudedTextGeometryPrivate::init()
* \qmlproperty QFont ExtrudedTextGeometry::font
*
* Holds the font of the text.
+ *
+ * The geometry is normalized by the font's pointSize, so a larger pointSize
+ * will result in smoother, rather than larger, text. pixelSize should not
+ * be used.
*/
/*!
@@ -452,6 +456,10 @@ QString QExtrudedTextGeometry::text() const
* \property QExtrudedTextGeometry::font
*
* Holds the font of the text.
+ *
+ * The geometry is normalized by the font's pointSize, so a larger pointSize
+ * will result in smoother, rather than larger, text. pixelSize should not
+ * be used.
*/
QFont QExtrudedTextGeometry::font() const
{
diff --git a/src/extras/3dtext/qextrudedtextmesh.cpp b/src/extras/3dtext/qextrudedtextmesh.cpp
index 594d0e511..fc93726d2 100644
--- a/src/extras/3dtext/qextrudedtextmesh.cpp
+++ b/src/extras/3dtext/qextrudedtextmesh.cpp
@@ -74,6 +74,10 @@ namespace Qt3DExtras {
* \qmlproperty QFont Qt3DExtras::ExtrudedTextMesh::font
*
* Holds the font of the text.
+
+ * The mesh geometry is normalized by the font's pointSize, so a larger pointSize
+ * will result in smoother, rather than larger, text. pixelSize should not
+ * be used.
*/
/*!
@@ -140,6 +144,10 @@ QString QExtrudedTextMesh::text() const
* \property QExtrudedTextMesh::font
*
* Holds the font of the text.
+ *
+ * The mesh geometry is normalized by the font's pointSize, so a larger pointSize
+ * will result in smoother, rather than larger, text. pixelSize should not
+ * be used.
*/
QFont QExtrudedTextMesh::font() const
{