From 8701b7eb49cc1e01fc00516b792894f262ff8cff Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 4 Feb 2010 11:57:00 +0100 Subject: Clean up diff for QStaticText Revert some unnecessary changes from the QStaticText diff. --- src/gui/painting/qpaintengineex.cpp | 1 - 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 -#include #include #include 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 } -- cgit v0.12