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>

8 files changed, 2 insertions, 65 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);
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index d2fe5fa446..7f2dcc371d 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -878,9 +878,6 @@ void Generator::generateProperties()
         if (p.stored != "false")
             flags |= Stored;
 
-        if (p.editable != "false")
-            flags |= Editable;
-
         if (p.user != "false")
             flags |= User;
 
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index 8bb70a76dc..82059e340f 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -1267,7 +1267,7 @@ void Moc::createPropertyDef(PropertyDef &propDef)
     if (typeWrappedInQProperty)
         next(RANGLE);
     propDef.designable = propDef.scriptable = propDef.stored = "true";
-    propDef.user = propDef.editable = "false";
+    propDef.user = "false";
     /*
       The Q_PROPERTY construct cannot contain any commas, since
       commas separate macro arguments. We therefore expect users
@@ -1376,13 +1376,6 @@ void Moc::parsePropertyAttributes(PropertyDef &propDef)
             propDef.designable = v + v2;
             checkIsFunction(propDef.designable, "DESIGNABLE");
             break;
-        case 'E': if (l != "EDITABLE") error(2); {
-            const QByteArray msg = "EDITABLE flag for property declaration is deprecated.";
-            warning(msg.constData());
-            propDef.editable = v + v2;
-            checkIsFunction(propDef.editable, "EDITABLE");
-        }
-            break;
         case 'N': if (l != "NOTIFY") error(2);
             propDef.notify = v;
             break;
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h
index 4d918c4dbf..8043a547fc 100644
--- a/src/tools/moc/moc.h
+++ b/src/tools/moc/moc.h
@@ -132,7 +132,7 @@ struct PropertyDef
         return (s == write);
     }
 
-    QByteArray name, type, member, read, write, reset, designable, scriptable, editable, stored, user, notify, inPrivateClass;
+    QByteArray name, type, member, read, write, reset, designable, scriptable, stored, user, notify, inPrivateClass;
     int notifyId = -1; // -1 means no notifyId, >= 0 means signal defined in this class, < -1 means signal not defined in this class
     enum Specification  { ValueSpec, ReferenceSpec, PointerSpec };
     Specification gspec = ValueSpec;