diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-31 01:13:43 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-31 02:00:48 (GMT) |
| commit | 78085510b570d3d1a16339e7440172f0955798d1 (patch) | |
| tree | 53abde4a383801a1e624ae237582b0536ec791cc /src | |
| parent | dee897be8d8a9bbb67f654cee89337af6db09872 (diff) | |
| download | Qt-78085510b570d3d1a16339e7440172f0955798d1.zip Qt-78085510b570d3d1a16339e7440172f0955798d1.tar.gz Qt-78085510b570d3d1a16339e7440172f0955798d1.tar.bz2 | |
Remove isDynamic property flag
Reviewed-by: Roberto Raggi
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 14 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetaobject.h | 1 | ||||
| -rw-r--r-- | src/tools/moc/generator.cpp | 3 |
3 files changed, 2 insertions, 16 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index fb59b98..9ff0bc1 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -161,8 +161,7 @@ enum PropertyFlags { ResolveEditable = 0x00080000, User = 0x00100000, ResolveUser = 0x00200000, - Notify = 0x00400000, - Dynamic = 0x00800000 + Notify = 0x00400000 }; enum MethodFlags { @@ -2485,17 +2484,6 @@ bool QMetaProperty::isUser(const QObject *object) const } /*! - \internal -*/ -bool QMetaProperty::isDynamic() const -{ - if (!mobj) - return false; - int flags = mobj->d.data[handle + 2]; - return flags & Dynamic; -} - -/*! Returns true if the property is constant; otherwise returns false. A property is constant if the \c{Q_PROPERTY()}'s \c CONSTANT attribute diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index 9f36106..419fe06 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -189,7 +189,6 @@ public: bool isStored(const QObject *obj = 0) const; bool isEditable(const QObject *obj = 0) const; bool isUser(const QObject *obj = 0) const; - bool isDynamic() const; bool isConstant() const; bool isFinal() const; diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index dd31336..e3ce2ec 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -68,8 +68,7 @@ enum PropertyFlags { ResolveEditable = 0x00080000, User = 0x00100000, ResolveUser = 0x00200000, - Notify = 0x00400000, - Dynamic = 0x00800000 + Notify = 0x00400000 }; enum MethodFlags { |