diff options
author | Sascha Kolewa <sascha.kolewa@nokia.com> | 2010-12-20 16:26:28 +0100 |
---|---|---|
committer | Sascha Kolewa <sascha.kolewa@nokia.com> | 2010-12-20 16:26:28 +0100 |
commit | 7497c2f9161991f5ec1ef25101788f8ca0f2bdce (patch) | |
tree | fbc13c4632737912f7a06f06b71284ee8a4c62c3 /src/quicktestlib/quicktest.cpp | |
parent | fc40195166040af252146dcea627c590e8f101e0 (diff) | |
parent | 276354547cedabe3b41795793f3f94387f15a7ac (diff) |
Merge branch 'master' of git://scm.dev.nokia.troll.no/research/qtest-qml into Extend_compare_for_objects_and_arrays
Diffstat (limited to 'src/quicktestlib/quicktest.cpp')
-rw-r--r-- | src/quicktestlib/quicktest.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/quicktestlib/quicktest.cpp b/src/quicktestlib/quicktest.cpp index 826c90f..718c6e9 100644 --- a/src/quicktestlib/quicktest.cpp +++ b/src/quicktestlib/quicktest.cpp @@ -42,6 +42,7 @@ #include "quicktest.h" #include "quicktestresult_p.h" #include "qtestsystem.h" +#include "qtestoptions_p.h" #include <QApplication> #include <QtDeclarative/qdeclarative.h> #include <QtDeclarative/qdeclarativeview.h> @@ -199,7 +200,10 @@ int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport QScriptValue qtObject = engine->globalObject().property(QLatin1String("Qt")); qtObject.setProperty - (QLatin1String("qtest_wrapper"), engine->newVariant(true)); + (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(); @@ -207,6 +211,8 @@ int quick_test_main(int argc, char **argv, const char *name, quick_test_viewport view.setSource(QUrl(QLatin1String("qrc:") + path.mid(2))); else view.setSource(QUrl::fromLocalFile(path)); + if (QTest::printAvailableFunctions) + continue; if (view.status() == QDeclarativeView::Error) { // Error compiling the test - flag failure in the log and continue. QList<QDeclarativeError> errors = view.errors(); |