Merge lp://staging/~zsombi/ubuntu-ui-toolkit/wrongPaletteIn12 into lp://staging/ubuntu-ui-toolkit/staging
Proposed by
Zsombor Egri
| Status: | Merged |
|---|---|
| Approved by: | Andrea Bernabei |
| Approved revision: | 1869 |
| Merged at revision: | 1869 |
| Proposed branch: | lp://staging/~zsombi/ubuntu-ui-toolkit/wrongPaletteIn12 |
| Merge into: | lp://staging/ubuntu-ui-toolkit/staging |
| Diff against target: |
120 lines (+51/-4) 6 files modified
src/Ubuntu/Components/plugin/ucdeprecatedtheme.cpp (+2/-1) src/Ubuntu/Components/plugin/uctheme.cpp (+5/-1) src/Ubuntu/Components/plugin/uctheme.h (+1/-1) tests/unit_x11/tst_deprecated_theme_engine/ErroneousPaletteUse.qml (+33/-0) tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.cpp (+8/-0) tests/unit_x11/tst_deprecated_theme_engine/tst_deprecated_theme_engine.pro (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~zsombi/ubuntu-ui-toolkit/wrongPaletteIn12 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ubuntu-sdk-build-bot | continuous-integration | Approve | |
| Ubuntu SDK team | Pending | ||
|
Review via email:
|
|||
Commit message
Deprecated Theme forces palette to be loaded from 1.2 themes.
To post a comment you must log in.
Revision history for this message
| Andrea Bernabei (faenil) wrote | # |
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Zsombor Egri (zsombi) wrote | # |
Revision history for this message
| Andrea Bernabei (faenil) wrote | # |
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
just a typo, looks good otherwise