Merge lp://staging/~ubuntu-sdk-team/ubuntu-ui-toolkit/noLongTapOnGles into lp://staging/ubuntu-ui-toolkit/staging
Proposed by
Cris Dywan
| Status: | Merged |
|---|---|
| Approved by: | Timo Jyrinki |
| Approved revision: | 1371 |
| Merged at revision: | 1404 |
| Proposed branch: | lp://staging/~ubuntu-sdk-team/ubuntu-ui-toolkit/noLongTapOnGles |
| Merge into: | lp://staging/ubuntu-ui-toolkit/staging |
| Diff against target: |
92 lines (+43/-0) 4 files modified
components.api (+2/-0) modules/Ubuntu/Test/plugin/uctestextras.cpp (+36/-0) modules/Ubuntu/Test/plugin/uctestextras.h (+2/-0) tests/unit_x11/tst_components/tst_textinput_touch.qml (+3/-0) |
| To merge this branch: | bzr merge lp://staging/~ubuntu-sdk-team/ubuntu-ui-toolkit/noLongTapOnGles |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Timo Jyrinki | Approve | ||
|
Review via email:
|
|||
Commit message
Skip select_
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Timo Jyrinki (timo-jyrinki) wrote | # |
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Skipping this test has now been proven to fix the -gles amd64 issue, so skipping the test should be good to go in.
However, I believe the the "expect fail" is not yet valid - it does pass on armhf, but fails in the case of the amd64 uitk-gles package. It _also_ passes on i386 uitk-gles.