Merge lp://qastaging/~ken-vandine/ubuntu-ui-toolkit/raring.0.1.43 into lp://qastaging/ubuntu-ui-toolkit/raring
Proposed by
Ken VanDine
| Status: | Merged | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 418 | ||||||||||||||||
| Proposed branch: | lp://qastaging/~ken-vandine/ubuntu-ui-toolkit/raring.0.1.43 | ||||||||||||||||
| Merge into: | lp://qastaging/ubuntu-ui-toolkit/raring | ||||||||||||||||
| Diff against target: |
552 lines (+312/-55) 9 files modified
debian/changelog (+14/-0) demos/ListItems.qml (+9/-0) modules/Ubuntu/Components/TextArea.qml (+17/-10) modules/Ubuntu/Components/TextField.qml (+0/-10) modules/Ubuntu/Components/plugin/quickutils.cpp (+28/-0) modules/Ubuntu/Components/plugin/quickutils.h (+5/-0) tests/unit/tst_components/tst_textarea.qml (+125/-3) tests/unit/tst_components/tst_textfield.qml (+90/-13) themes/Ambiance/qmltheme/TextAreaDelegate.qml (+24/-19) |
||||||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~ken-vandine/ubuntu-ui-toolkit/raring.0.1.43 | ||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Timo Jyrinki | Approve | ||
|
Review via email:
|
|||
Commit message
* Fix for text inputs staying disabled after being re-enabled. The previous
workaround for removing input panel was blocking re-enabling a
previously enabled input. (LP: #1164634)
* Fixing disabled text input delegate background color theming when userValue
is set to TextField or TextArea color property. (LP: #1169601)
* Workaround for TextArea and TextField removing OSK when active focus is
transferred from one instance to another using focus property (LP: #1163371)
* Fix for TextArea Enter/Return keys being stolen when embedded in
ListItems.
Description of the change
cherrypicked important bug fixes from trunk that are safe to upload to raring and prepared an update for raring.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Merged.