summaryrefslogtreecommitdiff
path: root/tests/auto/declarative_ui
diff options
context:
space:
mode:
authorPaolo Angelelli <paolo.angelelli@qt.io>2017-09-11 17:15:45 +0200
committerPaolo Angelelli <paolo.angelelli@qt.io>2017-09-11 17:16:16 +0200
commita0c7b93df620d9254aef3136da08adbc70752837 (patch)
tree0db63a9d7f693d5245056eb41a1128c5fec11187 /tests/auto/declarative_ui
parent3f2c6d8af0367c5e87eb38d348c99e2e2a2f0a76 (diff)
parentb13ff055eb64970f545ba590735a38652de7689b (diff)
downloadqtlocation-a0c7b93df620d9254aef3136da08adbc70752837.tar.gz
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta1
Change-Id: Ibcf748d5f0d172ad5c77bdcd41806009ff6914e3
Diffstat (limited to 'tests/auto/declarative_ui')
-rw-r--r--tests/auto/declarative_ui/tst_map.qml16
1 files changed, 2 insertions, 14 deletions
diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml
index 52dcac11..8b101bf1 100644
--- a/tests/auto/declarative_ui/tst_map.qml
+++ b/tests/auto/declarative_ui/tst_map.qml
@@ -38,18 +38,6 @@ Item {
// General-purpose elements for the test:
Plugin { id: testPlugin; name: "qmlgeo.test.plugin"; allowExperimental: true }
Plugin { id: testPlugin2; name: "gmlgeo.test.plugin"; allowExperimental: true }
- Plugin { id: herePlugin; name: "here";
- parameters: [
- PluginParameter {
- name: "here.app_id"
- value: "stub"
- },
- PluginParameter {
- name: "here.token"
- value: "stub"
- }
- ]
- }
Plugin {
id: testPluginLazyParameter;
name: "qmlgeo.test.plugin"
@@ -111,13 +99,13 @@ Item {
Map {id: mapPar; plugin: testPlugin; center: coordinate1; width: 512; height: 512}
- Map {id: coordinateMap; plugin: herePlugin; center: coordinate3;
+ Map {id: coordinateMap; plugin: testPlugin; center: coordinate3;
width: 1000; height: 1000; zoomLevel: 15 }
Map {id: mapTiltBearing; plugin: testPlugin; center: coordinate1;
width: 1000; height: 1000; zoomLevel: 4; bearing: 45.0; tilt: 25.0 }
- Map {id: mapTiltBearingHere; plugin: herePlugin; center: coordinate1;
+ Map {id: mapTiltBearingHere; plugin: testPlugin; center: coordinate1;
width: 1000; height: 1000; zoomLevel: 4; bearing: 45.0; tilt: 25.0 }
Map {