diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-14 22:22:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-14 22:22:22 (GMT) |
| commit | a0bcfa560dbc0ad98f8eeb821fe4dd84da207985 (patch) | |
| tree | 428400363aacd079e0a47067f6ec73100a97df46 | |
| parent | f0915d4a19f30b3ec0e0ee1c538e11be6b43a7b3 (diff) | |
| parent | df77be2a58a36c756592465616beaaeed06d134b (diff) | |
| download | Qt-a0bcfa560dbc0ad98f8eeb821fe4dd84da207985.zip Qt-a0bcfa560dbc0ad98f8eeb821fe4dd84da207985.tar.gz Qt-a0bcfa560dbc0ad98f8eeb821fe4dd84da207985.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix compilation of OpenVG paint engine with OpenVG 1.0
| -rw-r--r-- | src/openvg/qpaintengine_vg.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp index 2c850c9..4902cbd 100644 --- a/src/openvg/qpaintengine_vg.cpp +++ b/src/openvg/qpaintengine_vg.cpp @@ -3307,6 +3307,7 @@ void QVGPaintEngine::drawStaticTextItem(QStaticTextItem *textItem) bool QVGPaintEngine::drawCachedGlyphs(int numGlyphs, const glyph_t *glyphs, const QFont &font, QFontEngine *fontEngine, const QPointF &p) { +#if !defined(QVG_NO_DRAW_GLYPHS) Q_D(QVGPaintEngine); // Find the glyph cache for this font. @@ -3361,6 +3362,14 @@ void QVGPaintEngine::drawStaticTextItem(QStaticTextItem *textItem) NULL, NULL, VG_FILL_PATH, VG_TRUE); return true; +#else + Q_UNUSED(numGlyphs); + Q_UNUSED(glyphs); + Q_UNUSED(font); + Q_UNUSED(fontEngine); + Q_UNUSED(p); + return false; +#endif } void QVGPaintEngine::setState(QPainterState *s) |