bfb80b7b45
This amends cb2633468413d8c2a9e28d4c4a10b25e90dd3116. The patch excluded the ad hoc parsing of variation selector except when Qt was built without the emoji segmenter. The reasoning being that the emoji parsing handles this correctly now. However, when setting the QT_DISABLE_EMOJI_SEGMENTER variable in the environment, this is supposed to work as a fail safe which gives you the original behavior, in case there are regressions. Therefore, the variation selector handling needs to be run also when this environment variable is set. Change-Id: I2669d29016a552775461aad13e50459baecdc26f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit aaf7437db3a520ab14220a46cf9427cb9a8d915c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>