Unity 8

Merge lp:~dandrader/unity8/controlTouchEmulationFromQML into lp:unity8

controlTouchEmulationFromQML
Merge into trunk

Proposed by Daniel d'Andrada on 2015-03-10

Status:	Merged
Approved by:	Michael Zanetti on 2015-03-11
Approved revision:	1640
Merged at revision:	1668
Proposed branch:	lp:~dandrader/unity8/controlTouchEmulationFromQML
Merge into:	lp:unity8
Prerequisite:	lp:~dandrader/unity8/unifyShellTests
To merge this branch:	bzr merge lp:~dandrader/unity8/controlTouchEmulationFromQML
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Michael Zanetti (community)		2015-03-10	Approve on 2015-03-11
PS Jenkins bot	continuous-integration	2015-03-10	Pending
Review via email: mp+252489@code.launchpad.net

This proposal supersedes a proposal from 2015-03-02.

Commit message

Make MouseTouchAdaptor controllable from within QML

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
No, but for better effect try this branch along with lp:~mzanetti/unity8/indicators-mouse and run "make tryPanel"

* 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?
Not applicable.

* If you changed the UI, has there been a design review?
Not applicable.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-27: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1638
http://jenkins.qa.ubuntu.com/job/unity8-ci/5370/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1581/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/534/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/535/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/535/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1579/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5370/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-02-27: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5372/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-03-02: Posted in a previous version of this proposal

Functionality seems to work fine. Code-wise I'm ok too.

Does fail some tests in jenkins though.

review: Needs Fixing

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2015-03-02: Posted in a previous version of this proposal

> Functionality seems to work fine. Code-wise I'm ok too.
>
> Does fail some tests in jenkins though.

Those are old failures that should be fixed by now. I should probably resubmit to get a new jenkins run because I did "push --overwrite". :/

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-02: Posted in a previous version of this proposal

FAILED: Continuous integration, rev:1637
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~dandrader/unity8/controlTouchEmulationFromQML/+merge/251478/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity8-ci/5376/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1604
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/540
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/541
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/541
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1423
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1602
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1602/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18474

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5376/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2015-03-03: Posted in a previous version of this proposal

* Did you perform an exploratory manual test run of the code change and any related functionality?

yes

* Did CI run pass? If not, please explain why.

AP failures don't look related...

* Did you make sure that the branch does not contain spurious tags?

yes

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-03-03: Posted in a previous version of this proposal

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5383/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2015-03-10: Posted in a previous version of this proposal

Please have a look at https://ci-train.ubuntu.com/job/ubuntu-landing-020-1-build/89/console and see what can you rebase on to get rid of the conflict.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2015-03-10: Posted in a previous version of this proposal

On 10/03/15 12:03, Michał Sawicz wrote:
> Please have a look at https://ci-train.ubuntu.com/job/ubuntu-landing-020-1-build/89/console and see what can you rebase on to get rid of the conflict.

Done.

Revision history for this message

Daniel d'Andrada (dandrader) wrote on 2015-03-10:

It displays no diff but if you merge it locally you will see it. Lanchpad had an internal error when producing the diff. :-/

Revision history for this message

Michael Zanetti (mzanetti) on 2015-03-11:

review: Approve

Subscribers

People subscribed via source and target branches

to all changes:

Daniel d'Andrada

Mohammad Rakibul Hasan

Unity Team