diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-01-19 15:54:24 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-19 23:19:26 +0100 |
| commit | b1da5cb07922e786bd3223317651284b73159e82 (patch) | |
| tree | 92804932e350688e161db58613f013832a18b1a8 /tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp | |
| parent | 3121a0d41006d4b5f12c6a119b99f9917ceea760 (diff) | |
Assigning empty object to Q_PROPERTY(QVariantMap)
Correct the evaluation of an empty javascript object during assignment
to a QVariantMap property.
Task-number: QTBUG-23586
Change-Id: Ifa891a017690a36bd5837bc6b4dd0e47eb515a46
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp')
| -rw-r--r-- | tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp b/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp index 5a9ccc521c..e3e259dcbc 100644 --- a/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp +++ b/tests/auto/declarative/qjsvalue/tst_qjsvalue.cpp @@ -4023,6 +4023,12 @@ void tst_QJSValue::nestedObjectToVariant_data() // Object literals { QVariantMap m; + QTest::newRow("{}") + << QString::fromLatin1("({})") + << QVariant(m); + } + { + QVariantMap m; m["a"] = QVariantMap(); QTest::newRow("{ a:{} }") << QString::fromLatin1("({ a:{} })") |