summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-24 16:05:32 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-24 16:05:32 (GMT)
commit184398f4ada4b34fc9834c2341597a3b8c18e842 (patch)
tree476b9b43b9cb12b0817d940c224dbb06a3c849f1 /src/corelib/global
parent373d8a06c21fb3d237d1f2c7be604e1bcf7e42fa (diff)
parentd7cf3e40e491a92212ee57b88541d14bd79c4f4f (diff)
downloadQt-184398f4ada4b34fc9834c2341597a3b8c18e842.zip
Qt-184398f4ada4b34fc9834c2341597a3b8c18e842.tar.gz
Qt-184398f4ada4b34fc9834c2341597a3b8c18e842.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qglobal.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index d849349..67ccf4d 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2486,9 +2486,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