From 81b42ba2508241cdeeecdbcdac6f1d22be922022 Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Mon, 21 Nov 2016 13:04:47 +0100 Subject: Add Q_LOCATION_PRIVATE_EXPORT to QGeoMapPrivate This patch privately exports QGeoMapPrivate, effectively making it possible to subclass QGeoMap directly. Change-Id: Ib373eff5ab6782c832464d2df3484d2790ea3644 Reviewed-by: Alex Blasche --- tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro b/tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro index f629a154..d061f18f 100644 --- a/tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro +++ b/tests/auto/qgeocameracapabilities/qgeocameracapabilities.pro @@ -6,4 +6,4 @@ INCLUDEPATH += ../../../src/location/maps SOURCES += tst_qgeocameracapabilities.cpp -QT += location positioning-private testlib +QT += location-private positioning-private testlib -- cgit v1.2.1 From 95f8804ecaed79792a57b1fe3580266bfbbf7590 Mon Sep 17 00:00:00 2001 From: Paolo Angelelli Date: Fri, 18 Nov 2016 19:02:36 +0100 Subject: Renaming QGeoMapPrivate::changeMapSize to changeViewportSize The current name of this method generate confusion, as what it does is changing the size of the final element in the application, and not the actual map size. This patch renames this method to changeDisplaySize It also renames QGeoMap::setSize to setViewportSize, as well as ::size to viewportSize , width to viewportWidth and height to viewportHeight, to make everything consistent and self-explanatory. Finally it also renames minimumZoomAtMapSize to minimumZoomAtViewportSize. Change-Id: I7c1ca8bb3ca3d6f6b0fe6fc881b9300db7110527 Reviewed-by: Alex Blasche --- tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') 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(mappingManager->createMap(this))); QVERIFY(m_map); - m_map->setSize(QSize(16, 16)); + m_map->setViewportSize(QSize(16, 16)); m_fetcher = static_cast(m_map->m_engine->tileFetcher()); m_tilesCounter.reset(new FetchTileCounter()); connect(m_fetcher, SIGNAL(tileFetched(const QGeoTileSpec&)), m_tilesCounter.data(), SLOT(tileFetched(const QGeoTileSpec&))); -- cgit v1.2.1