diff options
| author | Andreas Buhr <andreas@andreasbuhr.de> | 2022-04-05 14:31:04 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-04-11 21:39:56 +0000 |
| commit | c680443b66c86eacfc188b8b4e34288df83e96fa (patch) | |
| tree | 6c9a3cb07587ab2d0ea331740fc012dc380d7913 | |
| parent | 9df9bd9e481d1fcafb68948e9a219913a4d631cf (diff) | |
Repair tst_qqmltypeloader on Android
Task-number: QTBUG-101865
Change-Id: Ie51831f6047653ec6bb97fedff0bc46a078ae525
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
(cherry picked from commit f9bc83160076148432ead3ba5c54f0b00e18ed37)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp b/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp index a030e56b20..9cbca71c28 100644 --- a/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp +++ b/tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp @@ -570,6 +570,10 @@ void tst_QQMLTypeLoader::implicitComponentModule() void tst_QQMLTypeLoader::customDiskCachePath() { +#ifdef Q_OS_ANDROID + QSKIP("Android seems to have problems with QProcess"); +#endif + #if QT_CONFIG(process) const char *skipKey = "QT_TST_QQMLTYPELOADER_SKIP_MISMATCH"; if (qEnvironmentVariableIsSet(skipKey)) { @@ -733,6 +737,9 @@ void tst_QQMLTypeLoader::signalHandlersAreCompatible() // make sure that units really come from different places (the machinery // could in theory be smart enough to figure the qmlcachegen cached // version), fairly questionable check but better than nothing +#ifdef Q_OS_ANDROID + QSKIP("qrc and file system is the same thing on Android"); +#endif QVERIFY(unitFromCachegen->url() != unitFromTypeCompiler->url()); } |