QtMir

Merge lp://staging/~mzanetti/qtmir/rebuild-for-mirsurface-appid into lp://staging/qtmir

  1. rebuild-for-mirsurface-appid
  2. Merge into trunk
Proposed by Michael Zanetti
Status: Approved
Approved by: Daniel d'Andrada
Approved revision: 621
Proposed branch: lp://staging/~mzanetti/qtmir/rebuild-for-mirsurface-appid
Merge into: lp://staging/qtmir
Diff against target: 128 lines (+20/-22)
6 files modified
CMakeLists.txt (+1/-1)
debian/control (+2/-2)
debian/gles-patches/convert-to-gles.patch (+1/-1)
src/modules/Unity/Application/mirsurface.cpp (+14/-14)
src/modules/Unity/Application/mirsurface.h (+2/-2)
src/modules/Unity/Application/mirsurfaceinterface.h (+0/-2)
To merge this branch: bzr merge lp://staging/~mzanetti/qtmir/rebuild-for-mirsurface-appid
Reviewer Review Type Date Requested Status
Daniel d'Andrada (community) Approve
Unity8 CI Bot (community) continuous-integration Approve
Review via email: mp+319951@code.staging.launchpad.net

Commit message

move appId from local interface down to unity-api interface.

unity-api gained a MirSurfaceInterface::appId property which is already implemented here but needs to be exposed to the shell now.

Description of the change

Prereq-archive: ppa:ci-train-ppa-service/2514

related:

https://code.launchpad.net/~mzanetti/unity-api/mirsurface-appid/+merge/319949

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

FAILED: Continuous integration, rev:618
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/578/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4480/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4508
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4335/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4335/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4335/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4335/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4335/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4335/console

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

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~mzanetti/qtmir/rebuild-for-mirsurface-appid updated
619. By Michael Zanetti

fix provides

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:619
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/579/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4491/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4519
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4346/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4346/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4346/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4346/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4346/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4346/console

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:619
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/580/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4493/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4521
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4348/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4348/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4348/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4348/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4348/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4348/console

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

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~mzanetti/qtmir/rebuild-for-mirsurface-appid updated
620. By Michael Zanetti

update gles patch

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:620
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/583/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4497
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4525
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4352
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4352/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4352
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4352/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4352
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4352/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4352
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4352/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4352
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4352/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4352
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4352/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Reply
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

If we are moving appId() down to unity-api then please update code accordingly:

1 - remove "virtual QString appId() const = 0;" from src/modules/Unity/Application/mirsurfaceinterface.h

2 - In mirsurface.h move the "QString appId() const override;" declaration up to the "unity::shell::application::MirSurfaceInterface" block

review: Needs Fixing
Reply
lp://staging/~mzanetti/qtmir/rebuild-for-mirsurface-appid updated
621. By Michael Zanetti

properly move the method around

Revision history for this message
Michael Zanetti (mzanetti) wrote :

> If we are moving appId() down to unity-api then please update code
> accordingly:
>
> 1 - remove "virtual QString appId() const = 0;" from
> src/modules/Unity/Application/mirsurfaceinterface.h
>
> 2 - In mirsurface.h move the "QString appId() const override;" declaration up
> to the "unity::shell::application::MirSurfaceInterface" block

done. didn't know there is another mirsurfaceinterface.h although I was a bit surprised that it was already marked as "override" in mirsurface.h

Reply
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:621
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/587/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4512
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4540
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4367
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4367/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4367
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4367/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4367
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4367/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4367
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4367/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4367
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4367/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4367
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4367/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Reply
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Thanks

review: Approve
Reply

Unmerged revisions

621. By Michael Zanetti

properly move the method around

620. By Michael Zanetti

update gles patch

619. By Michael Zanetti

fix provides

618. By Michael Zanetti

bump api requirement

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches