diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 07:13:04 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 07:13:04 (GMT) |
| commit | 7e7370acb32df2cf3f24d4d3bff8e72cbe662e16 (patch) | |
| tree | 2477018d23e8e7388c55522354b3ce791a11ca39 /src/openvg/qvg_p.h | |
| parent | 453498afa41a55351133e6d234d98b52b48b1388 (diff) | |
| parent | 2d23ed056fcc5276d322e3ac057baff4c3449406 (diff) | |
| download | Qt-7e7370acb32df2cf3f24d4d3bff8e72cbe662e16.zip Qt-7e7370acb32df2cf3f24d4d3bff8e72cbe662e16.tar.gz Qt-7e7370acb32df2cf3f24d4d3bff8e72cbe662e16.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Compile fix for OpenVG without VGFont.
Diffstat (limited to 'src/openvg/qvg_p.h')
| -rw-r--r-- | src/openvg/qvg_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/openvg/qvg_p.h b/src/openvg/qvg_p.h index 51abbee..94d1eae 100644 --- a/src/openvg/qvg_p.h +++ b/src/openvg/qvg_p.h @@ -55,6 +55,11 @@ // We mean it. // +// vgDrawGlyphs() only exists in OpenVG 1.1 and higher. +#if !defined(OPENVG_VERSION_1_1) && !defined(QVG_NO_DRAW_GLYPHS) +#define QVG_NO_DRAW_GLYPHS 1 +#endif + #include <QtGui/qimage.h> #if !defined(QT_NO_EGL) |