diff options
| author | tomyri <tomi@mowhi.com> | 2009-11-02 14:05:15 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-17 10:34:44 (GMT) |
| commit | bf5754e0da8c8f783b8e1e7be341a6a4979d1939 (patch) | |
| tree | 2d7188182d2926f077473a2744c81cf70b9bbe0b /src | |
| parent | db803b363785b6892cbf7809aabba1fb7d5fb934 (diff) | |
| download | Qt-bf5754e0da8c8f783b8e1e7be341a6a4979d1939.zip Qt-bf5754e0da8c8f783b8e1e7be341a6a4979d1939.tar.gz Qt-bf5754e0da8c8f783b8e1e7be341a6a4979d1939.tar.bz2 | |
e32def.h include removes TRUE/FALSE redifine warnings on Symbian with gcce compiler
Signed-off-by: axis <qt-info@nokia.com>
axis:
While the fix seems to break our policy of having no system headers
included from qglobal.h, it should be harmless since e32def.h is to
Symbian what stddef.h is to POSIX.
Diffstat (limited to 'src')
| -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 |