diff options
| author | mread <qt-info@nokia.com> | 2010-09-23 08:25:13 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2010-09-30 14:48:30 (GMT) |
| commit | e3d99d5147e42a5ab1760291061275febdf329c7 (patch) | |
| tree | 4fe3fa57ef8f345ca8b565fa9e0259706b95a6a3 /src/corelib/global | |
| parent | 40b413ca994fd26404672cefa71dc36fd2626b67 (diff) | |
| download | Qt-e3d99d5147e42a5ab1760291061275febdf329c7.zip Qt-e3d99d5147e42a5ab1760291061275febdf329c7.tar.gz Qt-e3d99d5147e42a5ab1760291061275febdf329c7.tar.bz2 | |
new allocator tidy up and winscw freeze
renamed headers
diabaled new allocator for winscw builds, and froze the heap creation
export
Task-number: QT-3967
Reviewed-by: Shane Kearns
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 45ca28e..3c177ae 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2451,7 +2451,7 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); #endif #endif -#ifndef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS +#if !defined(SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS) && !defined(__WINSCW__) //Enable the (backported) new allocator. When it is available in OS, //this flag should be disabled for that OS version onward #define QT_USE_NEW_SYMBIAN_ALLOCATOR |