diff options
| author | Jan Arve Sæther <jan-arve.saether@qt.io> | 2019-07-18 15:22:49 +0200 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@qt.io> | 2019-07-19 13:39:02 +0200 |
| commit | 55dbb7b90c32442c4fb9a16563990913ec0468f4 (patch) | |
| tree | 104001e5fc513d4681bdafc24333b02334b25df7 /tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp | |
| parent | 3db15da8e1109ef256a4a1a8a3cd6c643512d5b6 (diff) | |
Fix tst_qqmlapplicationengine failures for Android
The tests doesn't make much sense on Android so we just skip them
Change-Id: Ie93858f7041657d6e6d05229454f970a761efc0b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp')
| -rw-r--r-- | tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp index a9c28a0911..8787a43884 100644 --- a/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp +++ b/tests/auto/qml/qqmlapplicationengine/tst_qqmlapplicationengine.cpp @@ -96,6 +96,9 @@ void tst_qqmlapplicationengine::basicLoading() // will break. void tst_qqmlapplicationengine::testNonResolvedPath() { +#ifdef Q_OS_ANDROID + QSKIP("Android stores QML files in resources, and the path to a resource cannot be relative in this case"); +#endif { // NOTE NOTE NOTE! Missing testFileUrl is *WANTED* here! We want a // non-resolved URL. @@ -117,6 +120,9 @@ void tst_qqmlapplicationengine::testNonResolvedPath() void tst_qqmlapplicationengine::application_data() { +#ifdef Q_OS_ANDROID + QSKIP("Cannot launch external process on Android"); +#endif QTest::addColumn<QByteArray>("qmlFile"); QTest::addColumn<QByteArray>("expectedStdErr"); |