diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index 032a8b78126..4d1243ccc51 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -159,6 +159,7 @@ public: || ucs4 == QChar::LineFeed || ucs4 == QChar::CarriageReturn || ucs4 == QChar::ParagraphSeparator + || (!disableEmojiSegmenter() && (ucs4 & 0xFFF0) == 0xFE00) || QChar::category(ucs4) == QChar::Other_Control; } diff --git a/tests/baseline/painting/scripts/glyphruns.qps b/tests/baseline/painting/scripts/glyphruns.qps index 2b70c72610f..0683ef59ed1 100644 --- a/tests/baseline/painting/scripts/glyphruns.qps +++ b/tests/baseline/painting/scripts/glyphruns.qps @@ -143,7 +143,7 @@ translate 150 0 save setPen black setFont "sansserif" 16 normal - drawGlyphRun 0 40 "e😃m😇o😍j😜i😸!" + drawGlyphRun 0 40 "e😃m👩️‍⚕️o😍j😜i😸!" restore translate 0 55