diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 11:49:43 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-09 11:49:47 +0100 |
| commit | 63f24f6ba8417e90294a1a90d01a3c3de80b7af4 (patch) | |
| tree | 27b5788a3e7c1e94b484e642142b1be8ff8da318 /src/corelib/global/qflags.h | |
| parent | ae2359d49e171c61450b17b1eb0e0dd7a20c7ca4 (diff) | |
| parent | 05659223bf02c8bac0463fe1e7a9364ef5677b75 (diff) | |
Merge branch 'stable' into dev
Change-Id: I7f0dab6bdb1f3cc1d3e6c30166ff6db9dfae37e9
Diffstat (limited to 'src/corelib/global/qflags.h')
| -rw-r--r-- | src/corelib/global/qflags.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h index cbd7185a92..1d79b70600 100644 --- a/src/corelib/global/qflags.h +++ b/src/corelib/global/qflags.h @@ -85,7 +85,7 @@ class QFlags struct Private; typedef int (Private::*Zero); public: -#ifndef qdoc +#ifndef Q_QDOC typedef typename QtPrivate::if_< QtPrivate::is_unsigned<Enum>::value, unsigned int, @@ -94,7 +94,7 @@ public: #endif typedef Enum enum_type; // compiler-generated copy/move ctor/assignment operators are fine! -#ifdef qdoc +#ifdef Q_QDOC typedef int Int; // the real typedef above is too complex for qdoc inline QFlags(const QFlags &other); inline QFlags &operator=(const QFlags &other); |