diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2012-03-05 18:19:20 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-20 12:35:18 +0100 |
| commit | dfdea38c843d1ee915e10ee72e6371ced7cd9bd0 (patch) | |
| tree | 18317f2fd1ac7e64979283f20dea69fc063563d5 /src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h | |
| parent | e20c3516945269a43d070809c08e9797c329306d (diff) | |
Decouple QSGDistanceFieldGlyphNode from it's cache manager.
To implement a custom distance field glyph node currently it's
necessary to also provide a duplicate implementation of
QSGContext::createDistanceFieldGlyphCache() as the default implemention
references the cache manager created by createGlyphNode(). By isolating
references to the cache manager to just createDistanceFieldGlyph() cache
it becomes possible to just overwrite createGlyphNode() and still use
the default cache.
Change-Id: I7261bdbf247966b55512d2671e2ee85239bcca05
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Diffstat (limited to 'src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h index 5dc461f30d..8b2654e078 100644 --- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h +++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -class QSGDistanceFieldTextMaterial: public QSGMaterial +class Q_QUICK_EXPORT QSGDistanceFieldTextMaterial: public QSGMaterial { public: QSGDistanceFieldTextMaterial(); @@ -82,7 +82,7 @@ protected: qreal m_fontScale; }; -class QSGDistanceFieldStyledTextMaterial : public QSGDistanceFieldTextMaterial +class Q_QUICK_EXPORT QSGDistanceFieldStyledTextMaterial : public QSGDistanceFieldTextMaterial { public: QSGDistanceFieldStyledTextMaterial(); @@ -99,7 +99,7 @@ protected: QColor m_styleColor; }; -class QSGDistanceFieldOutlineTextMaterial : public QSGDistanceFieldStyledTextMaterial +class Q_QUICK_EXPORT QSGDistanceFieldOutlineTextMaterial : public QSGDistanceFieldStyledTextMaterial { public: QSGDistanceFieldOutlineTextMaterial(); @@ -109,7 +109,7 @@ public: virtual QSGMaterialShader *createShader() const; }; -class QSGDistanceFieldShiftedStyleTextMaterial : public QSGDistanceFieldStyledTextMaterial +class Q_QUICK_EXPORT QSGDistanceFieldShiftedStyleTextMaterial : public QSGDistanceFieldStyledTextMaterial { public: QSGDistanceFieldShiftedStyleTextMaterial(); @@ -125,14 +125,14 @@ protected: QPointF m_shift; }; -class QSGHiQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial +class Q_QUICK_EXPORT QSGHiQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial { public: virtual QSGMaterialType *type() const; virtual QSGMaterialShader *createShader() const; }; -class QSGLoQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial +class Q_QUICK_EXPORT QSGLoQSubPixelDistanceFieldTextMaterial : public QSGDistanceFieldTextMaterial { public: virtual QSGMaterialType *type() const; |