diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:14 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:27:14 +0100 |
commit | dca175454aefdd019952d941c6369c314e8c3b11 (patch) | |
tree | 82e11b9e741ba07a7a32377048f1eb823ea76903 /tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp | |
parent | 495ea425b376f5b6d65a078c4699e4b7b60a145f (diff) | |
parent | 31ff679359172dfa068014ab0537418f5b852eac (diff) | |
download | qtlocation-dca175454aefdd019952d941c6369c314e8c3b11.tar.gz |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ibd6d68ced4edbd96fb67fe61244b83d597df5775
Diffstat (limited to 'tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp')
-rw-r--r-- | tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp b/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp index 22fb6589..ae0083ba 100644 --- a/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp +++ b/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp @@ -92,6 +92,7 @@ tst_QGeoTiledMap::~tst_QGeoTiledMap() void tst_QGeoTiledMap::initTestCase() { +#if QT_CONFIG(library) // Set custom path since CI doesn't install test plugins #ifdef Q_OS_WIN QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath() + @@ -100,6 +101,7 @@ void tst_QGeoTiledMap::initTestCase() QCoreApplication::addLibraryPath(QCoreApplication::applicationDirPath() + QStringLiteral("/../../../plugins")); #endif +#endif QVariantMap parameters; parameters["tileSize"] = 256; parameters["maxZoomLevel"] = 8; |