Merge lp://staging/~mzanetti/unity-api/fix-launcher-tests-with-5.3 into lp://staging/unity-api
Proposed by
Michael Zanetti
| Status: | Merged |
|---|---|
| Approved by: | Albert Astals Cid |
| Approved revision: | 135 |
| Merged at revision: | 135 |
| Proposed branch: | lp://staging/~mzanetti/unity-api/fix-launcher-tests-with-5.3 |
| Merge into: | lp://staging/unity-api |
| Diff against target: |
47 lines (+19/-19) 1 file modified
test/qmltest/mocks/plugins/Unity/Launcher/Mocks/MockLauncherModel.cpp (+19/-19) |
| To merge this branch: | bzr merge lp://staging/~mzanetti/unity-api/fix-launcher-tests-with-5.3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Timo Jyrinki | Approve | ||
| Albert Astals Cid (community) | Approve | ||
| PS Jenkins bot (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
properly parent mock items otherwise QML deletes them as of 5.2
Description of the change
* Are there any related MPs required for this MP to build/function as expected? Please list.
No
* Did you perform an exploratory manual test run of your code change and any related functionality?
yes, tests still pass on desktop, also pass again on armhf with 5.3
* Did you make sure that your branch does not contain spurious tags?
yip yip
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
nope
* If you changed the UI, has there been a design review?
nope
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Michael Zanetti (mzanetti) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:135
http://
Executed test runs:
SUCCESS: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://