aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-07-23 11:10:37 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-07-23 11:10:39 +0200
commitc3c943545eb7f084da314486524e8c9bb2fab431 (patch)
tree6add1fea19fdec25af587e2f38c788c391501b7a /src/quick/scenegraph
parentcf62652614676f58f9c45102a67a497c81805a36 (diff)
parente443c7ba5552e5c88c331b370cc7a338d8672494 (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/quick/scenegraph')
-rw-r--r--src/quick/scenegraph/util/qsgdistancefieldutil_p.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/quick/scenegraph/util/qsgdistancefieldutil_p.h b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h
index c9d4f3cb33..de3e778689 100644
--- a/src/quick/scenegraph/util/qsgdistancefieldutil_p.h
+++ b/src/quick/scenegraph/util/qsgdistancefieldutil_p.h
@@ -75,7 +75,6 @@ private:
QHash<QString, QSGDistanceFieldGlyphCache *> m_caches;
- QSGGlyphNode::AntialiasingMode m_defaultAntialiasingMode;
ThresholdFunc m_threshold_func;
AntialiasingSpreadFunc m_antialiasingSpread_func;
};