Merge lp://staging/~unity-team/unity8/keymapSwitching into lp://staging/unity8
Proposed by
Michał Sawicz
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Approved by: | Michael Terry | ||||||||||||
Approved revision: | 2281 | ||||||||||||
Merged at revision: | 2291 | ||||||||||||
Proposed branch: | lp://staging/~unity-team/unity8/keymapSwitching | ||||||||||||
Merge into: | lp://staging/unity8 | ||||||||||||
Prerequisite: | lp://staging/~unity-team/unity8/shell_chrome | ||||||||||||
Diff against target: |
634 lines (+265/-10) 20 files modified
plugins/AccountsService/AccountsService.cpp (+26/-0) plugins/AccountsService/AccountsService.h (+6/-0) qml/Shell.qml (+50/-0) qml/Stages/AbstractStage.qml (+1/-0) qml/Stages/ApplicationWindow.qml (+4/-0) qml/Stages/DesktopStage.qml (+4/-0) qml/Stages/PhoneStage.qml (+2/-0) qml/Stages/SpreadDelegate.qml (+1/-0) qml/Stages/SurfaceContainer.qml (+13/-0) qml/Stages/TabletStage.qml (+2/-0) tests/mocks/AccountsService/AccountsService.cpp (+17/-0) tests/mocks/AccountsService/AccountsService.h (+8/-0) tests/mocks/QMenuModel/QDBusActionGroup.qml (+5/-5) tests/mocks/Unity/Application/MirSurface.cpp (+18/-2) tests/mocks/Unity/Application/MirSurface.h (+5/-0) tests/plugins/AccountsService/PropertiesServer.cpp (+9/-0) tests/plugins/AccountsService/PropertiesServer.h (+0/-1) tests/plugins/AccountsService/client.cpp (+30/-0) tests/qmltests/Stages/tst_DesktopStage.qml (+0/-2) tests/qmltests/tst_Shell.qml (+64/-0) |
||||||||||||
To merge this branch: | bzr merge lp://staging/~unity-team/unity8/keymapSwitching | ||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel d'Andrada (community) | Needs Information | ||
Michael Terry | Approve | ||
Unity8 CI Bot | continuous-integration | Approve | |
Review via email: mp+288842@code.staging.launchpad.net |
This proposal supersedes a proposal from 2016-03-11.
Commit message
Keymap switching support
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
lp:~unity-team/unity-api/kbdLayout
lp:~unity-team/qtmir/kbdLayout
lp:~lukas-kde/qtubuntu/kbdLayout
* Did you perform an exploratory manual test run of your code change and any related functionality?
Will in silo
* Did you make sure that your branch does not contain spurious tags?
Y
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Y
* If you changed the UI, has there been a design review?
N/A
To post a comment you must log in.
FAILED: Continuous integration, rev:2275 /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/674/ /unity8- jenkins. ubuntu. com/job/ build-0- fetch/887 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= vivid+overlay/ 903 /unity8- jenkins. ubuntu. com/job/ build-1- sourcepkg/ release= xenial/ 903 /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= vivid+overlay/ 901/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=amd64, release= xenial/ 901/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= vivid+overlay/ 901/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=armhf, release= xenial/ 901/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= vivid+overlay/ 901/console /unity8- jenkins. ubuntu. com/job/ build-2- binpkg/ arch=i386, release= xenial/ 901/console
https:/
Executed test runs:
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- ci/674/ rebuild
https:/