Add support for exposing public QProperty members in the meta-object system

At the moment this makes the type as well as the setter/getter available
through the meta-call as well as the ability to register observers and
bindings. Only QProperty members that are annotated with
Q_PROPERTY(type name) are made public through the meta-object.

Change-Id: I16b98fd318122c722b85ce61e39975284e0c2404
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 5 insertions, 0 deletions

diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h
index 743749433f..210b6c7c2a 100644
--- a/src/tools/moc/moc.h
+++ b/src/tools/moc/moc.h
@@ -140,6 +140,9 @@ struct PropertyDef
     bool constant = false;
     bool final = false;
     bool required = false;
+    bool isQProperty = false;
+
+    int location = -1; // token index, used for error reporting
 
     QJsonObject toJson() const;
 };
@@ -188,6 +191,7 @@ struct ClassDef : BaseDef {
     QVector<FunctionDef> signalList, slotList, methodList, publicList;
     QVector<QByteArray> nonClassSignalList;
     QVector<PropertyDef> propertyList;
+    QSet<QByteArray> qPropertyMembers;
     int notifyableProperties = 0;
     int revisionedMethods = 0;
     int revisionedProperties = 0;
@@ -247,6 +251,7 @@ public:
 
     bool parseFunction(FunctionDef *def, bool inMacro = false);
     bool parseMaybeFunction(const ClassDef *cdef, FunctionDef *def);
+    bool parseMaybeQProperty(ClassDef *def);
 
     void parseSlots(ClassDef *def, FunctionDef::Access access);
     void parseSignals(ClassDef *def);