diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-18 13:22:27 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-18 13:22:27 (GMT) |
| commit | b68c5cd72b4fc58a1422a801e1c52c72be32f3d4 (patch) | |
| tree | 0de572352715008a541f52d8d17d377195469604 /src/corelib/global/qglobal.h | |
| parent | 9f80bac10f1ab5155999cb554559cd3dacab2bb9 (diff) | |
| parent | b9b8a1cb6bc5a1b93373a7a634a23dcd785b3c31 (diff) | |
| download | Qt-b68c5cd72b4fc58a1422a801e1c52c72be32f3d4.zip Qt-b68c5cd72b4fc58a1422a801e1c52c72be32f3d4.tar.gz Qt-b68c5cd72b4fc58a1422a801e1c52c72be32f3d4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
src/gui/kernel/qwidget_x11.cpp
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 f93e613..de52e58 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 @@ -2389,8 +2388,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 |