diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-08 00:00:10 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-08 00:00:10 (GMT) |
| commit | c3ac16c8604250628255bc549bee89c289733d0a (patch) | |
| tree | 2db69ffe7f0f02386d7b670b506179d2b6b9e009 /src/gui | |
| parent | ef2dc6d122a03a94da273cbbf09e8f7aec2b4f6e (diff) | |
| parent | 71f8955e0a2744bccff94495c4db5e054db8ab95 (diff) | |
| download | Qt-c3ac16c8604250628255bc549bee89c289733d0a.zip Qt-c3ac16c8604250628255bc549bee89c289733d0a.tar.gz Qt-c3ac16c8604250628255bc549bee89c289733d0a.tar.bz2 | |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index de59524..f3e5d22 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -445,7 +445,7 @@ void QImageTextureGlyphCache::fillTexture(const Coord &c, glyph_t g, QFixed subP QPoint base(c.x + glyphMargin(), c.y + glyphMargin() + c.baseLineY-1); if (m_image.rect().contains(base)) m_image.setPixel(base, 255); - m_image.save(QString::fromLatin1("cache-%1.png").arg(int(this))); + m_image.save(QString::fromLatin1("cache-%1.png").arg(qint64(this))); #endif } |