diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 22:17:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-25 22:17:14 (GMT) |
| commit | 2dd38c17741536c85ed24536addcee8a7b12fe50 (patch) | |
| tree | 3584a65ca917327fbab66bb096f4b1b7de354188 | |
| parent | 039b057b95db7687867904e1a9a5046a8e3b3fc0 (diff) | |
| parent | 7c36400a998b6d4cff34d7cb783f8e228a3e3621 (diff) | |
| download | Qt-2dd38c17741536c85ed24536addcee8a7b12fe50.zip Qt-2dd38c17741536c85ed24536addcee8a7b12fe50.tar.gz Qt-2dd38c17741536c85ed24536addcee8a7b12fe50.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix OpenVG build on non-Symbian platforms.
| -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 d602790..7efec2b 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*); |