1 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 806ede88e2..220e89a0c4 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -1324,6 +1324,11 @@ QFont::StyleHint QFont::styleHint() const
            looking font that contains the character. The NoFontMerging flag disables this feature.
            Please note that enabling this flag will not prevent Qt from automatically picking a
            suitable font when the selected font does not support the writing system of the text.
+    \value PreferNoShaping Sometimes, a font will apply complex rules to a set of characters in
+           order to display them correctly. In some writing systems, such as Brahmic scripts, this is
+           required in order for the text to be legible, but in e.g. Latin script, it is merely
+           a cosmetic feature. The PreferNoShaping flag will disable all such features when they
+           are not required, which will improve performance in most cases.
 
     Any of these may be OR-ed with one of these flags:
 
@@ -2844,7 +2849,7 @@ QFontEngine *QFontCache::findEngine(const Key &key)
                          end = engineCache.end();
     if (it == end) return 0;
 
-    Q_ASSERT(it.value().data != Q_NULLPTR);
+    Q_ASSERT(it.value().data != nullptr);
     Q_ASSERT(key.multi == (it.value().data->type() == QFontEngine::Multi));
 
     // found... update the hitcount and timestamp
@@ -2867,7 +2872,7 @@ void QFontCache::updateHitCountAndTimeStamp(Engine &value)
 
 void QFontCache::insertEngine(const Key &key, QFontEngine *engine, bool insertMulti)
 {
-    Q_ASSERT(engine != Q_NULLPTR);
+    Q_ASSERT(engine != nullptr);
     Q_ASSERT(key.multi == (engine->type() == QFontEngine::Multi));
 
 #ifdef QFONTCACHE_DEBUG