diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-02 12:20:42 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-02 12:20:42 (GMT) |
| commit | 8abaeb826c5fdb5bb872b27b3f411e63d63a12ff (patch) | |
| tree | ca002b2327fbd8dd60220198c78173740a550550 /src/gui | |
| parent | ab29e9f1ab52901a5ed98055cf203817d2248dd2 (diff) | |
| parent | 43503e38d91c0e8375c2d5993de201419ba854ec (diff) | |
| download | Qt-8abaeb826c5fdb5bb872b27b3f411e63d63a12ff.zip Qt-8abaeb826c5fdb5bb872b27b3f411e63d63a12ff.tar.gz Qt-8abaeb826c5fdb5bb872b27b3f411e63d63a12ff.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/image/qvolatileimage.cpp | 5 | ||||
| -rw-r--r-- | src/gui/image/qvolatileimage_p.h | 1 | ||||
| -rw-r--r-- | src/gui/painting/qtextureglyphcache.cpp | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/image/qvolatileimage.cpp b/src/gui/image/qvolatileimage.cpp index 098e9a1..f5076e1 100644 --- a/src/gui/image/qvolatileimage.cpp +++ b/src/gui/image/qvolatileimage.cpp @@ -103,6 +103,11 @@ QVolatileImage &QVolatileImage::operator=(const QVolatileImage &rhs) return *this; } +bool QVolatileImage::paintingActive() const +{ + return d->pengine && d->pengine->isActive(); +} + bool QVolatileImage::isNull() const { return d->image.isNull(); diff --git a/src/gui/image/qvolatileimage_p.h b/src/gui/image/qvolatileimage_p.h index fc5d6b1..d835f45 100644 --- a/src/gui/image/qvolatileimage_p.h +++ b/src/gui/image/qvolatileimage_p.h @@ -71,6 +71,7 @@ public: ~QVolatileImage(); QVolatileImage &operator=(const QVolatileImage &rhs); + bool paintingActive() const; bool isNull() const; QImage::Format format() const; int width() const; diff --git a/src/gui/painting/qtextureglyphcache.cpp b/src/gui/painting/qtextureglyphcache.cpp index 53f025f..e9e56a2 100644 --- a/src/gui/painting/qtextureglyphcache.cpp +++ b/src/gui/painting/qtextureglyphcache.cpp @@ -296,7 +296,7 @@ void QTextureGlyphCache::fillInPendingGlyphs() QImage QTextureGlyphCache::textureMapForGlyph(glyph_t g, QFixed subPixelPosition) const { #if defined(Q_WS_X11) - if (m_transform.type() > QTransform::TxTranslate) { + if (m_transform.type() > QTransform::TxTranslate && m_current_fontengine->type() == QFontEngine::Freetype) { QFontEngineFT::GlyphFormat format = QFontEngineFT::Format_None; QImage::Format imageFormat = QImage::Format_Invalid; switch (m_type) { |