diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-31 06:45:31 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-31 06:45:31 (GMT) |
| commit | b6a0595e6479138b9d58c499f4285b357e81b2eb (patch) | |
| tree | 2e10e8a59ae55f75e44b67a310103a084e8d169f /src/openvg/qpixmapdata_vg.cpp | |
| parent | e178cf86ff5007d5af31181d064b1bf824ffbc33 (diff) | |
| parent | a795a55cf2796a44cf30e002962ebad0588ef740 (diff) | |
| download | Qt-b6a0595e6479138b9d58c499f4285b357e81b2eb.zip Qt-b6a0595e6479138b9d58c499f4285b357e81b2eb.tar.gz Qt-b6a0595e6479138b9d58c499f4285b357e81b2eb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/openvg/qpixmapdata_vg.cpp')
| -rw-r--r-- | src/openvg/qpixmapdata_vg.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/openvg/qpixmapdata_vg.cpp b/src/openvg/qpixmapdata_vg.cpp index 4cdbfdc..ab8f26d 100644 --- a/src/openvg/qpixmapdata_vg.cpp +++ b/src/openvg/qpixmapdata_vg.cpp @@ -45,8 +45,10 @@ #include "qvg_p.h" #include "qvgimagepool_p.h" +#if defined(Q_OS_SYMBIAN) #include <private/qt_s60_p.h> #include <fbs.h> +#endif #ifdef QT_SYMBIAN_SUPPORTS_SGIMAGE #include <sgresource/sgimage.h> typedef EGLImageKHR (*pfnEglCreateImageKHR)(EGLDisplay, EGLContext, EGLenum, EGLClientBuffer, EGLint*); |