diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2009-09-18 12:54:44 (GMT) |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2009-09-18 12:54:44 (GMT) |
| commit | 0e7e62eb6afbc1f20d08b837643009cec8eaacb9 (patch) | |
| tree | 1eb5f9fb0194b8a9ffa1d9ab961a0ac68db7508a /src/corelib/global/qglobal.h | |
| parent | b88bcd68a62ab8ed348bc698f7342346963bb7c0 (diff) | |
| parent | 421e02d7b48b4a852a4aa1e6feb781a64f0981b4 (diff) | |
| download | Qt-0e7e62eb6afbc1f20d08b837643009cec8eaacb9.zip Qt-0e7e62eb6afbc1f20d08b837643009cec8eaacb9.tar.gz Qt-0e7e62eb6afbc1f20d08b837643009cec8eaacb9.tar.bz2 | |
Merge commit 'origin/4.6' into kinetic-declarativeui
Conflicts:
configure.exe
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 082dca8..182b050 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -820,7 +820,6 @@ namespace QT_NAMESPACE {} # define Q_WS_WIN #endif - QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -2397,8 +2396,12 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf(); #ifdef SYMBIAN_GRAPHICS_USE_GCE //RWsPointerCursor is fixed, so don't use low performance sprites #define Q_SYMBIAN_FIXED_POINTER_CURSORS +#define Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE +//enabling new graphics resources +#define QT_SYMBIAN_SUPPORTS_SGIMAGE #endif + //Symbian does not support data imports from a DLL #define Q_NO_DATA_RELOCATION |