diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 09:51:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 09:51:18 +0100 |
| commit | be13464a488ccc2837b0c178ff16086be341e570 (patch) | |
| tree | c0923835f7522452ca12f66a7a3785b2c6b70d5a /examples/location | |
| parent | 93cd42ef606178261e12eeffc88cd4b7d029dbc3 (diff) | |
| parent | 444a2d5b19e601e74e78384c823d7d048e797c4c (diff) | |
| download | qtlocation-be13464a488ccc2837b0c178ff16086be341e570.tar.gz | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: I786a0bff424afcb791a9aff68cc16df074153492
Diffstat (limited to 'examples/location')
| -rw-r--r-- | examples/location/mapviewer/forms/Geocode.qml | 6 | ||||
| -rw-r--r-- | examples/location/mapviewer/forms/GeocodeForm.ui.qml | 4 |
2 files changed, 5 insertions, 5 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 } |