diff options
Diffstat (limited to 'tests/auto/qml')
3 files changed, 10 insertions, 2 deletions
diff --git a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp index 11afc9ea22..8024df99b6 100644 --- a/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp +++ b/tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp @@ -969,7 +969,8 @@ void tst_QQmlEngineDebugService::setBindingForObject() QmlDebugPropertyReference onEnteredRef = findProperty(mouseAreaObject.properties, "onEntered"); QCOMPARE(onEnteredRef.name, QString("onEntered")); - QCOMPARE(onEnteredRef.value, QVariant("{ console.log('hello') }")); + // Sorry, can't do that anymore: QCOMPARE(onEnteredRef.value, QVariant("{ console.log('hello') }")); + QCOMPARE(onEnteredRef.value, QVariant("function() { [code] }")); m_dbg->setBindingForObject(mouseAreaObject.debugId, "onEntered", "{console.log('hello, world') }", false, diff --git a/tests/auto/qml/parserstress/tst_parserstress.cpp b/tests/auto/qml/parserstress/tst_parserstress.cpp index afa58f4437..15b3ff56b6 100644 --- a/tests/auto/qml/parserstress/tst_parserstress.cpp +++ b/tests/auto/qml/parserstress/tst_parserstress.cpp @@ -94,6 +94,13 @@ void tst_parserstress::ecmascript_data() QTest::addColumn<QString>("file"); foreach (const QString &file, files) { + // Skip, QTBUG-34047 + if (file.endsWith(QStringLiteral("tests/ecma_3/Statements/regress-324650.js"))) + continue; + if (file.endsWith(QStringLiteral("tests/ecma_3/Statements/regress-74474-002.js"))) + continue; + if (file.endsWith(QStringLiteral("tests/ecma_3/Statements/regress-74474-003.js"))) + continue; QTest::newRow(qPrintable(file)) << file; } } diff --git a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp index 44ab690f68..a119607769 100644 --- a/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp +++ b/tests/auto/qml/qqmlinstruction/tst_qqmlinstruction.cpp @@ -316,7 +316,7 @@ void tst_qqmlinstruction::dump() { QQmlCompiledData::Instruction::StoreBinding i; i.property.coreIndex = 26; - i.value = 3; + i.functionIndex = 3; i.context = 2; i.owner = 0; data->addInstruction(i); |