diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-31 08:12:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-31 08:12:25 +0200 |
| commit | 9f178cbe9ea27d247c82c7bbc396b1c3b264a06d (patch) | |
| tree | 552cc5682fef1d046e9ad9394a22620bd380ad98 /tests/auto/qml/qqmlsettings/data/cpp-aliases.qml | |
| parent | 344fbc3d2f4ccc9773e2bbe7b2969b4ac86dc9aa (diff) | |
| parent | 96f6ba5f562073f508cd8569ac354592fdd48f4a (diff) | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: I3f77593ca944114534fff5df26bbb09150ee4400
Diffstat (limited to 'tests/auto/qml/qqmlsettings/data/cpp-aliases.qml')
| -rw-r--r-- | tests/auto/qml/qqmlsettings/data/cpp-aliases.qml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlsettings/data/cpp-aliases.qml b/tests/auto/qml/qqmlsettings/data/cpp-aliases.qml index 8540838fb9..f5b18d1825 100644 --- a/tests/auto/qml/qqmlsettings/data/cpp-aliases.qml +++ b/tests/auto/qml/qqmlsettings/data/cpp-aliases.qml @@ -40,8 +40,10 @@ CppObject { property alias doubleProperty: obj.doubleProperty property alias stringProperty: obj.stringProperty property alias urlProperty: obj.urlProperty + property alias objectProperty: obj.objectProperty property alias intListProperty: obj.intListProperty property alias stringListProperty: obj.stringListProperty + property alias objectListProperty: obj.objectListProperty property alias dateProperty: obj.dateProperty // QTBUG-32295: Expected property type //property alias timeProperty: obj.timeProperty |