summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-22 00:15:26 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-22 00:15:26 (GMT)
commit00cc8399c7cb2b68d8dbde7b4b33bac24d72a282 (patch)
treeb048333eb68d04e3a5128cbe51491eabb9cbbd29 /src/corelib
parentcb23151d3abfdbdf291abe8a1510592db2011927 (diff)
parent1e3ca798b54dbf99436fd47748b004ec1d176e29 (diff)
downloadQt-00cc8399c7cb2b68d8dbde7b4b33bac24d72a282.zip
Qt-00cc8399c7cb2b68d8dbde7b4b33bac24d72a282.tar.gz
Qt-00cc8399c7cb2b68d8dbde7b4b33bac24d72a282.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: Enable QTouchEvent for S60 5.0 Add missing license header. Fix build error on S60 3.1 environments QRuntimeGraphicsSystem Fix replacement functions in platform_paths.prf
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qglobal.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 31f8b85..1eab394 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2425,6 +2425,9 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
#if defined(Q_OS_SYMBIAN)
#ifdef SYMBIAN_BUILD_GCE
+#define Q_SYMBIAN_SUPPORTS_SURFACES
+//RWsPointerCursor is fixed, so don't use low performance sprites
+#define Q_SYMBIAN_FIXED_POINTER_CURSORS
#define Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE
#define Q_SYMBIAN_WINDOW_SIZE_CACHE
#define QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER