diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-02-16 13:08:49 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-03-02 15:21:09 +0200 |
| commit | 9bdfea7f1f1ffe16c7a1140b09c94b9d72d24f18 (patch) | |
| tree | 777bcccac81c8d3ec23de96c8645cec3b8902d88 /tests/auto/qml/qmlbasicapp | |
| parent | ae62122a8f57b1de654e891125f19d2e18d6f5df (diff) | |
Android: various test fixes
2nd round of test failures fixes for Android. Mostly resource bundling
related issues still.
Pick-to: 6.2 6.3
Task-number: QTBUG-97056
Change-Id: I2fac0710a7b5528fcef4480babd0cbf749e488b3
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto/qml/qmlbasicapp')
| -rw-r--r-- | tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp b/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp index 2fd7ef634b..a6c6e4accd 100644 --- a/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp +++ b/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp @@ -44,6 +44,9 @@ private slots: void tst_basicapp::loadComponent() { QQmlEngine engine; +#ifdef Q_OS_ANDROID + engine.addImportPath(":/"); +#endif QQmlComponent c(&engine, QStringLiteral("qrc:/BasicApp/main.qml")); QVERIFY2(c.isReady(), qPrintable(c.errorString())); QScopedPointer o(c.create()); @@ -83,6 +86,9 @@ void tst_basicapp::resourceFiles() void tst_basicapp::fileSystemFiles() { +#ifdef Q_OS_ANDROID + QSKIP("This test is not valid for Android, because the files can exist only as resources."); +#endif const QString basedir = QCoreApplication::applicationDirPath(); QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/main.qml"))); QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/qmldir"))); @@ -99,8 +105,13 @@ void tst_basicapp::fileSystemFiles() void tst_basicapp::qmldirContents() { +#ifdef Q_OS_ANDROID + const QString basedir = QStringLiteral(":"); // Use qrc resource path on Android +#else + const QString basedir = QCoreApplication::applicationDirPath(); +#endif { - QFile qmldir(QCoreApplication::applicationDirPath() + "/BasicApp/qmldir"); + QFile qmldir(basedir + "/BasicApp/qmldir"); QVERIFY(qmldir.open(QIODevice::ReadOnly)); const QByteArray contents = qmldir.readAll(); QVERIFY(contents.contains("module BasicApp")); @@ -115,7 +126,7 @@ void tst_basicapp::qmldirContents() } { - QFile qmldir(QCoreApplication::applicationDirPath() + "/TimeExample/qmldir"); + QFile qmldir(basedir + "/TimeExample/qmldir"); QVERIFY(qmldir.open(QIODevice::ReadOnly)); const QByteArray contents = qmldir.readAll(); QVERIFY(contents.contains("module TimeExample")); @@ -132,7 +143,7 @@ void tst_basicapp::qmldirContents() } { - QFile qmldir(QCoreApplication::applicationDirPath() + "/BasicExtension/qmldir"); + QFile qmldir(basedir + "/BasicExtension/qmldir"); QVERIFY(qmldir.open(QIODevice::ReadOnly)); const QByteArray contents = qmldir.readAll(); QVERIFY(contents.contains("More 1.0 More.ui.qml")); |