diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-18 13:04:48 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-18 13:05:09 +0200 |
| commit | 3fcc0ecb79d64e3a25fcfeaf242d2b8b478baee2 (patch) | |
| tree | faef2e74954d313ee9b142fe66c06a81ab6e1ec3 | |
| parent | 5dcd3d8526c7b8c7ac59a743f82130008d254d14 (diff) | |
| parent | 95aba99a384728c9deaa349929508bcafb898505 (diff) | |
| download | qtlocation-3fcc0ecb79d64e3a25fcfeaf242d2b8b478baee2.tar.gz | |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: Iabc9a23154eb3dae2323e7a715b202dcaa382f8d
| -rw-r--r-- | src/location/doc/qtlocation.qdocconf | 2 | ||||
| -rw-r--r-- | src/positioning/doc/qtpositioning.qdocconf | 2 | ||||
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_item_details.qml | 4 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/location/doc/qtlocation.qdocconf b/src/location/doc/qtlocation.qdocconf index abe48974..695860a0 100644 --- a/src/location/doc/qtlocation.qdocconf +++ b/src/location/doc/qtlocation.qdocconf @@ -41,7 +41,7 @@ sourcedirs += .. \ ../../imports/location \ ../../plugins/geoservices/nokia -examplesinstallpath = qtlocation/location +examplesinstallpath = location exampledirs += ../../../examples/location \ snippets/ diff --git a/src/positioning/doc/qtpositioning.qdocconf b/src/positioning/doc/qtpositioning.qdocconf index 1645c092..608b30a1 100644 --- a/src/positioning/doc/qtpositioning.qdocconf +++ b/src/positioning/doc/qtpositioning.qdocconf @@ -40,7 +40,7 @@ headerdirs += .. \ sourcedirs += .. \ ../../imports/positioning -examplesinstallpath = qtlocation/positioning +examplesinstallpath = positioning exampledirs += ../../../examples/positioning \ snippets/ diff --git a/tests/auto/declarative_ui/tst_map_item_details.qml b/tests/auto/declarative_ui/tst_map_item_details.qml index 20849079..b29b3a82 100644 --- a/tests/auto/declarative_ui/tst_map_item_details.qml +++ b/tests/auto/declarative_ui/tst_map_item_details.qml @@ -412,6 +412,8 @@ Item { */ function test_yz_dateline() { + if (Qt.platform.os === "windows") + skip("QTBUG-53455"); map.clearMapItems() clear_data() map.center = datelineCoordinate @@ -593,6 +595,8 @@ Item { */ function test_zz_border_drag() { + if (Qt.platform.os === "windows") + skip("QTBUG-53455"); map.clearMapItems() clear_data() map.center = datelineCoordinate |