Merge lp:~aacid/unity8/qmluitests54 into lp:unity8
Status: | Merged |
---|---|
Approved by: | Andrea Cimitan |
Approved revision: | 1622 |
Merged at revision: | 1629 |
Proposed branch: | lp:~aacid/unity8/qmluitests54 |
Merge into: | lp:unity8 |
Diff against target: |
315 lines (+61/-31) 11 files modified
qml/Components/ZoomableImage.qml (+14/-14) tests/plugins/Ubuntu/Gestures/tst_DirectionalDragArea.cpp (+9/-0) tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp (+7/-0) tests/qmltests/Dash/Previews/tst_PreviewRatingInput.qml (+1/-1) tests/qmltests/tst_ShellWithPin.qml (+1/-0) tests/utils/modules/Unity/Test/CMakeLists.txt (+1/-0) tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.cpp (+10/-1) tests/utils/modules/Unity/Test/TouchEventSequenceWrapper.h (+4/-1) tests/utils/modules/Unity/Test/UnityTestCase.qml (+11/-11) tests/utils/modules/Unity/Test/testutil.cpp (+2/-2) tests/utils/modules/Unity/Test/testutil.h (+1/-1) |
To merge this branch: | bzr merge lp:~aacid/unity8/qmluitests54 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrea Cimitan (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Daniel d'Andrada (community) | tests code | Approve | |
Review via email: mp+250021@code.launchpad.net |
Commit message
Make qmluittests pass with Qt 5.4
Changes:
* Make PinchArea not be a child of Flickable, otherwise when zooming out the Flickable was stealing the events from the PinchArea
* Flush touch events in some tests. Since https:/
* Change a verify() to check for !== invalid instead of letting verify() do the cast to boolean by itself
* Make sure the pin lock buttons are enabled before tapping into them
Description of the change
* Are there any related MPs required for this MP to build/function as expected?
No
* Did you perform an exploratory manual test run of your code change and any related functionality?
tests now pass, behaviour is the same
* Did you make sure that your branch does not contain spurious tags?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
* If you changed the UI, has there been a design review?
N/A
FAILED: Continuous integration, rev:1620 jenkins. qa.ubuntu. com/job/ unity8- ci/5330/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 1392 jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- vivid/494/ console jenkins. qa.ubuntu. com/job/ unity8- vivid-amd64- ci/495 jenkins. qa.ubuntu. com/job/ unity8- vivid-i386- ci/495 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 1229 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1390 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 1390/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 18114
http://
Executed test runs:
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/5330/ rebuild
http://