diff options
| author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2012-08-13 15:48:44 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-24 11:30:49 +0200 |
| commit | f1422adb3e71fd9c32b65fa0b9d3f076ed0ccfbb (patch) | |
| tree | 6d29e100fc6896defbf4836fff20c0d386dff8be /tests/auto/qml/qjsvalue | |
| parent | 8f893d1d675b09d0a5f2add1df7a9970bb3cb227 (diff) | |
Don't put JavaScript-owned objects on the stack.
Only the fact that the object wrapper uses deleteLater() instead of
delete made this not crash.
Change-Id: I034d8c7f24b963be9e031446ffdfa33e6bc266cc
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Diffstat (limited to 'tests/auto/qml/qjsvalue')
| -rw-r--r-- | tests/auto/qml/qjsvalue/tst_qjsvalue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp index 71bf076464..c6c308aa19 100644 --- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp +++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp @@ -2433,14 +2433,14 @@ void tst_QJSValue::prettyPrinter() void tst_QJSValue::engineDeleted() { QJSEngine *eng = new QJSEngine; - QObject temp; + QObject *temp = new QObject(); // Owned by JS engine, as newQObject() sets JS ownership explicitly QJSValue v1 = eng->toScriptValue(123); QVERIFY(v1.isNumber()); QJSValue v2 = eng->toScriptValue(QString("ciao")); QVERIFY(v2.isString()); QJSValue v3 = eng->newObject(); QVERIFY(v3.isObject()); - QJSValue v4 = eng->newQObject(&temp); + QJSValue v4 = eng->newQObject(temp); QVERIFY(v4.isQObject()); QJSValue v5 = "Hello"; QVERIFY(v2.isString()); |