diff options
author | Sami Lempinen <sami.lempinen@nokia.com> | 2011-03-09 14:18:08 (GMT) |
---|---|---|
committer | Sami Lempinen <sami.lempinen@nokia.com> | 2011-03-09 14:18:08 (GMT) |
commit | e496be83f0ba8849cace30078223eb0fd40f004e (patch) | |
tree | e9d0736269ab86d9ed9e6125ac6e419f8328cd0e /src/gui/text/qcssparser_p.h | |
parent | cf94df01d2d2364653f2ab602688394450e92d31 (diff) | |
parent | 56ad75da12ec6a4d7b65ce4e1a246ee48fda9736 (diff) | |
download | Qt-e496be83f0ba8849cace30078223eb0fd40f004e.zip Qt-e496be83f0ba8849cace30078223eb0fd40f004e.tar.gz Qt-e496be83f0ba8849cace30078223eb0fd40f004e.tar.bz2 |
Remerging SymbianLite to team repository.
Diffstat (limited to 'src/gui/text/qcssparser_p.h')
-rw-r--r-- | src/gui/text/qcssparser_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h index 79c46b3..86bafc9 100644 --- a/src/gui/text/qcssparser_p.h +++ b/src/gui/text/qcssparser_p.h @@ -71,6 +71,9 @@ #if defined(Q_OS_VXWORKS) && defined(NONE) # undef NONE #endif +#if defined(Q_OS_INTEGRITY) +# undef Value +#endif QT_BEGIN_NAMESPACE |