diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-18 13:07:22 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-09-21 11:16:28 +0200 |
commit | 02b4770c3d867bf0b562db63015a7137479db10a (patch) | |
tree | 57157d0101a295fd394bf9acc91dd216fb361264 /src/quick/items/qquicktextnode.cpp | |
parent | 858c62583ff776edb8c9e539f0331f5d658de2d1 (diff) | |
parent | 345226aa3ecee8642c3bf46e40c981d4a49d958e (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/qml/qml/qqmltypeloader.cpp
Change-Id: I07647700fc86764c95a5ef95c568e700a70fe45f
Diffstat (limited to 'src/quick/items/qquicktextnode.cpp')
-rw-r--r-- | src/quick/items/qquicktextnode.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextnode.cpp b/src/quick/items/qquicktextnode.cpp index 0e9d1e3951..8716f98bff 100644 --- a/src/quick/items/qquicktextnode.cpp +++ b/src/quick/items/qquicktextnode.cpp @@ -160,10 +160,18 @@ void QQuickTextNode::addImage(const QRectF &rect, const QImage &image) QSGRenderContext *sg = QQuickItemPrivate::get(m_ownerElement)->sceneGraphRenderContext(); QSGInternalImageNode *node = sg->sceneGraphContext()->createInternalImageNode(); QSGTexture *texture = sg->createTexture(image); + if (m_ownerElement->smooth()) { + texture->setFiltering(QSGTexture::Linear); + texture->setMipmapFiltering(QSGTexture::Linear); + } m_textures.append(texture); node->setTargetRect(rect); node->setInnerTargetRect(rect); node->setTexture(texture); + if (m_ownerElement->smooth()) { + node->setFiltering(QSGTexture::Linear); + node->setMipmapFiltering(QSGTexture::Linear); + } appendChildNode(node); node->update(); } |