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/tools/moc | |
| 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/tools/moc')
| -rw-r--r-- | src/tools/moc/generator.cpp | 3 | ||||
| -rw-r--r-- | src/tools/moc/moc.cpp | 9 | ||||
| -rw-r--r-- | src/tools/moc/moc.h | 2 |
3 files changed, 2 insertions, 12 deletions
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; |