Merge lp:~alan-griffiths/qtmir/mir-0.27-compat into lp:qtmir

Proposed by Alan Griffiths
Status: Approved
Approved by: Alan Griffiths
Approved revision: 640
Proposed branch: lp:~alan-griffiths/qtmir/mir-0.27-compat
Merge into: lp:qtmir
Diff against target: 23 lines (+6/-0)
1 file modified
tests/framework/fake_displayconfigurationoutput.h (+6/-0)
To merge this branch: bzr merge lp:~alan-griffiths/qtmir/mir-0.27-compat
Reviewer Review Type Date Requested Status
Unity8 CI Bot (community) continuous-integration Approve
Gerry Boland (community) Approve
Review via email: mp+325749@code.launchpad.net

Commit message

Fix FTBFS for with Mir 0.27

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

mmmkay

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

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

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

review: Approve (continuous-integration)

Unmerged revisions

640. By Alan Griffiths

Fix FTBFS witn Mir 0.27

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/framework/fake_displayconfigurationoutput.h'
2--- tests/framework/fake_displayconfigurationoutput.h 2017-02-02 13:13:39 +0000
3+++ tests/framework/fake_displayconfigurationoutput.h 2017-06-15 15:45:50 +0000
4@@ -53,6 +53,9 @@
5 {},
6 mir_output_gamma_unsupported,
7 {}
8+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
9+ ,{}
10+#endif
11 };
12
13 const mg::DisplayConfigurationOutput fakeOutput2
14@@ -83,6 +86,9 @@
15 {},
16 mir_output_gamma_unsupported,
17 {}
18+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
19+ ,{}
20+#endif
21 };
22
23 #endif // FAKE_DISPLAYCONFIGURATIONOUTPUT_H

Subscribers

People subscribed via source and target branches