diff options
Diffstat (limited to 'tests/auto/corelib/plugin')
3 files changed, 21 insertions, 2 deletions
diff --git a/tests/auto/corelib/plugin/qfactoryloader/test/test.pro b/tests/auto/corelib/plugin/qfactoryloader/test/test.pro index 9338f4ecc9..5e4d65a49f 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/test/test.pro +++ b/tests/auto/corelib/plugin/qfactoryloader/test/test.pro @@ -20,3 +20,11 @@ win32 { !qtConfig(library) { LIBS += -L ../bin/ -lplugin1 -lplugin2 } + +android { + libs.prefix = android_test_data + libs.base = $$OUT_PWD/.. + libs.files += $$OUT_PWD/../bin + + RESOURCES += libs +} 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) diff --git a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp index 499d276ef8..a496ed318b 100644 --- a/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp +++ b/tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp @@ -345,8 +345,8 @@ void tst_QPluginLoader::loadMachO() QVERIFY(f.open(QIODevice::ReadOnly)); QByteArray data = f.readAll(); - long pos; - ulong len; + qsizetype pos; + qsizetype len; QString errorString; int r = QMachOParser::parse(data.constData(), data.size(), f.fileName(), &errorString, &pos, &len); |