From 43a45357ba22e6992b1543b8ece864343aa22e57 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Wed, 2 Sep 2009 17:48:44 +0200 Subject: 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 --- src/corelib/global/qglobal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)\ -- cgit v0.12