diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-28 11:23:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-28 11:23:35 +0100 |
| commit | 1139be7b304a52901fbcf9ee9b95c5c7a50054f3 (patch) | |
| tree | d1491761623e5c371e6ccff039ee2bb13dcb6828 /src/corelib/global | |
| parent | 6615f1d16b442bbf476d86ab90af1107617945c9 (diff) | |
| parent | 5f66f871816d083da9795d71f746413d6f6118f7 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Iede384644c3df5ee01b701806dfdb586dd6bb138
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qflags.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h index feeb488acd..72b0a689ff 100644 --- a/src/corelib/global/qflags.h +++ b/src/corelib/global/qflags.h @@ -150,7 +150,7 @@ public: Q_DECL_CONSTEXPR inline bool testFlag(Enum f) const Q_DECL_NOTHROW { return (i & Int(f)) == Int(f) && (Int(f) != 0 || i == Int(f) ); } Q_DECL_RELAXED_CONSTEXPR inline QFlags &setFlag(Enum f, bool on = true) Q_DECL_NOTHROW { - return on ? (*this |= f) : (*this &= ~f); + return on ? (*this |= f) : (*this &= ~Int(f)); } private: |