summaryrefslogtreecommitdiff
path: root/tests/auto/qplacemanager_unsupported/tst_qplacemanager_unsupported.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-03-10 10:27:14 +0100
committerLiang Qi <liang.qi@qt.io>2017-03-10 10:27:14 +0100
commitdca175454aefdd019952d941c6369c314e8c3b11 (patch)
tree82e11b9e741ba07a7a32377048f1eb823ea76903 /tests/auto/qplacemanager_unsupported/tst_qplacemanager_unsupported.cpp
parent495ea425b376f5b6d65a078c4699e4b7b60a145f (diff)
parent31ff679359172dfa068014ab0537418f5b852eac (diff)
downloadqtlocation-dca175454aefdd019952d941c6369c314e8c3b11.tar.gz
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ibd6d68ced4edbd96fb67fe61244b83d597df5775
Diffstat (limited to 'tests/auto/qplacemanager_unsupported/tst_qplacemanager_unsupported.cpp')
-rw-r--r--tests/auto/qplacemanager_unsupported/tst_qplacemanager_unsupported.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qplacemanager_unsupported/tst_qplacemanager_unsupported.cpp b/tests/auto/qplacemanager_unsupported/tst_qplacemanager_unsupported.cpp
index 41716103..98a9dd31 100644
--- a/tests/auto/qplacemanager_unsupported/tst_qplacemanager_unsupported.cpp
+++ b/tests/auto/qplacemanager_unsupported/tst_qplacemanager_unsupported.cpp
@@ -75,6 +75,7 @@ private:
void tst_QPlaceManagerUnsupported::initTestCase()
{
+#if QT_CONFIG(library)
/*
* Set custom path since CI doesn't install test plugins
*/
@@ -85,6 +86,7 @@ void tst_QPlaceManagerUnsupported::initTestCase()
QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath()
+ QStringLiteral("/../../../plugins"));
#endif
+#endif
m_provider = 0;
m_manager = 0;