diff options
author | Lars Knoll <lars.knoll@qt.io> | 2019-05-02 14:50:31 +0200 |
---|---|---|
committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-06-11 19:39:53 +0200 |
commit | 5603be705e9e99b164bb85014c2abd0edf1d13f3 (patch) | |
tree | bde7984d714f11be054f334ea8185e30bc8197a1 /src/tools/moc/moc.cpp | |
parent | 679492ecc68880babb61b4567ea5f8ef6f6293b3 (diff) | |
download | qtbase-5603be705e9e99b164bb85014c2abd0edf1d13f3.tar.gz |
Qt6: remove support for property flags being functions
Property flags should be compile time booleans, not something to
be determined at runtime.
We've been using this to dynamically disable some properties in QWidget
based classes dependent on the state of a different property, but this
should better get implemented on top of our widgets.
Change-Id: I6296e8761303ecdf24d9e842142e8596304c015d
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/tools/moc/moc.cpp')
-rw-r--r-- | src/tools/moc/moc.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp index 0ffbe7bb13..bfbcde1507 100644 --- a/src/tools/moc/moc.cpp +++ b/src/tools/moc/moc.cpp @@ -1267,8 +1267,7 @@ void Moc::createPropertyDef(PropertyDef &propDef) if (typeWrappedInQProperty) next(RANGLE); propDef.designable = propDef.scriptable = propDef.stored = "true"; - propDef.user = "false"; - + propDef.user = propDef.editable = "false"; /* The Q_PROPERTY construct cannot contain any commas, since commas separate macro arguments. We therefore expect users @@ -1301,8 +1300,8 @@ void Moc::parsePropertyAttributes(PropertyDef &propDef) if (def.endsWith(')')) { QByteArray msg = "Providing a function for "; msg += name; - msg += " in a property declaration is deprecated and will not be supported in Qt 6 anymore."; - warning(msg.constData()); + msg += " in a property declaration is not be supported in Qt 6."; + error(msg.constData()); } }; |