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/kernel/qvariant.h | |
| parent | ae2359d49e171c61450b17b1eb0e0dd7a20c7ca4 (diff) | |
| parent | 05659223bf02c8bac0463fe1e7a9364ef5677b75 (diff) | |
Merge branch 'stable' into dev
Change-Id: I7f0dab6bdb1f3cc1d3e6c30166ff6db9dfae37e9
Diffstat (limited to 'src/corelib/kernel/qvariant.h')
| -rw-r--r-- | src/corelib/kernel/qvariant.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 692af9afc6..254f99e4f3 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -357,7 +357,7 @@ class Q_CORE_EXPORT QVariant { return canConvert(qMetaTypeId<T>()); } public: -#ifndef qdoc +#ifndef Q_QDOC struct PrivateShared { inline PrivateShared(void *v) : ptr(v), ref(1) { } @@ -535,7 +535,7 @@ inline bool QVariant::isDetached() const { return !d.is_shared || d.data.shared->ref.load() == 1; } -#ifdef qdoc +#ifdef Q_QDOC inline bool operator==(const QVariant &v1, const QVariant &v2); inline bool operator!=(const QVariant &v1, const QVariant &v2); #else |