diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-29 01:35:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-29 01:35:11 (GMT) |
| commit | 2a2d872a57d8cd913775af66f56a0250c157ee16 (patch) | |
| tree | 3ef0f5f9b2923c20c9bb87fa4540d179fb7dbb33 /src/corelib | |
| parent | b1072c19a7fe549a138dc6e8f51030e0352bbef4 (diff) | |
| parent | 63c46022ca82ee76e4abf60952cf1379f50333c0 (diff) | |
| download | Qt-2a2d872a57d8cd913775af66f56a0250c157ee16.zip Qt-2a2d872a57d8cd913775af66f56a0250c157ee16.tar.gz Qt-2a2d872a57d8cd913775af66f56a0250c157ee16.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:
Fix location of QtMultimedia def files
Freeze 4.7 def files on top of 4.6.3
Update def files for 4.6.3
Add runtime_graphics_system flag to QApplicationPrivate.
Add missign license headers.
Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
Make link on linux/symbian
Fix double slashes on few data caging paths
Fix for QRuntimePixmapData serial number setting.
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.h | 3 |
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 |