diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-07-08 15:56:48 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-07-08 15:56:48 +1000 |
| commit | 26590325b5e9209df4495841b9013d04bbb35515 (patch) | |
| tree | 2a4e44ca1e1d4389caf999ee8801a312166bf39c /src/qmltest | |
| parent | 5a705d8951a0b23c725d99a5a3fce7902ec41374 (diff) | |
| parent | 438d50d63c48bbbfd185bd7e1a0d6e6174c1791e (diff) | |
Merge branch 'v8'
Conflicts:
src/declarative/qml/qdeclarativescarceresourcescriptclass.cpp
src/declarative/qml/qdeclarativescarceresourcescriptclass_p.h
Change-Id: I54e579307cbeafbbad21884218c5e797ba245c8b
Diffstat (limited to 'src/qmltest')
| -rw-r--r-- | src/qmltest/quicktest.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/qmltest/quicktest.cpp b/src/qmltest/quicktest.cpp index d8451be341..4dfad1867b 100644 --- a/src/qmltest/quicktest.cpp +++ b/src/qmltest/quicktest.cpp @@ -189,15 +189,6 @@ int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport &eventLoop, SLOT(quit())); view.rootContext()->setContextProperty (QLatin1String("qtest"), &rootobj); - QScriptEngine *engine; - engine = QDeclarativeDebugHelper::getScriptEngine(view.engine()); - QScriptValue qtObject - = engine->globalObject().property(QLatin1String("Qt")); - qtObject.setProperty - (QLatin1String("qtest_wrapper"), QScriptValue(true)); - qtObject.setProperty - (QLatin1String("qtest_printAvailableFunctions"), - QScriptValue(QTest::printAvailableFunctions)); foreach (QString path, imports) view.engine()->addImportPath(path); QString path = fi.absoluteFilePath(); @@ -254,15 +245,6 @@ int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport view.setViewport((*createViewport)()); view.rootContext()->setContextProperty (QLatin1String("qtest"), &rootobj); - QScriptEngine *engine; - engine = QDeclarativeDebugHelper::getScriptEngine(view.engine()); - QScriptValue qtObject - = engine->globalObject().property(QLatin1String("Qt")); - qtObject.setProperty - (QLatin1String("qtest_wrapper"), QScriptValue(true)); - qtObject.setProperty - (QLatin1String("qtest_printAvailableFunctions"), - QScriptValue(QTest::printAvailableFunctions)); foreach (QString path, imports) view.engine()->addImportPath(path); QString path = fi.absoluteFilePath(); |