Merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/theming-attached into lp://qastaging/ubuntu-ui-toolkit/staging
Proposed by
Zsombor Egri
Status: | Rejected |
---|---|
Rejected by: | Cris Dywan |
Proposed branch: | lp://qastaging/~zsombi/ubuntu-ui-toolkit/theming-attached |
Merge into: | lp://qastaging/ubuntu-ui-toolkit/staging |
Diff against target: |
777 lines (+379/-209) 9 files modified
components.api (+2/-1) src/Ubuntu/Components/plugin/plugin.cpp (+2/-1) src/Ubuntu/Components/plugin/plugin.pri (+4/-2) src/Ubuntu/Components/plugin/ucstyleditembase.cpp (+21/-184) src/Ubuntu/Components/plugin/ucstyleditembase.h (+1/-3) src/Ubuntu/Components/plugin/ucstyleditembase_p.h (+7/-14) src/Ubuntu/Components/plugin/uctheme.cpp (+4/-4) src/Ubuntu/Components/plugin/ucthemingattached.cpp (+257/-0) src/Ubuntu/Components/plugin/ucthemingattached.h (+81/-0) |
To merge this branch: | bzr merge lp://qastaging/~zsombi/ubuntu-ui-toolkit/theming-attached |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot | continuous-integration | Needs Fixing | |
Cris Dywan | Approve | ||
Review via email:
|
Commit message
Detaching theming management from StyledItem to be reused in other cpp types.
To post a comment you must log in.
Unmerged revisions
- 1587. By Zsombor Egri
-
staging sync
- 1586. By Zsombor Egri
-
simplifying the use of theming
- 1585. By Zsombor Egri
-
staging sync
- 1584. By Zsombor Egri
-
segfault fixed
- 1583. By Zsombor Egri
-
renaming styling to theming
- 1582. By Zsombor Egri
-
API file fixed
- 1581. By Zsombor Egri
-
staging merge
- 1580. By Zsombor Egri
-
separation completed
- 1579. By Zsombor Egri
-
staging sync
StyledItem was registered twice with the revision 2, so the 1.3 appeared twice in the API file. I fixed that as well.