moc: Allow out-of-line storage for Q_PRIVATE_QPROPERTY

If you pass "STORED false" the name is interpreted as function to be
invoked in order to access the property. This allows storage of a
property in a lazily allocated data type.

Change-Id: I4d3a9cac6985c6419ce687868cb74b91921595a6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 39640b6f68..4f420b8467 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -1555,7 +1555,7 @@ void Generator::generateQPropertyApi()
                 cdef->qualified.constData(),
                 property.name.constData());
         printAccessor(/*const*/true);
-        fprintf(out, "    return thisPtr->%s->%s.value();\n", property.accessor.constData(), property.name.constData());
+        fprintf(out, "    return thisPtr->%s->%s.value();\n", property.accessor.constData(), property.storage.constData());
         fprintf(out, "}\n");
 
         // property value setter
@@ -1564,7 +1564,7 @@ void Generator::generateQPropertyApi()
                 property.name.constData(),
                 property.type.name.constData());
         printAccessor();
-        fprintf(out, "    return thisPtr->%s->%s.setValue(thisPtr->%s, value);\n", property.accessor.constData(), property.name.constData(), property.accessor.constData());
+        fprintf(out, "    return thisPtr->%s->%s.setValue(thisPtr->%s, value);\n", property.accessor.constData(), property.storage.constData(), property.accessor.constData());
         fprintf(out, "}\n");
 
         // property value move setter
@@ -1573,7 +1573,7 @@ void Generator::generateQPropertyApi()
                 property.name.constData(),
                 property.type.name.constData());
         printAccessor();
-        fprintf(out, "    return thisPtr->%s->%s.setValue(thisPtr->%s, std::move(value));\n", property.accessor.constData(), property.name.constData(), property.accessor.constData());
+        fprintf(out, "    return thisPtr->%s->%s.setValue(thisPtr->%s, std::move(value));\n", property.accessor.constData(), property.storage.constData(), property.accessor.constData());
         fprintf(out, "}\n");
 
         // binding setter
@@ -1583,7 +1583,7 @@ void Generator::generateQPropertyApi()
                 property.name.constData(),
                 property.type.name.constData());
         printAccessor();
-        fprintf(out, "    return thisPtr->%s->%s.setBinding(thisPtr->%s, binding);\n", property.accessor.constData(), property.name.constData(), property.accessor.constData());
+        fprintf(out, "    return thisPtr->%s->%s.setBinding(thisPtr->%s, binding);\n", property.accessor.constData(), property.storage.constData(), property.accessor.constData());
         fprintf(out, "}\n");
 
         // binding move setter
@@ -1593,7 +1593,7 @@ void Generator::generateQPropertyApi()
                 property.name.constData(),
                 property.type.name.constData());
         printAccessor();
-        fprintf(out, "    return thisPtr->%s->%s.setBinding(thisPtr->%s, std::move(binding));\n", property.accessor.constData(), property.name.constData(), property.accessor.constData());
+        fprintf(out, "    return thisPtr->%s->%s.setBinding(thisPtr->%s, std::move(binding));\n", property.accessor.constData(), property.storage.constData(), property.accessor.constData());
         fprintf(out, "}\n");
 
         // untyped binding setter
@@ -1601,7 +1601,7 @@ void Generator::generateQPropertyApi()
                 cdef->qualified.constData(),
                 property.name.constData());
         printAccessor();
-        fprintf(out, "    return thisPtr->%s->%s.setBinding(thisPtr->%s, binding);\n", property.accessor.constData(), property.name.constData(), property.accessor.constData());
+        fprintf(out, "    return thisPtr->%s->%s.setBinding(thisPtr->%s, binding);\n", property.accessor.constData(), property.storage.constData(), property.accessor.constData());
         fprintf(out, "}\n");
 
         // binding bool getter
@@ -1609,7 +1609,7 @@ void Generator::generateQPropertyApi()
                 cdef->qualified.constData(),
                 property.name.constData());
         printAccessor(/*const*/true);
-        fprintf(out, "    return thisPtr->%s->%s.hasBinding();\n", property.accessor.constData(), property.name.constData());
+        fprintf(out, "    return thisPtr->%s->%s.hasBinding();\n", property.accessor.constData(), property.storage.constData());
         fprintf(out, "}\n");
 
         // binding getter
@@ -1618,7 +1618,7 @@ void Generator::generateQPropertyApi()
                 cdef->qualified.constData(),
                 property.name.constData());
         printAccessor(/*const*/true);
-        fprintf(out, "    return thisPtr->%s->%s.binding();\n", property.accessor.constData(), property.name.constData());
+        fprintf(out, "    return thisPtr->%s->%s.binding();\n", property.accessor.constData(), property.storage.constData());
         fprintf(out, "}\n");
 
         // binding taker
@@ -1627,7 +1627,7 @@ void Generator::generateQPropertyApi()
                 cdef->qualified.constData(),
                 property.name.constData());
         printAccessor();
-        fprintf(out, "    return thisPtr->%s->%s.takeBinding();\n", property.accessor.constData(), property.name.constData());
+        fprintf(out, "    return thisPtr->%s->%s.takeBinding();\n", property.accessor.constData(), property.storage.constData());
         fprintf(out, "}\n");
 
         // property setter function