diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-23 21:12:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-23 21:12:28 (GMT) |
| commit | 59a1d76d4a1648d747c8cfb9396128ded81c03ed (patch) | |
| tree | b633d03a9c59533fc925d05d45088994d734ed72 /src/corelib | |
| parent | bf4ee2192f59d65423f5157c62c7344165fd3088 (diff) | |
| parent | 03ced5675e7acd15c80c860185f1daae177d2290 (diff) | |
| download | Qt-59a1d76d4a1648d747c8cfb9396128ded81c03ed.zip Qt-59a1d76d4a1648d747c8cfb9396128ded81c03ed.tar.gz Qt-59a1d76d4a1648d747c8cfb9396128ded81c03ed.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index c2fb16c..fcee35d 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2446,9 +2446,14 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); # define QT_SYMBIAN_SUPPORTS_SGIMAGE #endif -#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS +#ifdef SYMBIAN_GRAPHICS_SET_SURFACE_TRANSPARENCY_AVAILABLE # define Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE #endif + +#ifdef SYMBIAN_GRAPHICS_TRANSITION_EFFECTS_SIGNALING_AVAILABLE +# define Q_SYMBIAN_TRANSITION_EFFECTS +#endif + #endif //Symbian does not support data imports from a DLL |