diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-21 06:15:04 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-21 06:15:04 (GMT) |
commit | 6c5d190923fb23e2f644e71ac2393c25619848c8 (patch) | |
tree | 78cf279084269f88dff58c4bc0ab33f2aa882866 /src/corelib | |
parent | 2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315 (diff) | |
parent | db87996d4ca90f8fffb5a8e012fa7f2336c038b0 (diff) | |
download | Qt-6c5d190923fb23e2f644e71ac2393c25619848c8.zip Qt-6c5d190923fb23e2f644e71ac2393c25619848c8.tar.gz Qt-6c5d190923fb23e2f644e71ac2393c25619848c8.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 8359637..b19599a 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2433,8 +2433,6 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); #if defined(Q_OS_SYMBIAN) #ifdef SYMBIAN_BUILD_GCE -//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 |