summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-04-18 22:03:42 +0200
committerLiang Qi <liang.qi@qt.io>2017-04-18 22:03:42 +0200
commit7caf543280bf8bdb0d3ea18d6c1a2537fdccfe6e (patch)
tree5c18b1ca8df1f39bb71cb1b579852f7b39894f1c /tests
parent6de2c8aca6736550d87057b0a3f025464bf21246 (diff)
parentd5d7dcfb15c0b5c5e9009b83fba922ea0b7e86f5 (diff)
Merge remote-tracking branch 'origin/5.8' into 5.9
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
index f5488db08..e4bb719e6 100644
--- a/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
+++ b/tests/auto/unit/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
@@ -83,7 +83,9 @@ private:
void tst_QMediaServiceProvider::initTestCase()
{
// QMediaPluginLoader::setStaticPlugins(QLatin1String("mediaservice"), plugins);
+#if QT_CONFIG(library)
QCoreApplication::setLibraryPaths(QStringList() << QCoreApplication::applicationDirPath());
+#endif
}
void tst_QMediaServiceProvider::testDefaultProviderAvailable()