diff options
author | Liang Qi <liang.qi@qt.io> | 2016-09-18 13:07:22 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2016-09-21 11:16:28 +0200 |
commit | 02b4770c3d867bf0b562db63015a7137479db10a (patch) | |
tree | 57157d0101a295fd394bf9acc91dd216fb361264 /tests/auto/quick/touchmouse | |
parent | 858c62583ff776edb8c9e539f0331f5d658de2d1 (diff) | |
parent | 345226aa3ecee8642c3bf46e40c981d4a49d958e (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
src/qml/qml/qqmltypeloader.cpp
Change-Id: I07647700fc86764c95a5ef95c568e700a70fe45f
Diffstat (limited to 'tests/auto/quick/touchmouse')
-rw-r--r-- | tests/auto/quick/touchmouse/tst_touchmouse.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/quick/touchmouse/tst_touchmouse.cpp b/tests/auto/quick/touchmouse/tst_touchmouse.cpp index baa4bcb21c..1594da46bd 100644 --- a/tests/auto/quick/touchmouse/tst_touchmouse.cpp +++ b/tests/auto/quick/touchmouse/tst_touchmouse.cpp @@ -1336,8 +1336,12 @@ void tst_TouchMouse::hoverEnabled() // device->setType(QTouchDevice::TouchScreen); // QWindowSystemInterface::registerTouchDevice(device); + // Ensure the cursor is away from the window + QCursor::setPos(0, 0); + QQuickView *window = createView(); window->setSource(testFileUrl("hoverMouseAreas.qml")); + window->setPosition(10, 10); window->show(); window->requestActivate(); |