diff options
| author | Debao Zhang <hello@debao.me> | 2012-12-28 14:18:53 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-08 10:48:33 +0100 |
| commit | 39795b1411a5ed17c47ef638c693d4b788442d0c (patch) | |
| tree | 9862b40a06e239d4486966f9b972a475f7170da3 /src/corelib/global/qflags.h | |
| parent | 742f0c6e0b8e3ec6fddc146205e78a93f600c1cf (diff) | |
Replace macro qdoc with Q_QDOC
Both qdoc and Q_QDOC are used in source code, which looks not good.
Change-Id: I4f3a71670278b0758d92bfa5db086a07e1b1acfd
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
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); |