diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-07-13 11:49:08 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-07-13 11:49:08 (GMT) |
| commit | 821c7c1486beb6d5e65bd3ac8ba74752fec37fe8 (patch) | |
| tree | 042ad778ccdfacd2dc1b4751a98e83889e5e10e3 /src/corelib/global/qglobal.h | |
| parent | 85fbffa12bcd38b08030561335305c3226312bc6 (diff) | |
| parent | cc24c46c117248ecb98200416e7f25375e6bb476 (diff) | |
| download | Qt-821c7c1486beb6d5e65bd3ac8ba74752fec37fe8.zip Qt-821c7c1486beb6d5e65bd3ac8ba74752fec37fe8.tar.gz Qt-821c7c1486beb6d5e65bd3ac8ba74752fec37fe8.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -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 a139a55..d6c708c 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -2062,7 +2062,7 @@ public: inline bool operator!() const { return !i; } - inline bool testFlag(Enum f) const { return (i & f) == f; } + inline bool testFlag(Enum f) const { return (i & f) == f && (f != 0 || i == f ); } }; #define Q_DECLARE_FLAGS(Flags, Enum)\ |