diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-04 10:57:00 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-04 10:57:00 (GMT) |
| commit | 8701b7eb49cc1e01fc00516b792894f262ff8cff (patch) | |
| tree | d9aacc573ee67553081d189cf202573ed1eb040e /src/gui | |
| parent | d2944ffaa8830628182d4e7c944c6cf4763bb115 (diff) | |
| download | Qt-8701b7eb49cc1e01fc00516b792894f262ff8cff.zip Qt-8701b7eb49cc1e01fc00516b792894f262ff8cff.tar.gz Qt-8701b7eb49cc1e01fc00516b792894f262ff8cff.tar.bz2 | |
Clean up diff for QStaticText
Revert some unnecessary changes from the QStaticText diff.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qpaintengineex.cpp | 1 | ||||
| -rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index 99f26a3..4f2fffa 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -44,7 +44,6 @@ #include "qstroker_p.h" #include "qbezier_p.h" #include <private/qpainterpath_p.h> -#include <private/qstatictext_p_p.h> #include <qvarlengtharray.h> #include <qdebug.h> diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index 5a6a0d9..7f32d19 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -320,13 +320,13 @@ void QImageTextureGlyphCache::fillTexture(const Coord &c, glyph_t g) #ifdef CACHE_DEBUG // QPainter p(&m_image); // p.drawLine( - /*QPoint base(c.x + glyphMargin(), c.y + glyphMargin() + c.baseLineY-1); + 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-%2-%3.png") .arg(m_current_textitem->font().family()) .arg(m_current_textitem->font().pointSize()) - .arg(m_transform.type()));*/ + .arg(m_transform.type())); #endif } |