diff options
5 files changed, 11 insertions, 10 deletions
diff --git a/examples/location/mapviewer/forms/Geocode.qml b/examples/location/mapviewer/forms/Geocode.qml index 9e273257..475ca264 100644 --- a/examples/location/mapviewer/forms/Geocode.qml +++ b/examples/location/mapviewer/forms/Geocode.qml @@ -51,7 +51,7 @@ GeocodeForm { // fill out the Address element address.street = street.text address.city = city.text - address.state = state.text + address.state = stateName.text address.country = country.text address.postalCode = postalCode.text showPlace(address) @@ -60,7 +60,7 @@ GeocodeForm { clearButton.onClicked: { street.text = "" city.text = "" - state.text = "" + stateName.text = "" country.text = "" postalCode.text = "" } @@ -72,7 +72,7 @@ GeocodeForm { Component.onCompleted: { street.text = address.street city.text = address.city - state.text = address.state + stateName.text = address.state country.text = address.country postalCode.text = address.postalCode } diff --git a/examples/location/mapviewer/forms/GeocodeForm.ui.qml b/examples/location/mapviewer/forms/GeocodeForm.ui.qml index 3ed715a0..73820dff 100644 --- a/examples/location/mapviewer/forms/GeocodeForm.ui.qml +++ b/examples/location/mapviewer/forms/GeocodeForm.ui.qml @@ -48,7 +48,7 @@ Item { property alias postalCode: postalCode property alias street: street property alias city: city - property alias state: state + property alias stateName: stateName property alias country: country property alias cancelButton: cancelButton Rectangle { @@ -119,7 +119,7 @@ Item { } TextField { - id: state + id: stateName Layout.fillWidth: true } diff --git a/src/location/maps/qgeorouteparserosrmv5.cpp b/src/location/maps/qgeorouteparserosrmv5.cpp index cbbf7fc4..6c73b1f7 100644 --- a/src/location/maps/qgeorouteparserosrmv5.cpp +++ b/src/location/maps/qgeorouteparserosrmv5.cpp @@ -428,9 +428,9 @@ static QString instructionNewName(const QString &wayName, QGeoManeuver::Instruct case QGeoManeuver::DirectionLightRight: case QGeoManeuver::DirectionBearRight: if (wayName.isEmpty()) - return QGeoRouteParserOsrmV5::tr("Contine slightly right"); + return QGeoRouteParserOsrmV5::tr("Continue slightly right"); else - return QGeoRouteParserOsrmV5::tr("Contine slightly right onto %1").arg(wayName); + return QGeoRouteParserOsrmV5::tr("Continue slightly right onto %1").arg(wayName); case QGeoManeuver::DirectionUTurnLeft: case QGeoManeuver::DirectionUTurnRight: if (wayName.isEmpty()) @@ -468,9 +468,9 @@ static QString instructionNotification(const QString &wayName, QGeoManeuver::Ins case QGeoManeuver::DirectionLightRight: case QGeoManeuver::DirectionBearRight: if (wayName.isEmpty()) - return QGeoRouteParserOsrmV5::tr("Contine on the right"); + return QGeoRouteParserOsrmV5::tr("Continue on the right"); else - return QGeoRouteParserOsrmV5::tr("Contine on the right on %1").arg(wayName); + return QGeoRouteParserOsrmV5::tr("Continue on the right on %1").arg(wayName); case QGeoManeuver::DirectionForward: default: if (wayName.isEmpty()) diff --git a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp index a563cced..31d5ebc8 100644 --- a/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp +++ b/src/plugins/geoservices/osm/qgeofiletilecacheosm.cpp @@ -53,6 +53,7 @@ QGeoFileTileCacheOsm::QGeoFileTileCacheOsm(const QVector<QGeoTileProviderOsm *> { m_highDpi.resize(providers.size()); for (int i = 0; i < providers.size(); i++) { + providers[i]->setParent(this); m_highDpi[i] = providers[i]->isHighDpi(); m_mapIdFutures[providers[i]->mapType().mapId()].isFinished(); // To construct a default future for this mapId connect(providers[i], &QGeoTileProviderOsm::resolutionFinished, this, &QGeoFileTileCacheOsm::onProviderResolutionFinished); diff --git a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp index ff79c261..3228b31b 100644 --- a/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeotiledmappingmanagerengineosm.cpp @@ -213,7 +213,7 @@ QGeoTiledMappingManagerEngineOsm::QGeoTiledMappingManagerEngineOsm(const QVarian disableRedirection = parameters.value(QStringLiteral("osm.mapping.providersrepository.disabled")).toBool(); foreach (QGeoTileProviderOsm * provider, m_providers) { - provider->setParent(this); + // Providers are parented inside QGeoFileTileCacheOsm, as they are used in its destructor. if (disableRedirection) provider->disableRedirection(); |