diff options
| author | Alex Blasche <alexander.blasche@qt.io> | 2016-12-05 12:43:52 +0100 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@qt.io> | 2016-12-05 12:43:52 +0100 |
| commit | 335116ea024f51e1693bba39f78e15131870f1b0 (patch) | |
| tree | 148ccdb4703b4a35afb1b0e3875573b1eb90d0ce /tests | |
| parent | 5e4bc1fe908896e9b90e8ad9c3896f35b5ec37be (diff) | |
| parent | ba9b7b9ef674d93680070f6c4bb1053d0d2325dd (diff) | |
| download | qtlocation-335116ea024f51e1693bba39f78e15131870f1b0.tar.gz | |
Merge remote-tracking branch 'gerrit/5.8' into dev
Conflicts:
src/imports/location/qdeclarativegeomap.cpp
src/location/maps/maps.pri
src/location/maps/qgeomap_p_p.h
src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp
src/plugins/geoservices/osm/qgeoroutereplyosm.cpp
Change-Id: I18d31cff9233648178fe3e2636ce294026dfaeb7
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp b/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp index e7026cff..cc2672b2 100644 --- a/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp +++ b/tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp @@ -109,7 +109,7 @@ void tst_QGeoTiledMap::initTestCase() QVERIFY2(provider->error() == QGeoServiceProvider::NoError, "Could not load plugin: " + provider->errorString().toLatin1()); m_map.reset(static_cast<QGeoTiledMapTest*>(mappingManager->createMap(this))); QVERIFY(m_map); - m_map->setSize(QSize(16, 16)); + m_map->setViewportSize(QSize(16, 16)); m_fetcher = static_cast<QGeoTileFetcherTest*>(m_map->m_engine->tileFetcher()); m_tilesCounter.reset(new FetchTileCounter()); connect(m_fetcher, SIGNAL(tileFetched(const QGeoTileSpec&)), m_tilesCounter.data(), SLOT(tileFetched(const QGeoTileSpec&))); |