diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative_ui/tst_map_flick.qml | 3 | ||||
| -rw-r--r-- | tests/plugins/declarativetestplugin/testhelper.h | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tests/auto/declarative_ui/tst_map_flick.qml b/tests/auto/declarative_ui/tst_map_flick.qml index 7a58b186..8da712b2 100644 --- a/tests/auto/declarative_ui/tst_map_flick.qml +++ b/tests/auto/declarative_ui/tst_map_flick.qml @@ -30,6 +30,7 @@ import QtQuick 2.5 import QtTest 1.0 import QtLocation 5.6 import QtPositioning 5.5 +import QtLocation.Test 5.6 Item { // General-purpose elements for the test: @@ -98,6 +99,8 @@ Item { function init() { + if (Qt.platform.os === "windows" && (LocationTestHelper.x86Bits() === 32)) + skip("QTBUG-59503") map.gesture.acceptedGestures = MapGestureArea.PanGesture | MapGestureArea.FlickGesture; map.gesture.enabled = true map.gesture.panEnabled = true diff --git a/tests/plugins/declarativetestplugin/testhelper.h b/tests/plugins/declarativetestplugin/testhelper.h index c6d9f3b3..3b9f376e 100644 --- a/tests/plugins/declarativetestplugin/testhelper.h +++ b/tests/plugins/declarativetestplugin/testhelper.h @@ -38,6 +38,7 @@ #include <QSignalSpy> #include <QQuickItem> #include <QQuickWindow> +#include <QSysInfo> QT_BEGIN_NAMESPACE @@ -51,6 +52,14 @@ public: QSignalSpy spy(item->window(), &QQuickWindow::afterAnimating); return spy.wait(timeout); } + + Q_INVOKABLE int x86Bits() const + { + if ( QSysInfo::currentCpuArchitecture() == "x86_64" ) + return 64; + else + return 32; + } }; QT_END_NAMESPACE |