diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-09-05 18:46:09 +0200 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-09-05 18:47:14 +0200 |
| commit | 021f2157cd18a6d37a9569bf3aba34f3af173ed5 (patch) | |
| tree | 6fc11a62ecd3df6e4214ecc2860f904d0e31dbbc /examples | |
| parent | 222ba4b733f67a51758708e27b7c76cdaaa3e228 (diff) | |
| parent | 8f80da7ea0165adb492c71255d0eea5f08c0af8e (diff) | |
| download | qtlocation-021f2157cd18a6d37a9569bf3aba34f3af173ed5.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Ibfd8b430011abb0a7174bbcc158b03f8e26492eb
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/location/places_map/doc/images/places_map.png | bin | 157761 -> 167995 bytes | |||
| -rw-r--r-- | examples/location/places_map/main.cpp | 2 | ||||
| -rw-r--r-- | examples/location/places_map/places_map.qml | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/examples/location/places_map/doc/images/places_map.png b/examples/location/places_map/doc/images/places_map.png Binary files differindex 72317e2d..4982df23 100644 --- a/examples/location/places_map/doc/images/places_map.png +++ b/examples/location/places_map/doc/images/places_map.png diff --git a/examples/location/places_map/main.cpp b/examples/location/places_map/main.cpp index a2cd8fc0..aeb7eaf3 100644 --- a/examples/location/places_map/main.cpp +++ b/examples/location/places_map/main.cpp @@ -46,6 +46,8 @@ int main(int argc, char **argv) QGuiApplication app(argc,argv); QQuickView view; view.setSource(QUrl(QStringLiteral("qrc:///places_map.qml"))); + view.setWidth(360); + view.setHeight(640); view.show(); return app.exec(); } diff --git a/examples/location/places_map/places_map.qml b/examples/location/places_map/places_map.qml index 467a31de..cd487fa9 100644 --- a/examples/location/places_map/places_map.qml +++ b/examples/location/places_map/places_map.qml @@ -45,8 +45,7 @@ import QtLocation 5.6 //! [Imports] Rectangle { - width: 360 - height: 640 + anchors.fill: parent //! [Initialize Plugin] Plugin { |
