diff options
| author | Jason Barron <jbarron@trolltech.com> | 2010-03-19 14:50:29 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2010-03-19 15:05:32 (GMT) |
| commit | 9842e2f79923d32b6240ce938560a6f3116fa9aa (patch) | |
| tree | e70b54216cdb6568340d8204e0364bc3e88294c0 /src/corelib | |
| parent | 681f54aabb89309b66ee4e5b229d7d1fd2e0e78d (diff) | |
| download | Qt-9842e2f79923d32b6240ce938560a6f3116fa9aa.zip Qt-9842e2f79923d32b6240ce938560a6f3116fa9aa.tar.gz Qt-9842e2f79923d32b6240ce938560a6f3116fa9aa.tar.bz2 | |
Change fromSymbianRSgImage() to use the newer version of RSgImage
Symbian have changed the implementation of RSgImage to be more
lightweight and have moved it to a new library. This patch changes Qt's
usage of RSgImage to the new version and fixes some minor code style
issues.
Reviewed-by: Aleksandar Sasha Babic
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 82210f3..fcfeaf9 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2414,12 +2414,15 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); #define Q_SYMBIAN_FIXED_POINTER_CURSORS #define Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE #define Q_SYMBIAN_WINDOW_SIZE_CACHE -//enabling new graphics resources -#define QT_SYMBIAN_SUPPORTS_SGIMAGE #define QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER +//enabling new graphics resources +#ifdef SYMBIAN_GRAPHICS_EGL_SGIMAGELITE +# define QT_SYMBIAN_SUPPORTS_SGIMAGE +#endif + #ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS -#define Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE +# define Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE #endif #endif |