diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 08:13:27 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 08:13:27 (GMT) |
commit | 1876205f3054bec91f1ada89c8d8b1eef61193ab (patch) | |
tree | 0038d852f925a1af1695f4dbceee44f2991b5c5a | |
parent | 06e41bbae1b6ab7fa9ed4fdec1b0c8cc1817bf30 (diff) | |
parent | b118ea010442c50b4b0393847c5e7f66b17d10a8 (diff) | |
download | Qt-1876205f3054bec91f1ada89c8d8b1eef61193ab.zip Qt-1876205f3054bec91f1ada89c8d8b1eef61193ab.tar.gz Qt-1876205f3054bec91f1ada89c8d8b1eef61193ab.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Switch Symbian^3 QCursor implementation back to 5.0 way
-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 fcfeaf9..7825f82 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2410,8 +2410,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 |