Merge lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/tinyText into lp://qastaging/ubuntu-ui-toolkit/staging
Proposed by
Cris Dywan
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/tinyText |
| Merge into: | lp://qastaging/ubuntu-ui-toolkit/staging |
| Diff against target: |
506 lines (+288/-41) (has conflicts) 10 files modified
src/Ubuntu/Components/1.3/InputHandler.qml (+5/-2) src/Ubuntu/Components/1.3/TextArea.qml (+2/-1) src/Ubuntu/Components/1.3/TextArea14.qml (+77/-0) src/Ubuntu/Components/1.3/TextCursor.qml (+6/-30) src/Ubuntu/Components/1.3/TextField.qml (+2/-0) src/Ubuntu/Components/1.3/TextField14.qml (+108/-0) src/Ubuntu/Components/ComponentModule.pro (+2/-0) src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml (+0/-2) src/Ubuntu/Components/qmldir (+4/-2) tests/unit_x11/tst_components/tst_textinput_common13.qml (+82/-4) Text conflict in tests/unit_x11/tst_components/tst_textinput_common13.qml |
| To merge this branch: | bzr merge lp://qastaging/~ubuntu-sdk-team/ubuntu-ui-toolkit/tinyText |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu SDK team | Pending | ||
|
Review via email:
|
|||
Commit message
Tiny Text* components for experimenting
To post a comment you must log in.
Unmerged revisions
- 1980. By Cris Dywan
-
Simplify TextArea14 and add a reference ScrollView/
Flickable/ TextEdit - 1979. By Cris Dywan
-
Tiny Text* components for experimenting
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
