aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/v4/testtypes.h
diff options
context:
space:
mode:
authorMichael Brasser <michael.brasser@nokia.com>2012-03-02 11:33:46 +1000
committerQt by Nokia <qt-info@nokia.com>2012-03-09 11:03:23 +0100
commit9ba6a3b21cf012c3223ed848d102f8fa9ce00779 (patch)
tree441bda281cd5aad3fcf58634d3d1cd017ea46f4e /tests/auto/qml/v4/testtypes.h
parent4eab1984cebe9972283e88e7b91f763636e17c47 (diff)
Add autotest for v4 nested object bug.
Task-number: QTBUG-24606 Change-Id: I0909d60316f7213b21fc315e8a3d0a6124e84409 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'tests/auto/qml/v4/testtypes.h')
-rw-r--r--tests/auto/qml/v4/testtypes.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/qml/v4/testtypes.h b/tests/auto/qml/v4/testtypes.h
index 02ba721839..18b5b27b36 100644
--- a/tests/auto/qml/v4/testtypes.h
+++ b/tests/auto/qml/v4/testtypes.h
@@ -59,6 +59,7 @@ class ResultObject : public QObject
Q_OBJECT
Q_PROPERTY(int result READ result WRITE setResult FINAL)
Q_PROPERTY(NestedObject *nested READ nested CONSTANT)
+ Q_PROPERTY(NestedObject *nested2 READ nested2 FINAL CONSTANT)
public:
ResultObject() : m_result(0), m_resultCounter(0) {}
@@ -69,12 +70,14 @@ public:
void setResult(int result) { m_result = result; m_resultCounter++; }
NestedObject *nested() { return &m_nested; }
+ NestedObject *nested2() { return &m_nested2; }
private:
int m_result;
int m_resultCounter;
NestedObject m_nested;
+ NestedObject m_nested2;
};
void registerTypes();