diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-22 03:02:03 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-22 03:02:03 +0100 |
commit | 47391b2d74f65ea3a3a67c0a5359499582d6cfdb (patch) | |
tree | 7a4caa9cc3efb14c385fc3fc7781c0dbb14bbc60 | |
parent | a95c1e3a7cf55a43ba1a8b963aa0c0df02655747 (diff) | |
parent | 1fb878d8de41a2cfd2e0afe4c939679bbb65fdb2 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1
Change-Id: Ibfd9321f80367173575afb9393307d8b7ce5f399
-rw-r--r-- | examples/location/minimal_map/main.qml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/location/minimal_map/main.qml b/examples/location/minimal_map/main.qml index 40e1bb46..285eb31e 100644 --- a/examples/location/minimal_map/main.qml +++ b/examples/location/minimal_map/main.qml @@ -49,13 +49,13 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Window 2.0 +import QtQuick.Window 2.14 import QtLocation 5.6 import QtPositioning 5.6 Window { - width: 512 - height: 512 + width: Qt.platform.os == "android" ? Screen.width : 512 + height: Qt.platform.os == "android" ? Screen.height : 512 visible: true Plugin { |