Merge lp://qastaging/~jonas-drange/ubuntu-system-settings/mir-display-config into lp://qastaging/ubuntu-system-settings
Status: | Needs review |
---|---|
Proposed branch: | lp://qastaging/~jonas-drange/ubuntu-system-settings/mir-display-config |
Merge into: | lp://qastaging/ubuntu-system-settings |
Diff against target: |
4474 lines (+3917/-47) 51 files modified
debian/control (+4/-0) plugins/brightness/CMakeLists.txt (+40/-2) plugins/brightness/MirDisplay.qml (+138/-0) plugins/brightness/PageComponent.qml (+54/-8) plugins/brightness/WifiDisplays.qml (+22/-19) plugins/brightness/brightness.cpp (+90/-10) plugins/brightness/brightness.h (+30/-3) plugins/brightness/displays/display.cpp (+177/-0) plugins/brightness/displays/display.h (+89/-0) plugins/brightness/displays/displaymodel.cpp (+256/-0) plugins/brightness/displays/displaymodel.h (+113/-0) plugins/brightness/displays/enums.h (+79/-0) plugins/brightness/displays/helpers.cpp (+216/-0) plugins/brightness/displays/helpers.h (+43/-0) plugins/brightness/displays/mirclient.h (+50/-0) plugins/brightness/displays/mirclient_impl.cpp (+180/-0) plugins/brightness/displays/mirclient_impl.h (+47/-0) plugins/brightness/displays/output/mir_output.cpp (+171/-0) plugins/brightness/displays/output/mir_output.h (+62/-0) plugins/brightness/displays/output/output.h (+64/-0) plugins/brightness/displays/outputmode/mir_outputmode.cpp (+63/-0) plugins/brightness/displays/outputmode/mir_outputmode.h (+44/-0) plugins/brightness/displays/outputmode/outputmode.h (+39/-0) plugins/brightness/plugin.cpp (+7/-0) plugins/brightness/plugin/brightness-plugin.cpp (+14/-3) plugins/system-update/CMakeLists.txt (+5/-2) tests/mocks/Ubuntu/SystemSettings/Brightness/CMakeLists.txt (+31/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDevice.h (+63/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDeviceModel.cpp (+95/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDeviceModel.h (+63/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDisplays.cpp (+89/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockAethercastDisplays.h (+96/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockBrightness.cpp (+131/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockBrightness.h (+86/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockDisplay.h (+71/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/MockDisplayModel.h (+26/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/plugin.cpp (+33/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/plugin.h (+33/-0) tests/mocks/Ubuntu/SystemSettings/Brightness/qmldir (+2/-0) tests/mocks/Ubuntu/SystemSettings/CMakeLists.txt (+3/-0) tests/mocks/plugins/brightness/fakemirclient.h (+69/-0) tests/mocks/plugins/brightness/fakeoutput.h (+150/-0) tests/mocks/plugins/brightness/fakeoutputmode.h (+58/-0) tests/plugins/CMakeLists.txt (+14/-0) tests/plugins/brightness/CMakeLists.txt (+38/-0) tests/plugins/brightness/Source/qmldir (+3/-0) tests/plugins/brightness/tst_BrightnessPageComponent.qml (+190/-0) tests/plugins/brightness/tst_BrightnessWifiDisplays.qml (+79/-0) tests/plugins/brightness/tst_brightness.cpp (+131/-0) tests/plugins/brightness/tst_displayplugin_display.cpp (+120/-0) tests/plugins/brightness/tst_displayplugin_displaymodel.cpp (+146/-0) |
To merge this branch: | bzr merge lp://qastaging/~jonas-drange/ubuntu-system-settings/mir-display-config |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
system-apps-ci-bot | continuous-integration | Needs Fixing | |
Ken VanDine | Approve | ||
Review via email:
|
Commit message
* changes packaging: deps on mir headers (libmirclient-dev) and USC for testing (qtdeclarative5
* allows configuration of mir displays in the Brightness plugin
* adds a display configuration api
* adds test framework for testing brightness, aethercast, mirdisplays and the brightness qml components
Unmerged revisions
- 1760. By Jonas G. Drange
-
link correctly
- 1759. By Jonas G. Drange
-
adds runtime deps
- 1758. By Jonas G. Drange
-
adds missing dep
- 1757. By Jonas G. Drange
-
fixes qml tests
- 1756. By Jonas G. Drange
-
moves mir display qml into file, fixes model tests
- 1755. By Jonas G. Drange
-
delete gamma code, unecessary right now. Simplifies mir api a bit
- 1754. By Jonas G. Drange
-
disable brightness tests for now
- 1753. By Jonas G. Drange
-
adds mir implementations of output and outputmode
- 1752. By Jonas G. Drange
-
adds new abstractions
- 1751. By Jonas G. Drange
-
starts the move to mir 0.26 by creating abstractions of the mir api
FAILED: Continuous integration, rev:1735 /jenkins. canonical. com/system- apps/job/ lp-ubuntu- system- settings- ci/225/ /jenkins. canonical. com/system- apps/job/ build/1948/ console /jenkins. canonical. com/system- apps/job/ build-0- fetch/1949 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 1788/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1788 /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= xenial+ overlay/ 1788/artifact/ output/ *zip*/output. zip /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=amd64, release= zesty/1788/ console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 1788/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= xenial+ overlay/ 1788/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=armhf, release= zesty/1788/ console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 1788/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= xenial+ overlay/ 1788/console /jenkins. canonical. com/system- apps/job/ build-2- binpkg/ arch=i386, release= zesty/1788/ console
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
FAILURE: https:/
SUCCESS: https:/
deb: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /jenkins. canonical. com/system- apps/job/ lp-ubuntu- system- settings- ci/225/ rebuild
https:/