diff options
| author | Yoann Lopes <yoann.lopes@nokia.com> | 2009-11-17 16:26:50 (GMT) |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@nokia.com> | 2009-11-17 16:26:50 (GMT) |
| commit | 67b7d3ee2c30a710e765252a29ecb9a0ffd0a7a6 (patch) | |
| tree | 09901a4f0892a8d60b02692e64e2ab391292872c /src/corelib | |
| parent | 162071d2651645358a0935b27af8a3b47474a10f (diff) | |
| parent | 1188cd220787162a2c8327ea1291a743863b12c5 (diff) | |
| download | Qt-67b7d3ee2c30a710e765252a29ecb9a0ffd0a7a6.zip Qt-67b7d3ee2c30a710e765252a29ecb9a0ffd0a7a6.tar.gz Qt-67b7d3ee2c30a710e765252a29ecb9a0ffd0a7a6.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 9558256..2e9f839 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -910,6 +910,8 @@ QT_END_INCLUDE_NAMESPACE /* Symbian OS defines TRUE = 1 and FALSE = 0, redefine to built-in booleans to make autotests work properly */ #ifdef Q_OS_SYMBIAN + #include <e32def.h> /* Symbian OS defines */ + #undef TRUE #undef FALSE #endif |