diff options
| author | Ulf Hermann <[email protected]> | 2017-03-17 17:48:55 +0100 |
|---|---|---|
| committer | Ulf Hermann <[email protected]> | 2017-08-15 08:08:06 +0000 |
| commit | 684b0e6609387bdfbf99f24fb0e18a8bbab02bcb (patch) | |
| tree | 51c8599716471b5d2a87ebfc481021d55778eefa | |
| parent | 17513266b81e88b84fda250734f07c94a198fabc (diff) | |
Remove hack to make QtC understand that typeof null is "object"
Newer Qt Creators know that.
Change-Id: If4d3da5a46b49864a77854fff79e54cef2ea26d6
Reviewed-by: hjk <[email protected]>
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp index e89b7a63d4..4573fb9d9a 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp @@ -149,8 +149,6 @@ const QV4::Object *collectProperty(const QV4::ScopedValue &value, QV4::Execution dict.insert(valueKey, QJsonValue::Undefined); return 0; case QV4::Value::Null_Type: - // "null" is not the correct type, but we leave this in until QtC can deal with "object" - dict.insert(QStringLiteral("type"), QStringLiteral("null")); dict.insert(valueKey, QJsonValue::Null); return 0; case QV4::Value::Boolean_Type: diff --git a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp index 441f8c113f..fd74135727 100644 --- a/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp +++ b/tests/auto/qml/debugger/qv4debugger/tst_qv4debugger.cpp @@ -630,7 +630,7 @@ void tst_qv4debugger::readObject() QCOMPARE(b_tail_head.value("value").toString(), QStringLiteral("asdf")); QJsonObject b_tail_tail = b_tail_props.at(1).toObject(); QCOMPARE(b_tail_tail.value("name").toString(), QStringLiteral("tail")); - QCOMPARE(b_tail_tail.value("type").toString(), QStringLiteral("null")); + QCOMPARE(b_tail_tail.value("type").toString(), QStringLiteral("object")); QVERIFY(b_tail_tail.value("value").isNull()); } |