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/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/aliases.qml')
-rw-r--r-- | tests/auto/qml/qqmlsettings/data/aliases.qml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlsettings/data/aliases.qml b/tests/auto/qml/qqmlsettings/data/aliases.qml index 18bd7a0e07..dd11147532 100644 --- a/tests/auto/qml/qqmlsettings/data/aliases.qml +++ b/tests/auto/qml/qqmlsettings/data/aliases.qml @@ -38,8 +38,10 @@ QtObject { property double doubleProperty: 3.45 property string stringProperty: "foo" property url urlProperty: "http://www.qt-project.org" + property var objectProperty: {"foo":"bar"} property var intListProperty: [1, 2, 3] property var stringListProperty: ["a", "b", "c"] + property var objectListProperty: [{"a":"b"}, {"c":"d"}] property date dateProperty: "2000-01-02" // QTBUG-32295: Expected property type //property time timeProperty: "12:34:56" @@ -58,8 +60,10 @@ QtObject { property alias doubleProperty: root.doubleProperty property alias stringProperty: root.stringProperty property alias urlProperty: root.urlProperty + property alias objectProperty: root.objectProperty property alias intListProperty: root.intListProperty property alias stringListProperty: root.stringListProperty + property alias objectListProperty: root.objectListProperty property alias dateProperty: root.dateProperty // QTBUG-32295: Expected property type //property alias timeProperty: root.timeProperty |