diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-28 12:16:17 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-11-28 12:16:17 +0000 |
| commit | 4e1463c20aa6ec52f23e1e5f6426b68edb2255f0 (patch) | |
| tree | df3d8f65f0c8df1990c48931c4c0b5063ff6f8c6 /src/quick/items/qquicktextnode.cpp | |
| parent | ea9d6955f4c1c1141d0909ddb32abb59c032ac3c (diff) | |
| parent | 9044800083ccffe4d0b732f8b3b60512f32d8f8a (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into 5.8" into refs/staging/5.8
Diffstat (limited to 'src/quick/items/qquicktextnode.cpp')
| -rw-r--r-- | src/quick/items/qquicktextnode.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/quick/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp index 6cfc1d0313..e6ac9b603e 100644 --- a/src/quick/items/qquicktextnode.cpp +++ b/src/quick/items/qquicktextnode.cpp @@ -99,10 +99,12 @@ QSGGlyphNode *QQuickTextNode::addGlyphs(const QPointF &position, const QGlyphRun bool preferNativeGlyphNode = m_useNativeRenderer; if (!preferNativeGlyphNode) { QRawFontPrivate *fontPriv = QRawFontPrivate::get(font); - if (fontPriv->fontEngine->hasUnreliableGlyphOutline()) + if (fontPriv->fontEngine->hasUnreliableGlyphOutline()) { preferNativeGlyphNode = true; - else - preferNativeGlyphNode = !QFontDatabase().isSmoothlyScalable(font.familyName(), font.styleName()); + } else { + QFontEngine *fe = QRawFontPrivate::get(font)->fontEngine; + preferNativeGlyphNode = !fe->isSmoothlyScalable; + } } QSGGlyphNode *node = sg->sceneGraphContext()->createGlyphNode(sg, preferNativeGlyphNode); |