diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:06:30 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:06:30 +0100 |
| commit | 82913414623f36acb3d2c07d6c124af9f61fcdb4 (patch) | |
| tree | 610f66dd1fcb487e20bbf18587e8cfad38a40826 /tests/auto/qml/qjsengine/tst_qjsengine.cpp | |
| parent | d34098d8981d9103626ff7264e7b5ec084bfb63e (diff) | |
| parent | f95fdacb3a12e4f0d37d3c32b34326f2bd1536de (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
src/qml/qml/qqmlcompiler.cpp
Change-Id: I802731139d47c5b733dd805f7bf432d67d7331e1
Diffstat (limited to 'tests/auto/qml/qjsengine/tst_qjsengine.cpp')
| -rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 39086d75ac..726f8636b6 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -134,6 +134,7 @@ private slots: void reentrancy_Array(); void reentrancy_objectCreation(); void jsIncDecNonObjectProperty(); + void JSONparse(); void qRegExpInport_data(); void qRegExpInport(); @@ -2500,6 +2501,13 @@ void tst_QJSEngine::jsIncDecNonObjectProperty() } } +void tst_QJSEngine::JSONparse() +{ + QJSEngine eng; + QJSValue ret = eng.evaluate("var json=\"{\\\"1\\\": null}\"; JSON.parse(json);"); + QVERIFY(ret.isObject()); +} + static QRegExp minimal(QRegExp r) { r.setMinimal(true); return r; } void tst_QJSEngine::qRegExpInport_data() |