diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-02 15:48:44 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-09-02 16:07:38 (GMT) |
| commit | 43a45357ba22e6992b1543b8ece864343aa22e57 (patch) | |
| tree | 4163de041a02167911fefe71ff8a11d9448532ec /src/corelib | |
| parent | ea6d0580db1cd6e16401a6c197d2b85abd595e2d (diff) | |
| download | Qt-43a45357ba22e6992b1543b8ece864343aa22e57.zip Qt-43a45357ba22e6992b1543b8ece864343aa22e57.tar.gz Qt-43a45357ba22e6992b1543b8ece864343aa22e57.tar.bz2 | |
Fix tst_Moc::oldStyleCasts
The warning in qglobal.h made the test to fail
(because the purpose of the test is to test that moc doesn't produce
code that generates warnings with lots of warnings falgs on)
(Regression in rev 23c2aea7ce637992)
Reviewed-by: Gabriel de Dietrich
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index e00d6ee..d279891 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2164,7 +2164,7 @@ public: inline bool operator!() const { return !i; } - inline bool testFlag(Enum f) const { return (i & f) == f && (f != 0 || i == (int)f ); } + inline bool testFlag(Enum f) const { return (i & f) == f && (f != 0 || i == int(f) ); } }; #define Q_DECLARE_FLAGS(Flags, Enum)\ |