Merge lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/focusPassesFromChildToParent into lp://qastaging/ubuntu-ui-toolkit/staging
Proposed by
Cris Dywan
| Status: | Merged | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Approved by: | Zsombor Egri | ||||||||||||
| Approved revision: | 1725 | ||||||||||||
| Merged at revision: | 1732 | ||||||||||||
| Proposed branch: | lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/focusPassesFromChildToParent | ||||||||||||
| Merge into: | lp://qastaging/ubuntu-ui-toolkit/staging | ||||||||||||
| Prerequisite: | lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/enoFocusPriSecItem | ||||||||||||
| Diff against target: |
243 lines (+60/-11) 8 files modified
components.api (+1/-0) src/Ubuntu/Components/1.3/TextArea.qml (+9/-1) src/Ubuntu/Components/1.3/TextField.qml (+12/-1) src/Ubuntu/Components/plugin/ucabstractbutton.cpp (+1/-0) src/Ubuntu/Components/plugin/ucstyleditembase.cpp (+10/-1) src/Ubuntu/Components/plugin/ucstyleditembase.h (+9/-0) tests/unit_x11/tst_components/tst_focus.qml (+4/-3) tests/unit_x11/tst_components/tst_textinput_common13.qml (+14/-5) |
||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/focusPassesFromChildToParent | ||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Approve | |
| Zsombor Egri | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2015-11-18.
Commit message
Don't set activeFocusOnPress on TextField but on child only
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:
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:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:1719
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
UNSTABLE: http://
SUCCESS: http://
deb: http://
UNSTABLE: http://
Click here to trigger a rebuild:
http://