diff options
| author | axis <qt-info@nokia.com> | 2009-11-17 15:04:34 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-17 15:04:34 (GMT) |
| commit | b914ba0d4dc1bc1e125fecde28c1be6a7ef90bb5 (patch) | |
| tree | 1ff9b4a50d798c8e99e3a452cc2dd2423fb6a200 /src/corelib | |
| parent | cfa2c8edab18e810749ad7df29c0b3b4f83f7140 (diff) | |
| parent | 6ae54df86262a8128f15deb067dd1117a14e715e (diff) | |
| download | Qt-b914ba0d4dc1bc1e125fecde28c1be6a7ef90bb5.zip Qt-b914ba0d4dc1bc1e125fecde28c1be6a7ef90bb5.tar.gz Qt-b914ba0d4dc1bc1e125fecde28c1be6a7ef90bb5.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-staging2
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 |