Merge lp:~nick-dedekind/qtmir/occlusion-2.0 into lp:qtmir

Proposed by Nick Dedekind on 2016-01-19
Status: Merged
Approved by: Daniel d'Andrada on 2016-06-21
Approved revision: 436
Merged at revision: 530
Proposed branch: lp:~nick-dedekind/qtmir/occlusion-2.0
Merge into: lp:qtmir
Diff against target: 13 lines (+0/-3)
1 file modified
src/modules/Unity/Application/mirsurface.cpp (+0/-3)
To merge this branch: bzr merge lp:~nick-dedekind/qtmir/occlusion-2.0
Reviewer Review Type Date Requested Status
Daniel d'Andrada (community) 2016-06-20 Approve on 2016-06-21
Unity8 CI Bot continuous-integration Needs Fixing on 2016-06-14
PS Jenkins bot (community) continuous-integration Needs Fixing on 2016-01-19
Michael Terry 2016-01-19 Pending
Review via email: mp+283197@code.launchpad.net

Commit message

Re-added occlusion detection

Description of the change

 * Are there any related MPs required for this MP to build/function as expected? Please list.
https://code.launchpad.net/~nick-dedekind/qtubuntu/occlusion-2.0/+merge/283194

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

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

To post a comment you must log in.
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:435
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/21/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-1-ci/21/rebuild

review: Needs Fixing (continuous-integration)
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:435
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/139/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1121
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1119
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1119
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1117
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1117/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/1117/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1117
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1117/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/1117/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1117
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1117/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/1117/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/139/rebuild

review: Needs Fixing (continuous-integration)
Gerry Boland (gerboland) wrote :
Nick Dedekind (nick-dedekind) wrote :

> Blocked on resolution of https://bugs.launchpad.net/mir/+bug/1566747

Seems to be fixed now.

Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:436
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/277/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1962/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1988
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1922
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1922
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1922
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1913
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1913/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1913/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1913
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1913/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1913
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1913/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1913
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1913/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1913
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1913/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1913
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1913/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1913
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1913/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1913
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1913/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/277/rebuild

review: Needs Fixing (continuous-integration)
Daniel d'Andrada (dandrader) wrote :

* Did you perform an exploratory manual test run of the code change and any related functionality?
Did some basic testing. No regression found.

* Did CI run pass? If not, please explain why.
Unrelated failure in SharedWakelockTest.acquireCreatesAWakelock

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
2--- src/modules/Unity/Application/mirsurface.cpp 2016-05-25 13:54:52 +0000
3+++ src/modules/Unity/Application/mirsurface.cpp 2016-06-14 10:48:43 +0000
4@@ -766,9 +766,6 @@
5
6 void MirSurface::updateVisibility()
7 {
8- // FIXME: https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1514556
9- return;
10-
11 bool newVisible = false;
12 QHashIterator<qintptr, View> i(m_views);
13 while (i.hasNext()) {

Subscribers

People subscribed via source and target branches