Merge lp://staging/~jonas-drange/ubuntu-system-settings/displays-mir into lp://staging/ubuntu-system-settings
Proposed by
Jonas G. Drange
Status: | Work in progress |
---|---|
Proposed branch: | lp://staging/~jonas-drange/ubuntu-system-settings/displays-mir |
Merge into: | lp://staging/ubuntu-system-settings |
Prerequisite: | lp://staging/~jonas-drange/ubuntu-system-settings/displays-stub |
Diff against target: |
1995 lines (+1080/-214) (has conflicts) 28 files modified
debian/control (+1/-0) plugins/brightness/CMakeLists.txt (+25/-5) plugins/brightness/PageComponent.qml (+43/-26) plugins/brightness/brightness.cpp (+91/-12) plugins/brightness/brightness.h (+16/-3) plugins/brightness/displays/display.cpp (+155/-39) plugins/brightness/displays/display.h (+76/-52) plugins/brightness/displays/displaymodel.cpp (+64/-14) plugins/brightness/displays/displaymodel.h (+16/-5) plugins/brightness/displays/helpers.cpp (+131/-0) plugins/brightness/displays/helpers.h (+25/-0) plugins/brightness/displays/mirclient.h (+25/-0) plugins/brightness/displays/mirclient_impl.cpp (+86/-0) plugins/brightness/displays/mirclient_impl.h (+26/-0) plugins/brightness/plugin.cpp (+2/-2) plugins/brightness/plugin/brightness-plugin.cpp (+2/-18) tests/mocks/Ubuntu/SystemSettings/Brightness/CMakeLists.txt (+4/-5) tests/mocks/Ubuntu/SystemSettings/Brightness/MockBrightness.cpp (+11/-1) tests/mocks/Ubuntu/SystemSettings/Brightness/MockBrightness.h (+10/-4) tests/mocks/Ubuntu/SystemSettings/Brightness/MockDisplay.h (+32/-13) tests/mocks/Ubuntu/SystemSettings/Brightness/MockDisplayModel.h (+3/-3) tests/mocks/Ubuntu/SystemSettings/Brightness/plugin.cpp (+2/-1) tests/mocks/plugins/brightness/fakemirclient.h (+36/-0) tests/plugins/CMakeLists.txt (+1/-0) tests/plugins/brightness/CMakeLists.txt (+25/-0) tests/plugins/brightness/tst_BrightnessPageComponent.qml (+99/-11) tests/plugins/brightness/tst_brightness.cpp (+41/-0) tests/plugins/brightness/tst_displayplugin_displaymodel.cpp (+32/-0) Text conflict in debian/changelog |
To merge this branch: | bzr merge lp://staging/~jonas-drange/ubuntu-system-settings/displays-mir |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
system-apps-ci-bot | continuous-integration | Needs Fixing | |
Ubuntu Touch System Settings | Pending | ||
Review via email: mp+309943@code.staging.launchpad.net |
Commit message
implement display config for mir displays
To post a comment you must log in.
Unmerged revisions
- 1747. By Jonas G. Drange
-
add framework for testing brightness and displayplugin classes
- 1746. By Jonas G. Drange
-
rename mirdisplays to less ambiguous mirclient
- 1745. By Jonas G. Drange
-
consume new namespace DisplayPlugin
- 1744. By Jonas G. Drange
-
create namespace for displayplugin
- 1743. By Jonas G. Drange
-
minor tweaks
- 1742. By Jonas G. Drange
-
make config work well for rotation and resolution (mode9
- 1741. By Jonas G. Drange
-
working changed filter
- 1740. By Jonas G. Drange
-
add mdoes
- 1739. By Jonas G. Drange
-
add mir specific read of config, add helpers
- 1738. By Jonas G. Drange
-
merge prereq
FAILED: Continuous integration, rev:1739 /jenkins. canonical. com/system- apps/job/ lp-ubuntu- system- settings- ci/222/ /jenkins. canonical. com/system- apps/job/ build/1925/ console /jenkins. canonical. com/system- apps/job/ build-0- fetch/1926 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1765/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1765 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1765/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 1765 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= yakkety/ 1765/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1765/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1765 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1765/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 1765 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= yakkety/ 1765/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1765/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1765 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1765/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= yakkety/ 1765/console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-ubuntu- system- settings- ci/222/ rebuild
https:/