Merge lp://qastaging/~tpeeters/ubuntu-ui-toolkit/apl-no-mainview into lp://qastaging/ubuntu-ui-toolkit
Proposed by
Tim Peeters
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~tpeeters/ubuntu-ui-toolkit/apl-no-mainview |
| Merge into: | lp://qastaging/ubuntu-ui-toolkit |
| Diff against target: |
868 lines (+302/-89) 34 files modified
components.api (+6/-0) export_qml_dir.sh (+2/-0) src/Ubuntu/Components/1.3/AdaptivePageLayout.qml (+11/-6) src/Ubuntu/Components/1.3/PageHeader.qml (+2/-1) src/Ubuntu/Components/1.3/TextArea.qml (+3/-4) src/Ubuntu/Components/Styles/1.3/PageHeadStyle.qml (+1/-0) src/Ubuntu/Components/Styles/1.3/SectionsStyle.qml (+50/-0) src/Ubuntu/Components/Styles/Styles.pro (+1/-3) src/Ubuntu/Components/Styles/qmldir (+1/-0) src/Ubuntu/Components/Themes/Ambiance/1.2/PageHeadButton.qml (+1/-1) src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadButton.qml (+1/-1) src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml (+10/-0) src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml (+1/-1) src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml (+16/-30) src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml (+6/-0) src/Ubuntu/Components/Themes/ThemesModule.pro (+0/-3) src/Ubuntu/Components/plugin/ucabstractbutton.cpp (+0/-3) src/Ubuntu/Components/plugin/ucperformancemonitor.cpp (+24/-6) tests/unit/add_qmlmakecheck.pri (+1/-1) tests/unit/add_qmlmakecheck_x11.pri (+1/-1) tests/unit/i18n/LocalizedApp/LocalizedApp.pro (+0/-1) tests/unit/i18n/RelativeTime/RelativeTime.pro (+0/-1) tests/unit/mainview/mainview.pro (+0/-2) tests/unit/page/page.pro (+0/-2) tests/unit/performance/TextArea13Grid.qml (+33/-0) tests/unit/performance/tst_performance.cpp (+1/-0) tests/unit/runtest.sh (+20/-15) tests/unit/visual/gallery.qml (+78/-0) tests/unit/visual/gallery.sh (+6/-0) tests/unit/visual/tst_adaptivepagelayout.qml (+3/-2) tests/unit/visual/tst_pageheader.qml (+2/-1) tests/unit/visual/tst_picker13.qml (+1/-0) tests/unit/visual/tst_popups_dialog13.qml (+13/-0) tests/xvfb.sh (+7/-4) |
| To merge this branch: | bzr merge lp://qastaging/~tpeeters/ubuntu-ui-toolkit/apl-no-mainview |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot | continuous-integration | Pending | |
| Ubuntu SDK team | Pending | ||
|
Review via email:
|
|||
Commit message
Don't get APL subheader colors from MainView AppHeader when there is no MainView.
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
