diff options
author | Lars Knoll <lars.knoll@qt.io> | 2019-05-03 15:18:06 +0200 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-06-11 19:39:56 +0200 |
commit | d0689ec867244a25635fb9504f2e6ff6e5c4a77b (patch) | |
tree | 841fd25ead91f3f1cc9f65aadbcdee1b88a833ba /src/corelib/kernel | |
parent | 9b383f3d5c9774cff8a054027094bf1abf41c84f (diff) |
Get rid of the obsolete isEditable flag for properties
Change-Id: I54411bd8e223671523c9c8fad5c80bfa6b5b7097
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 21 | ||||
-rw-r--r-- | src/corelib/kernel/qmetaobject.h | 3 | ||||
-rw-r--r-- | src/corelib/kernel/qmetaobject_p.h | 1 | ||||
-rw-r--r-- | src/corelib/kernel/qmetaobjectbuilder.cpp | 27 | ||||
-rw-r--r-- | src/corelib/kernel/qmetaobjectbuilder_p.h | 1 |
5 files changed, 0 insertions, 53 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index cf6144796f..add1f3b86e 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -3497,27 +3497,6 @@ bool QMetaProperty::isQProperty() const } /*! - \obsolete - - Returns \c true if the property is editable; - otherwise returns \c false. - - If no \a object is given, the function returns \c false if the - \c{Q_PROPERTY()}'s \c EDITABLE attribute is false; otherwise returns - true (if the attribute is true or is a function or expression). - - \sa isDesignable(), isScriptable(), isStored() -*/ -#if QT_DEPRECATED_SINCE(5, 15) -bool QMetaProperty::isEditable() const -{ - if (!mobj) - return false; - return data.flags() & Editable; -} -#endif - -/*! \class QMetaClassInfo \inmodule QtCore diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index 3a9104c305..e9290e0844 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -289,9 +289,6 @@ public: bool isDesignable() const; bool isScriptable() const; bool isStored() const; -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED_VERSION_5_15 bool isEditable() const; -#endif bool isUser() const; bool isConstant() const; bool isFinal() const; diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index 7956e99d52..79d090cc4b 100644 --- a/src/corelib/kernel/qmetaobject_p.h +++ b/src/corelib/kernel/qmetaobject_p.h @@ -77,7 +77,6 @@ enum PropertyFlags { Designable = 0x00001000, Scriptable = 0x00004000, Stored = 0x00010000, - Editable = 0x00040000, User = 0x00100000, Required = 0x01000000, IsQProperty = 0x02000000 diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp index 086531501f..0f778af644 100644 --- a/src/corelib/kernel/qmetaobjectbuilder.cpp +++ b/src/corelib/kernel/qmetaobjectbuilder.cpp @@ -2292,21 +2292,6 @@ bool QMetaPropertyBuilder::isStored() const } /*! - Returns \c true if the property is editable; otherwise returns \c false. - This default value is false. - - \sa setEditable(), isDesignable(), isScriptable(), isStored() -*/ -bool QMetaPropertyBuilder::isEditable() const -{ - QMetaPropertyBuilderPrivate *d = d_func(); - if (d) - return d->flag(Editable); - else - return false; -} - -/*! Returns \c true if this property is designated as the \c USER property, i.e., the one that the user can edit or that is significant in some other way. Otherwise it returns @@ -2455,18 +2440,6 @@ void QMetaPropertyBuilder::setStored(bool value) } /*! - Sets this property to editable if \a value is true. - - \sa isEditable(), setDesignable(), setScriptable(), setStored() -*/ -void QMetaPropertyBuilder::setEditable(bool value) -{ - QMetaPropertyBuilderPrivate *d = d_func(); - if (d) - d->setFlag(Editable, value); -} - -/*! Sets the \c USER flag on this property to \a value. \sa isUser(), setDesignable(), setScriptable() diff --git a/src/corelib/kernel/qmetaobjectbuilder_p.h b/src/corelib/kernel/qmetaobjectbuilder_p.h index 6d43be7811..974fbd4a64 100644 --- a/src/corelib/kernel/qmetaobjectbuilder_p.h +++ b/src/corelib/kernel/qmetaobjectbuilder_p.h @@ -269,7 +269,6 @@ public: void setDesignable(bool value); void setScriptable(bool value); void setStored(bool value); - void setEditable(bool value); void setUser(bool value); void setStdCppSet(bool value); void setEnumOrFlag(bool value); |