diff options
| author | Albert Astals Cid <albert.astals@canonical.com> | 2013-05-08 18:02:02 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-09 12:17:59 +0200 |
| commit | 95cab90b1023a824017b6d22f62987ba9742b6b3 (patch) | |
| tree | cbdcaf3ad1c6d609fabd8950765061da13681ea1 /src/corelib/global/qglobal.cpp | |
| parent | f7eea69a2a322e156594cf5608bbbb97b4d364c1 (diff) | |
Make QFlags enum flags (C++11 strict enums) friendly
Change-Id: I9ccb3e4d281a545ca1845db4f6aa7ac6c04e8621
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 4134dd6700..4598f60d5e 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -240,6 +240,12 @@ Q_CORE_EXPORT void *qMemSet(void *dest, int c, size_t n); */ /*! + \fn QFlags &QFlags::operator&=(Enum mask) + + \overload +*/ + +/*! \fn QFlags &QFlags::operator|=(QFlags other) Performs a bitwise OR operation with \a other and stores the |