diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2018-07-17 18:20:12 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-07-17 18:20:12 +0000 |
| commit | cc5d8168001e652c045ff42685edf257ce00603c (patch) | |
| tree | 6320f169d621bed128f08d92676035a8e2f2ab23 /tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp | |
| parent | a9dfe71cca38e6b62445292ed2c6ec1c8224430a (diff) | |
| parent | 1783fca89768a9d503d886673643dc4542ec467f (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp')
| -rw-r--r-- | tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp b/tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp index 34dc103672..9fa61804b3 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp +++ b/tests/auto/corelib/plugin/qfactoryloader/tst_qfactoryloader.cpp @@ -42,6 +42,11 @@ Q_IMPORT_PLUGIN(Plugin2) class tst_QFactoryLoader : public QObject { Q_OBJECT + +#ifdef Q_OS_ANDROID + QSharedPointer<QTemporaryDir> directory; +#endif + public slots: void initTestCase(); @@ -53,6 +58,12 @@ static const char binFolderC[] = "bin"; void tst_QFactoryLoader::initTestCase() { +#ifdef Q_OS_ANDROID + directory = QEXTRACTTESTDATA("android_test_data"); + QVERIFY(directory); + QVERIFY(directory->isValid()); + QVERIFY2(QDir::setCurrent(directory->path()), qPrintable("Could not chdir to " + directory->path())); +#endif const QString binFolder = QFINDTESTDATA(binFolderC); QVERIFY2(!binFolder.isEmpty(), "Unable to locate 'bin' folder"); #if QT_CONFIG(library) |