diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2012-03-06 14:01:34 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-07 06:24:18 +0100 |
| commit | 65764c0334e92c7229457c1bc412f262c9ffdb8a (patch) | |
| tree | 3c7b5dccd5ad6537f113b252077f6178de88c48f /tests/auto/qml/qqmlparser | |
| parent | 2df64d04bee04b9a30d6d62582199cc9ec524632 (diff) | |
Changed qml tests to work from install directory
- Changed tests to use TESTDATA
- moved qqmlcontext to private test as it contains private header
- added check for cross_compile option to skip when sources not available
Change-Id: I0f68f58ffcb1b41b8e40a9851e3e003fe72ee2f9
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests/auto/qml/qqmlparser')
| -rw-r--r-- | tests/auto/qml/qqmlparser/qqmlparser.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlparser/tst_qqmlparser.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlparser/qqmlparser.pro b/tests/auto/qml/qqmlparser/qqmlparser.pro index e1b7b39402..10e033af90 100644 --- a/tests/auto/qml/qqmlparser/qqmlparser.pro +++ b/tests/auto/qml/qqmlparser/qqmlparser.pro @@ -7,3 +7,5 @@ SOURCES += tst_qqmlparser.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test + +cross_compile: DEFINES += QTEST_CROSS_COMPILED diff --git a/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp b/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp index 5fb5b71533..00b64e04a1 100644 --- a/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp +++ b/tests/auto/qml/qqmlparser/tst_qqmlparser.cpp @@ -182,6 +182,10 @@ void tst_qqmlparser::qmlParser() { QFETCH(QString, file); +#if defined(QTEST_CROSS_COMPILED) + QSKIP("sources not available when cross compiled"); +#endif + using namespace QQmlJS; QString code; |