diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-05 15:31:08 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-06 10:11:04 +0200 |
| commit | af44559780765c7121a49c2e0764cf24e740312d (patch) | |
| tree | a4f2f50ddfe969f33a4d4accd392523c6809fd5a /src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h | |
| parent | 8784a4a46ea1357bde546c9a1c88bd060e863f30 (diff) | |
| parent | b30d7c9ee8fbc3a395c74b618f2ab176ae1e7f7e (diff) | |
Merge branch 'stable' into dev
Conflicts:
src/qml/debugger/qv8debugservice.cpp
src/qml/qml/v8/qv8engine.cpp
tests/auto/quick/qquickitem/qquickitem.pro
Change-Id: Ic4a1dcdd8b8a84155d2f2abefdf1da5c3a56af31
Diffstat (limited to 'src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h')
| -rw-r--r-- | src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h b/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h index 3ca5485be3..7587d948ad 100644 --- a/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h +++ b/src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h @@ -65,7 +65,7 @@ public: void requestGlyphs(const QSet<glyph_t> &glyphs); void referenceGlyphs(const QSet<glyph_t> &glyphs); - void storeGlyphs(const QHash<glyph_t, QImage> &glyphs); + void storeGlyphs(const QList<QDistanceField> &glyphs); void releaseGlyphs(const QSet<glyph_t> &glyphs); Q_SIGNALS: |