Merge lp:~aacid/unity8/departmentListHorizontalScroll into lp:unity8
Proposed by
Albert Astals Cid
Status: | Merged |
---|---|
Approved by: | Andrea Cimitan |
Approved revision: | 1526 |
Merged at revision: | 1531 |
Proposed branch: | lp:~aacid/unity8/departmentListHorizontalScroll |
Merge into: | lp:unity8 |
Prerequisite: | lp:~aacid/unity8/waitForRenderingNoCrash |
Diff against target: |
101 lines (+30/-3) 5 files modified
qml/Dash/DashContent.qml (+2/-2) qml/Dash/DashNavigation.qml (+4/-0) qml/Dash/DashNavigationButton.qml (+2/-0) qml/Dash/GenericScopeView.qml (+1/-1) tests/qmltests/Dash/tst_DashContent.qml (+21/-0) |
To merge this branch: | bzr merge lp:~aacid/unity8/departmentListHorizontalScroll |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andrea Cimitan (community) | Approve | ||
PS Jenkins bot | continuous-integration | Pending | |
Review via email: mp+245748@code.launchpad.net |
This proposal supersedes a proposal from 2015-01-05.
Commit message
Disable Dash horizontal scroll while Navigation InverseMouseArea is pressed
Description of the change
* Are there any related MPs required for this MP to build/function as expected?
Prerequisite
* Did you perform an exploratory manual test run of your code change and any related functionality?
Yes
* Did you make sure that your branch does not contain spurious tags?
Yes
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
* If you changed the UI, has there been a design review?
N/A
To post a comment you must log in.
PASSED: Continuous integration, rev:1524 jenkins. qa.ubuntu. com/job/ unity8- ci/5075/ jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- vivid-touch/ 648 jenkins. qa.ubuntu. com/job/ unity-phablet- qmluitests- vivid/239 jenkins. qa.ubuntu. com/job/ unity8- vivid-amd64- ci/240 jenkins. qa.ubuntu. com/job/ unity8- vivid-i386- ci/240 jenkins. qa.ubuntu. com/job/ generic- deb-autopilot- runner- vivid-mako/ 557 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 646 jenkins. qa.ubuntu. com/job/ generic- mediumtests- builder- vivid-armhf/ 646/artifact/ work/output/ *zip*/output. zip s-jenkins. ubuntu- ci:8080/ job/touch- flash-device/ 16801
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild: s-jenkins. ubuntu- ci:8080/ job/unity8- ci/5075/ rebuild
http://