diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-18 14:16:12 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-05-18 14:17:06 +0200 |
| commit | a3ebf9c04aac97a22c502af79b924d7dc3886824 (patch) | |
| tree | f687c69e1512b4d99c6255f89b555e685aba9e15 /tests | |
| parent | 761331ddc841809a4bdc6ca2f2b84c148cb9b19a (diff) | |
| parent | 3fcc0ecb79d64e3a25fcfeaf242d2b8b478baee2 (diff) | |
| download | qtlocation-a3ebf9c04aac97a22c502af79b924d7dc3886824.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: Ifed3a326085bd4aaff069007966efd6932c2be3b
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_item_details.qml | 4 | ||||
| -rw-r--r-- | tests/auto/qmlinterface/qmlinterface.pro | 6 | ||||
| -rw-r--r-- | tests/plugins/imports.pri | 9 |
3 files changed, 7 insertions, 12 deletions
diff --git a/tests/auto/declarative_ui/tst_map_item_details.qml b/tests/auto/declarative_ui/tst_map_item_details.qml index 586d7018..1758c954 100644 --- a/tests/auto/declarative_ui/tst_map_item_details.qml +++ b/tests/auto/declarative_ui/tst_map_item_details.qml @@ -407,6 +407,8 @@ Item { */ function test_yz_dateline() { + if (Qt.platform.os === "windows") + skip("QTBUG-53455"); map.clearMapItems() clear_data() map.center = datelineCoordinate @@ -588,6 +590,8 @@ Item { */ function test_zz_border_drag() { + if (Qt.platform.os === "windows") + skip("QTBUG-53455"); map.clearMapItems() clear_data() map.center = datelineCoordinate diff --git a/tests/auto/qmlinterface/qmlinterface.pro b/tests/auto/qmlinterface/qmlinterface.pro index c95547ed..9f1acad8 100644 --- a/tests/auto/qmlinterface/qmlinterface.pro +++ b/tests/auto/qmlinterface/qmlinterface.pro @@ -1,9 +1,3 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2011-11-09T15:45:51 -# -#------------------------------------------------- - QT += location qml testlib #QT -= gui diff --git a/tests/plugins/imports.pri b/tests/plugins/imports.pri index e7ff1d42..00f93330 100644 --- a/tests/plugins/imports.pri +++ b/tests/plugins/imports.pri @@ -1,8 +1,5 @@ !contains(DESTDIR, $$[QT_INSTALL_QML]/$$TARGETPATH) { - copyimportfiles.input = IMPORT_FILES - copyimportfiles.output = $$DESTDIR/${QMAKE_FILE_IN_BASE}${QMAKE_FILE_EXT} - copyimportfiles.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} - copyimportfiles.CONFIG += no_link_no_clean - copyimportfiles.variable_out = PRE_TARGETDEPS - QMAKE_EXTRA_COMPILERS += copyimportfiles + importfiles.files = $$IMPORT_FILES + importfiles.path = $$DESTDIR + COPIES += importfiles } |