Merge lp://qastaging/~zeller-benjamin/ubuntu-ui-toolkit/qrcify3 into lp://qastaging/ubuntu-ui-toolkit/staging
Proposed by
Benjamin Zeller
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://qastaging/~zeller-benjamin/ubuntu-ui-toolkit/qrcify3 |
| Merge into: | lp://qastaging/ubuntu-ui-toolkit/staging |
| Prerequisite: | lp://qastaging/~zeller-benjamin/ubuntu-ui-toolkit/qrcify2 |
| Diff against target: |
968 lines (+498/-240) 22 files modified
src/Ubuntu/Components/Themes/Ambiance/Ambiance.pro (+18/-119) src/Ubuntu/Components/Themes/Ambiance/ambiance.qrc (+119/-0) src/Ubuntu/Components/Themes/Ambiance/ambianceplugin.cpp (+7/-0) src/Ubuntu/Components/Themes/Ambiance/ambianceplugin.h (+15/-0) src/Ubuntu/Components/Themes/Ambiance/qmldir (+78/-76) src/Ubuntu/Components/Themes/SuruDark/SuruDark.pro (+21/-15) src/Ubuntu/Components/Themes/SuruDark/qmldir (+3/-2) src/Ubuntu/Components/Themes/SuruDark/surudark.qrc (+14/-0) src/Ubuntu/Components/Themes/SuruDark/surudarkplugin.cpp (+7/-0) src/Ubuntu/Components/Themes/SuruDark/surudarkplugin.h (+15/-0) src/Ubuntu/Components/Themes/SuruGradient/SuruGradient.pro (+19/-9) src/Ubuntu/Components/Themes/SuruGradient/qmldir (+2/-1) src/Ubuntu/Components/Themes/SuruGradient/surugradient.qrc (+11/-0) src/Ubuntu/Components/Themes/SuruGradient/surugradientplugin.cpp (+7/-0) src/Ubuntu/Components/Themes/SuruGradient/surugradientplugin.h (+15/-0) src/Ubuntu/Components/Themes/ThemesModule.pro (+18/-10) src/Ubuntu/Components/Themes/qmldir (+6/-4) src/Ubuntu/Components/Themes/themesmodule.qrc (+8/-0) src/Ubuntu/Components/Themes/themesplugin.cpp (+7/-0) src/Ubuntu/Components/Themes/themesplugin.h (+15/-0) src/Ubuntu/Components/plugin/uctheme.cpp (+89/-2) src/Ubuntu/Components/plugin/uctheme.h (+4/-2) |
| To merge this branch: | bzr merge lp://qastaging/~zeller-benjamin/ubuntu-ui-toolkit/qrcify3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| ubuntu-sdk-build-bot | continuous-integration | Needs Fixing | |
| PS Jenkins bot | continuous-integration | Needs Fixing | |
| Zsombor Egri | Needs Fixing | ||
|
Review via email:
|
|||
Commit message
- Add all theme files to qrc
- Adapt theme engine to load the plugins
Description of the change
- Add all theme files to qrc
- Adapt theme engine to load the plugins
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) | # |
review:
Approve
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) | # |
review:
Approve
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Unmerged revisions
- 1597. By Benjamin Zeller
-
Remove remarks
- 1596. By Benjamin Zeller
-
Merge with qrcify2
- 1595. By Benjamin Zeller
-
Merge to staging
- 1594. By Benjamin Zeller
-
Remove qmlcompiler switch
- 1593. By Benjamin Zeller
-
Revert hack for qml compiler
- 1592. By Benjamin Zeller
-
Add missing sci files
- 1591. By Benjamin Zeller
-
* Workaround for AdaptivePageLayout failing in compiled mode
* Enable qtquickcompiler
* Typo in surugradient - 1590. By Benjamin Zeller
-
Merge staging
- 1589. By Benjamin Zeller
-
- Use Item{} to import a plugin, allows much easier to maintain and read
code - 1588. By Benjamin Zeller
-
- Most styles are loading now
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Theme loading requires few tests to be added. All those @BUG marked points should be defended with tests.